OMAP3: BeagleBoard: add xM rev B to ID table

Patch was updated by Jason Kridner <jkridner@beagleboard.org>:
* Use tabs to match style of other board revisions
* Only include board revisions that exist
* Default to the same configuration as the latest revision, but
  without setting 'beaglerev'

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>

diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 2fdee7c08bff6c05ca0591aa86ca416a72b34264..03dac0d9346bbd29eebaec7abfd33d453ebf70c9 100644 (file)
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -164,18 +164,15 @@ int misc_init_r(void)
        case REVISION_AXBX:
                printf("Beagle Rev Ax/Bx\n");
                setenv("beaglerev", "AxBx");
-               setenv("mpurate", "600");
                break;
        case REVISION_CX:
                printf("Beagle Rev C1/C2/C3\n");
                setenv("beaglerev", "Cx");
-               setenv("mpurate", "600");
                MUX_BEAGLE_C();
                break;
        case REVISION_C4:
                printf("Beagle Rev C4\n");
                setenv("beaglerev", "C4");
-               setenv("mpurate", "720");
                MUX_BEAGLE_C();
                /* Set VAUX2 to 1.8V for EHCI PHY */
                twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
@@ -183,10 +180,19 @@ int misc_init_r(void)
                                        TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
                                        TWL4030_PM_RECEIVER_DEV_GRP_P1);
                break;
-       case REVISION_XM:
+       case REVISION_XM_A:
                printf("Beagle xM Rev A\n");
                setenv("beaglerev", "xMA");
-               setenv("mpurate", "1000");
+               MUX_BEAGLE_XM();
+               /* Set VAUX2 to 1.8V for EHCI PHY */
+               twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
+                                       TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
+                                       TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
+                                       TWL4030_PM_RECEIVER_DEV_GRP_P1);
+               break;
+       case REVISION_XM_B:
+               printf("Beagle xM Rev B\n");
+               setenv("beaglerev", "xMB");
                MUX_BEAGLE_XM();
                /* Set VAUX2 to 1.8V for EHCI PHY */
                twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
@@ -196,6 +202,12 @@ int misc_init_r(void)
                break;
        default:
                printf("Beagle unknown 0x%02x\n", get_board_revision());
+               MUX_BEAGLE_XM();
+               /* Set VAUX2 to 1.8V for EHCI PHY */
+               twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
+                                       TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
+                                       TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
+                                       TWL4030_PM_RECEIVER_DEV_GRP_P1);
        }
 
        switch (get_expansion_id()) {

diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h
index b22b65337da5ecaecca101e31c5efb42233f2261..b0e26e5081ac48430b9e6184c09205d5362ac2f0 100644 (file)
--- a/board/ti/beagle/beagle.h
+++ b/board/ti/beagle/beagle.h
@@ -37,7 +37,8 @@ const omap3_sysinfo sysinfo = {
 #define REVISION_AXBX  0x7
 #define REVISION_CX    0x6
 #define REVISION_C4    0x5
-#define REVISION_XM    0x0
+#define REVISION_XM_A  0x0
+#define REVISION_XM_B  0x1
 
 /*
  * IEN  - Input Enable

diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index bfde910f04a6157dbaadd20fe020fe7d863a9191..2bf6c3a285709486d9849fb8e058913cfd3aaf86 100644 (file)
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -203,7 +203,7 @@
        "loadaddr=0x82000000\0" \
        "usbtty=cdc_acm\0" \
        "console=ttyS2,115200n8\0" \
-       "mpurate=500\0" \
+       "mpurate=auto\0" \
        "vram=12M\0" \
        "dvimode=1024x768MR-16@60\0" \
        "defaultdisplay=dvi\0" \