[glsdk/meta-ti-glsdk.git] / recipes-bsp / u-boot / u-boot / 0005-ARMV7-OMAP3-BeagleBoard-add-xM-rev-B-to-ID-table.patch
1 From d2d1669e4e2d4eeb996305278c6e4df0b1e04a8d Mon Sep 17 00:00:00 2001
2 From: Koen Kooi <koen@dominion.thruhere.net>
3 Date: Wed, 3 Nov 2010 14:48:31 +0100
4 Subject: [PATCH 05/16] ARMV7: OMAP3: BeagleBoard: add xM rev B to ID table
6 Patch was updated by Jason Kridner <jkridner@beagleboard.org>:
7 * Use tabs to match style of other board revisions
8 * Only include board revisions that exist
9 * Default to the same configuration as the latest revision, but
10 without setting 'beaglerev'
11 ---
12 v2 Changes
13 * Updated with feedback from http://patchwork.ozlabs.org/patch/71995/
14 * Removed setting of mpurate based on board revision
15 * Set mpurate to auto in default environment variables
17 Cc: Koen Kooi <koen@dominion.thruhere.net>
18 ---
19 board/ti/beagle/beagle.c | 22 +++++++++++++++++-----
20 board/ti/beagle/beagle.h | 3 ++-
21 include/configs/omap3_beagle.h | 2 +-
22 3 files changed, 20 insertions(+), 7 deletions(-)
24 diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
25 index 9d03b24..87a952e 100644
26 --- a/board/ti/beagle/beagle.c
27 +++ b/board/ti/beagle/beagle.c
28 @@ -157,18 +157,15 @@ int misc_init_r(void)
29 case REVISION_AXBX:
30 printf("Beagle Rev Ax/Bx\n");
31 setenv("beaglerev", "AxBx");
32 - setenv("mpurate", "600");
33 break;
34 case REVISION_CX:
35 printf("Beagle Rev C1/C2/C3\n");
36 setenv("beaglerev", "Cx");
37 - setenv("mpurate", "600");
38 MUX_BEAGLE_C();
39 break;
40 case REVISION_C4:
41 printf("Beagle Rev C4\n");
42 setenv("beaglerev", "C4");
43 - setenv("mpurate", "720");
44 MUX_BEAGLE_C();
45 /* Set VAUX2 to 1.8V for EHCI PHY */
46 twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
47 @@ -176,10 +173,19 @@ int misc_init_r(void)
48 TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
49 TWL4030_PM_RECEIVER_DEV_GRP_P1);
50 break;
51 - case REVISION_XM:
52 + case REVISION_XM_A:
53 printf("Beagle xM Rev A\n");
54 setenv("beaglerev", "xMA");
55 - setenv("mpurate", "1000");
56 + MUX_BEAGLE_XM();
57 + /* Set VAUX2 to 1.8V for EHCI PHY */
58 + twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
59 + TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
60 + TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
61 + TWL4030_PM_RECEIVER_DEV_GRP_P1);
62 + break;
63 + case REVISION_XM_B:
64 + printf("Beagle xM Rev B\n");
65 + setenv("beaglerev", "xMB");
66 MUX_BEAGLE_XM();
67 /* Set VAUX2 to 1.8V for EHCI PHY */
68 twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
69 @@ -189,6 +195,12 @@ int misc_init_r(void)
70 break;
71 default:
72 printf("Beagle unknown 0x%02x\n", get_board_revision());
73 + MUX_BEAGLE_XM();
74 + /* Set VAUX2 to 1.8V for EHCI PHY */
75 + twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
76 + TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
77 + TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
78 + TWL4030_PM_RECEIVER_DEV_GRP_P1);
79 }
81 switch (get_expansion_id()) {
82 diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h
83 index b22b653..b0e26e5 100644
84 --- a/board/ti/beagle/beagle.h
85 +++ b/board/ti/beagle/beagle.h
86 @@ -37,7 +37,8 @@ const omap3_sysinfo sysinfo = {
87 #define REVISION_AXBX 0x7
88 #define REVISION_CX 0x6
89 #define REVISION_C4 0x5
90 -#define REVISION_XM 0x0
91 +#define REVISION_XM_A 0x0
92 +#define REVISION_XM_B 0x1
94 /*
95 * IEN - Input Enable
96 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
97 index c85537c..51e14d0 100644
98 --- a/include/configs/omap3_beagle.h
99 +++ b/include/configs/omap3_beagle.h
100 @@ -190,7 +190,7 @@
101 "loadaddr=0x82000000\0" \
102 "usbtty=cdc_acm\0" \
103 "console=ttyS2,115200n8\0" \
104 - "mpurate=500\0" \
105 + "mpurate=auto\0" \
106 "vram=12M\0" \
107 "dvimode=1024x768MR-16@60\0" \
108 "defaultdisplay=dvi\0" \
109 --
110 1.6.6.1