diff options
Diffstat (limited to 'u-boot/board/goldelico/gta04')
| -rw-r--r-- | u-boot/board/goldelico/gta04/gta04.c | 8 | ||||
| -rw-r--r-- | u-boot/board/goldelico/gta04/gta04.h | 11 |
2 files changed, 12 insertions, 7 deletions
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) */\ |