svn commit: r250435 - head/sys/boot/fdt/dts

[Tim Kientzle]

Author: kientzle
Date: Fri May 10 05:34:08 2013
New Revision: 250435
URL: http://svnweb.freebsd.org/changeset/base/250435

Log:
  Move 'compatible' line out of the common am335x.dtsi and into
  the beaglebone-specific .dts file.
  
  Add a new .dts for the BeagleBone Black with more memory,
  slightly different pinmux initialization, and with mmchs1
  configured (though the latter doesn't quite work yet).

Added:
  head/sys/boot/fdt/dts/beaglebone-black.dts
     - copied, changed from r250434, head/sys/boot/fdt/dts/beaglebone.dts
Modified:
  head/sys/boot/fdt/dts/am335x.dtsi
  head/sys/boot/fdt/dts/beaglebone.dts

Modified: head/sys/boot/fdt/dts/am335x.dtsi
==============================================================================
--- head/sys/boot/fdt/dts/am335x.dtsi	Fri May 10 04:49:40 2013	(r250434)
+++ head/sys/boot/fdt/dts/am335x.dtsi	Fri May 10 05:34:08 2013	(r250435)
@@ -27,7 +27,6 @@
  */
 
 / {
-	compatible = "ti,am335x";
 	#address-cells = <1>;
 	#size-cells = <1>;
 
@@ -107,7 +106,7 @@
 			interrupt-parent = <&AINTC>;
 		};
 
-		mmchs0 at 4809C000 {
+		mmchs0 at 48060000 {
 			compatible = "ti,mmchs";
 			reg =<0x48060000 0x1000 >;
 			interrupts = <64>;
@@ -115,6 +114,15 @@
 			mmchs-device-id = <0>;
 		};
 
+		mmchs1 at 481D8000 {
+			compatible = "ti,mmchs";
+			reg =<0x481D8000 0x1000 >;
+			interrupts = <28>;
+			interrupt-parent = <&AINTC>;
+			mmchs-device-id = <1>;
+			status = "disabled";
+		};
+
 		enet0: ethernet at 4A100000 {
 			#address-cells = <1>;
 			#size-cells = <1>;

Copied and modified: head/sys/boot/fdt/dts/beaglebone-black.dts (from r250434, head/sys/boot/fdt/dts/beaglebone.dts)
==============================================================================
--- head/sys/boot/fdt/dts/beaglebone.dts	Fri May 10 04:49:40 2013	(r250434, copy source)
+++ head/sys/boot/fdt/dts/beaglebone-black.dts	Fri May 10 05:34:08 2013	(r250435)
@@ -31,7 +31,9 @@
 /include/ "am335x.dtsi"
 
 / {
-	model = "beaglebone";
+	model = "beaglebone-black";
+	compatible = "beaglebone-black", "beaglebone", "ti,am335x";
+
 
 	aliases {
 		soc = &SOC;
@@ -40,7 +42,7 @@
 
 	memory {
 		device_type = "memory";
-		reg = < 0x80000000 0x10000000 >;	/* 256MB RAM */
+		reg = < 0x80000000 0x20000000 >;	/* 512MB RAM */
 	};
 
 	am335x {
@@ -73,18 +75,21 @@
 				"MMC0_DAT1", "mmc0_dat1", "input_pullup",
 				"MMC0_DAT2", "mmc0_dat2", "input_pullup",
 				"MMC0_DAT3", "mmc0_dat3", "input_pullup",
+				/* MMC1 */
+				"GPMC_CSn1", "mmc1_clk", "input_pulldown",
+				"GPMC_CSn2", "mmc1_cmd", "input_pulldown",
+				"GPMC_AD0", "mmc1_dat0", "input_pulldown",
+				"GPMC_AD1", "mmc1_dat1", "input_pulldown",
+				"GPMC_AD2", "mmc1_dat2", "input_pulldown",
+				"GPMC_AD3", "mmc1_dat3", "input_pulldown",
+				"GPMC_AD4", "mmc1_dat4", "input_pulldown",
+				"GPMC_AD5", "mmc1_dat5", "input_pulldown",
+				"GPMC_AD6", "mmc1_dat6", "input_pulldown",
+				"GPMC_AD7", "mmc1_dat7", "input_pulldown",
 				/* GPIO */
 				"ECAP0_IN_PWM0_OUT", "gpio0_7", "input_pulldown",
 				"GPMC_AD10", "gpio0_26", "input_pulldown",
 				"GPMC_AD11", "gpio0_27", "input_pulldown",
-				"GPMC_AD0", "gpio1_0", "input_pulldown",
-				"GPMC_AD1", "gpio1_1", "input_pulldown",
-				"GPMC_AD2", "gpio1_2", "input_pulldown",
-				"GPMC_AD3", "gpio1_3", "input_pulldown",
-				"GPMC_AD4", "gpio1_4", "input_pulldown",
-				"GPMC_AD5", "gpio1_5", "input_pulldown",
-				"GPMC_AD6", "gpio1_6", "input_pulldown",
-				"GPMC_AD7", "gpio1_7", "input_pulldown",
 				"GPMC_AD12", "gpio1_12", "input_pulldown",
 				"GPMC_AD13", "gpio1_13", "input_pulldown",
 				"GPMC_AD14", "gpio1_14", "input_pulldown",
@@ -97,8 +102,6 @@
 				"GPMC_A8", "gpio1_24", "output", /* User LED 4 */
 				"GPMC_BEn1", "gpio1_28", "input_pulldown",
 				"GPMC_CSn0", "gpio1_29", "input_pulldown",
-				"GPMC_CSn1", "gpio1_30", "input_pulldown",
-				"GPMC_CSn2", "gpio1_31", "input_pulldown",
 				"GPMC_CLK", "gpio2_1", "input_pulldown",
 				"LCD_DATA0", "gpio2_6", "input_pulldown", 
 				"LCD_DATA1", "gpio2_7", "input_pulldown", 
@@ -125,6 +128,11 @@
 				"GPMC_AD8", "ehrpwm2A", "output",
 				"GPMC_AD9", "ehrpwm2B", "output";
  		};
+
+		mmchs1 at 481D8000 {
+			status = "ok";
+		};
+
  
 		i2c at 44e0b000 {
 			pmic at 24 {

Modified: head/sys/boot/fdt/dts/beaglebone.dts
==============================================================================
--- head/sys/boot/fdt/dts/beaglebone.dts	Fri May 10 04:49:40 2013	(r250434)
+++ head/sys/boot/fdt/dts/beaglebone.dts	Fri May 10 05:34:08 2013	(r250435)
@@ -32,6 +32,7 @@
 
 / {
 	model = "beaglebone";
+	compatible = "beaglebone", "ti,am335x";
 
 	aliases {
 		soc = &SOC;