added the new device specific devicetree= variable

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>

9 files changed, 21 insertions, 13 deletions

diff --git a/u-boot/board/goldelico/beagleb1/beagleb1.h b/u-boot/board/goldelico/beagleb1/beagleb1.h
index 5a0dd9e..d1b724d 100644
--- a/u-boot/board/goldelico/beagleb1/beagleb1.h
+++ b/u-boot/board/goldelico/beagleb1/beagleb1.h
@@ -23,4 +23,5 @@ MUX_VAL(CP(MCBSP1_DX),		(IDIS | PTU | EN  | M4)) /*GPIO_158 / ... - Display DOUT
 MUX_VAL(CP(MCBSP1_DR),		(IEN  | PTU | DIS | M4)) /*GPIO_159 / McBSP1-DR -> Display DIN - pulled up */\
 MUX_VAL(CP(MCBSP_CLKS),		(IEN  | PTU | DIS | M0)) /*GPIO_??? / McBSP_CLKS */\
 MUX_VAL(CP(MCBSP1_FSX),		(IDIS | PTU | EN  | M4)) /*GPIO_161 / McBSP1-FSX -> Display CS */\
-MUX_VAL(CP(MCBSP1_CLKX),	(IDIS | PTU | EN  | M4)) /*GPIO_162 / McBSP1-CLKX -> Display SCL */
\ No newline at end of file
+MUX_VAL(CP(MCBSP1_CLKX),	(IDIS | PTU | EN  | M4)) /*GPIO_162 / McBSP1-CLKX -> Display SCL */\
+muxname="BeagleBoardB1", devicetree="omap3-beagle+b1"
diff --git a/u-boot/board/goldelico/beagleb2/beagleb2.h b/u-boot/board/goldelico/beagleb2/beagleb2.h
index de3e297..fbf61ca 100644
--- a/u-boot/board/goldelico/beagleb2/beagleb2.h
+++ b/u-boot/board/goldelico/beagleb2/beagleb2.h
@@ -27,4 +27,5 @@ MUX_VAL(CP(MCBSP1_DR),		(IDIS | PTD | EN  | M4)) /*GPIO_159 / McBSP1-DR -> TRF E
 MUX_VAL(CP(MCBSP_CLKS),		(IEN  | PTU | DIS | M0)) /*GPIO_??? / McBSP_CLKS */\
 MUX_VAL(CP(MCBSP1_FSX),		(IDIS | PTD | EN  | M4)) /*GPIO_161 / McBSP1-FSX -> TRF EN */\
 MUX_VAL(CP(MCBSP1_CLKX),	(IDIS | PTD | EN  | M4)) /*GPIO_162 / McBSP1-CLKX -> UART3 Powerdown */
+muxname="BeagleBoardB2", devicetree="omap3-beagle+b2"
 
diff --git a/u-boot/board/goldelico/beagleb4/beagleb4.h b/u-boot/board/goldelico/beagleb4/beagleb4.h
index b6705ef..9976d78 100644
--- a/u-boot/board/goldelico/beagleb4/beagleb4.h
+++ b/u-boot/board/goldelico/beagleb4/beagleb4.h
@@ -36,5 +36,4 @@ MUX_VAL(CP(MCBSP1_FSX),		(IDIS | PTD | EN  | M4)) /* 16 GPIO_161 / McBSP1-FSX	-
 MUX_VAL(CP(MCBSP1_DR),		(IEN  | PTD | EN  | M4)) /* 18 GPIO_159 / McBSP1-DR		- controls EXT line for RS232 */\
 MUX_VAL(CP(MCBSP1_CLKR),	(IDIS | PTD | EN  | M4)) /* 20 GPIO_156 / McBSP1-CLR	- GPS ON/OFF */\
 MUX_VAL(CP(MCBSP1_FSR),		(IEN  | PTU | EN  | M4)) /* 22 GPIO_157 / McBSP1-FSR	- PENIRQ */\
-
-
+muxname="BeagleBoardB4", devicetree="omap3-beagle+b4"
diff --git a/u-boot/board/goldelico/gta04/gta04.c b/u-boot/board/goldelico/gta04/gta04.c
index 8a394f8..dc83990 100644
--- a/u-boot/board/goldelico/gta04/gta04.c
+++ b/u-boot/board/goldelico/gta04/gta04.c
@@ -44,6 +44,7 @@
 #include "gta04.h"
 
 char *muxname="unknown";
+char *devicetree="unknown";
 
 #if 0	/* testing tool; you can call notify() anywhere even before initialization to see how far the code comes */
 
@@ -155,7 +156,8 @@ int misc_init_r(void)
 #endif
 
 	setenv("mux", muxname);
-
+	setenv("devicetree", devicetree);
+	
 	switch (get_cpu_family()) {
 		case CPU_OMAP34XX:
 			if ((get_cpu_rev() >= CPU_3XX_ES31) &&
@@ -165,7 +167,9 @@ int misc_init_r(void)
 				setenv("mpurate", "600");
 			break;
 		case CPU_OMAP36XX:
-			if(readw(0x4800244C) & (1<<9))	/* check the "Speed Binned" bit for AM/DM37xx */
+			/* check the "Speed Binned" bit for AM/DM37xx
+			 in the Control Device Status Register */
+			if(readw(0x4800244C) & (1<<9))
 				setenv("mpurate", "1000");
 			else
 				setenv("mpurate", "800");
diff --git a/u-boot/board/goldelico/gta04/gta04.h b/u-boot/board/goldelico/gta04/gta04.h
index 5749bce..4945854 100644
--- a/u-boot/board/goldelico/gta04/gta04.h
+++ b/u-boot/board/goldelico/gta04/gta04.h
@@ -34,6 +34,7 @@ const omap3_sysinfo sysinfo = {
 };
 
 extern char *muxname;	// MUX settings name
+extern char *devicetree;	// device tree file name - can be used to load a matching .dtb for the kernel
 
 /* BeagleBoard revisions */
 #define REVISION_AXBX	0x7
@@ -380,7 +381,7 @@ MUX_VAL(CP(D2D_MBUSFLAG),	(IEN  | PTD | DIS | M0)) /*d2d_mbusflag*/\
 MUX_VAL(CP(D2D_SBUSFLAG),	(IEN  | PTD | DIS | M0)) /*d2d_sbusflag*/\
 MUX_VAL(CP(SDRC_CKE0),		(IDIS | PTU | EN  | M0)) /*sdrc_cke0*/\
 MUX_VAL(CP(SDRC_CKE1),		(IDIS | PTU | EN  | M0)) /*sdrc_cke1*/\
-muxname="BB"
+muxname="BB", devicetree="omap3-beagle"
 
 #define MUX_BEAGLE_C() \
 MUX_VAL(CP(MCBSP3_DX),		(IEN  | PTD | DIS | M4)) /*GPIO_140*/\
@@ -389,7 +390,7 @@ MUX_VAL(CP(MCBSP3_CLKX),	(IEN  | PTD | DIS | M4)) /*GPIO_141*/\
 MUX_VAL(CP(UART2_CTS),		(IEN  | PTU | EN  | M0)) /*UART2_CTS*/\
 MUX_VAL(CP(UART2_RTS),		(IDIS | PTD | DIS | M0)) /*UART2_RTS*/\
 MUX_VAL(CP(UART2_TX),		(IDIS | PTD | DIS | M0)) /*UART2_TX*/\
-muxname="BB-C"
+muxname="BB-C", devicetree="omap3-beagle"
 
 #define MUX_BEAGLE_XM() \
 MUX_VAL(CP(GPMC_NCS5),		(IDIS | PTD | EN  | M4)) /*GPIO_56*/\
@@ -420,7 +421,7 @@ MUX_VAL(CP(SYS_BOOT3),		(IDIS | PTD | DIS | M3)) /*DSS_DATA20*/\
 MUX_VAL(CP(SYS_BOOT4),		(IDIS | PTD | DIS | M3)) /*DSS_DATA21*/\
 MUX_VAL(CP(SYS_BOOT5),		(IDIS | PTD | DIS | M3)) /*DSS_DATA22*/\
 MUX_VAL(CP(SYS_BOOT6),		(IDIS | PTD | DIS | M3)) /*DSS_DATA23*/\
-muxname="BB-XM"
+muxname="BB-XM", devicetree="omap3-beagle-xm"
 
 /*
  * IEN  - Input Enable
@@ -479,7 +480,7 @@ MUX_VAL(CP(MCSPI1_SOMI),	(IEN  | PTU | EN  | M4)) /*GPIO_173 - Version sense*/\
 MUX_VAL(CP(MCSPI1_CS0),		(IEN  | PTD | EN  | M4)) /*GPIO_174 - USB-PHY-RESET*/\
 MUX_VAL(CP(MCSPI1_CS1),		(IEN  | PTU | DIS | M4)) /*GPIO_175/MMC3CMD - WAKE_WWAN */\
 MUX_VAL(CP(MCSPI1_CS2),		(IEN  | PTD | DIS | M4)) /*GPIO_176/MMC3CLK - 3G_WOE */\
-muxname="GTA04A2"
+muxname="GTA04A2", devicetree="omap3-gta04a2"
 
 #else 	// GTA04A3ff has some improved mux assignments
 
@@ -541,7 +542,7 @@ MUX_VAL(CP(MCSPI1_CS0),		(IEN  | PTU | EN  | M4)) /*GPIO_174 - USB-PHY-RESET*/\
 MUX_VAL(CP(MCSPI1_CS1),		(IEN  | PTD | DIS | M4)) /*GPIO_175/MMC3CMD - WAKE_WWAN/ON_KEY */\
 MUX_VAL(CP(MCSPI1_CS2),		(IEN  | PTD | DIS | M4)) /*GPIO_176/MMC3CLK - 3G_WOE/ KEY_IRQ */\
 MUX_VAL(CP(SYS_CLKOUT2),	(IEN  | PTD | DIS | M4)) /*GPIO_186 - WWAN_RESET (GTA04A4ff) */\
-muxname="GTA04A3+"
+muxname="GTA04A3+", devicetree="omap3-gta04"
 
 #if 0 // test HSUSB2 wiring
 /* USB EHCI (port 2) */\
diff --git a/u-boot/board/goldelico/gta04b2/gta04b2.h b/u-boot/board/goldelico/gta04b2/gta04b2.h
index a5cd9ae..b975ada 100644
--- a/u-boot/board/goldelico/gta04b2/gta04b2.h
+++ b/u-boot/board/goldelico/gta04b2/gta04b2.h
@@ -21,7 +21,7 @@ MUX_VAL(CP(MCBSP4_DR),		(IEN  | PTD | DIS | M0)) /*GPIO_153 / MCBSP4_DR*/\
 MUX_VAL(CP(MCBSP4_DX),		(IEN  | PTD | DIS | M0)) /*GPIO_154 / MCBSP4_DX*/\
 MUX_VAL(CP(MCBSP4_FSX),		(IEN  | PTD | DIS | M0)) /*GPIO_155 / MCBSP4_FSX*/\
 MUX_VAL(CP(MCBSP_CLKS),		(IDIS | PTD | DIS | M4)) /*GPIO_160 / PENIRQ*/\
-muxname="GTA04B2"
+muxname="GTA04B2", devicetree="omap3-gta04+b2"
 
 #if 0
 MUX_VAL(CP(UART3_CTS_RCTX),	(IDIS | PTD | DIS | M0)) /*GPIO_163 / UART3-CTS*/\
diff --git a/u-boot/board/goldelico/gta04b3/gta04b3.h b/u-boot/board/goldelico/gta04b3/gta04b3.h
index d3ba06a..78ed31a 100644
--- a/u-boot/board/goldelico/gta04b3/gta04b3.h
+++ b/u-boot/board/goldelico/gta04b3/gta04b3.h
@@ -21,7 +21,7 @@ MUX_VAL(CP(MCBSP4_DR),		(IEN  | PTD | DIS | M0)) /*GPIO_153 / MCBSP4_DR*/\
 MUX_VAL(CP(MCBSP4_DX),		(IEN  | PTD | DIS | M0)) /*GPIO_154 / MCBSP4_DX*/\
 MUX_VAL(CP(MCBSP4_FSX),		(IEN  | PTD | DIS | M0)) /*GPIO_155 / MCBSP4_FSX*/\
 MUX_VAL(CP(MCBSP_CLKS),		(IDIS | PTD | DIS | M4)) /*GPIO_160 / PENIRQ*/\
-muxname="GTA04B3"
+muxname="GTA04B3", devicetree="omap3-gta04+b3"
 
 #if 0
 MUX_VAL(CP(UART3_CTS_RCTX),	(IDIS | PTD | DIS | M0)) /*GPIO_163 / UART3-CTS*/\
diff --git a/u-boot/board/goldelico/gta04b4/gta04b4.h b/u-boot/board/goldelico/gta04b4/gta04b4.h
index c9d0970..8c6eb5a 100644
--- a/u-boot/board/goldelico/gta04b4/gta04b4.h
+++ b/u-boot/board/goldelico/gta04b4/gta04b4.h
@@ -21,6 +21,7 @@ MUX_VAL(CP(MCBSP4_DR),		(IEN  | PTD | DIS | M0)) /*GPIO_153 / MCBSP4_DR*/\
 MUX_VAL(CP(MCBSP4_DX),		(IEN  | PTD | DIS | M0)) /*GPIO_154 / MCBSP4_DX*/\
 MUX_VAL(CP(MCBSP4_FSX),		(IEN  | PTD | DIS | M0)) /*GPIO_155 / MCBSP4_FSX*/\
 MUX_VAL(CP(MCBSP_CLKS),		(IDIS | PTD | DIS | M4)) /*GPIO_160 / PENIRQ*/\
+muxname="GTA04B4", devicetree="omap3-gta04+b4"
 
 #if 0
 MUX_VAL(CP(UART3_CTS_RCTX),	(IDIS | PTD | DIS | M0)) /*GPIO_163 / UART3-CTS*/\
diff --git a/u-boot/board/goldelico/panda-hybrid/pandahyb.h b/u-boot/board/goldelico/panda-hybrid/pandahyb.h
index 4501239..4ae33a4 100644
--- a/u-boot/board/goldelico/panda-hybrid/pandahyb.h
+++ b/u-boot/board/goldelico/panda-hybrid/pandahyb.h
@@ -27,6 +27,7 @@ MUX_VAL(CP(MCBSP1_DX),		(IDIS | PTD | EN  | M4)) /*GPIO_158 - DOUT */\
 MUX_VAL(CP(MCBSP1_DR),		(IEN  | PTU | DIS | M4)) /*GPIO_159 - DIN - pulled up */\
 MUX_VAL(CP(MCBSP_CLKS),		(IEN  | PTU | DIS | M0)) /*McBSP_CLKS*/\
 MUX_VAL(CP(MCBSP1_FSX),		(IDIS | PTU | EN  | M4)) /*GPIO_161 - CS */\
-MUX_VAL(CP(MCBSP1_CLKX),	(IDIS | PTD | EN  | M4)) /*GPIO_162 - SCL */
+MUX_VAL(CP(MCBSP1_CLKX),	(IDIS | PTD | EN  | M4)) /*GPIO_162 - SCL */\
+muxname="PandaBoardB1"
 
 #endif