V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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>
This commit is contained in:
Koen Kooi 2011-04-18 17:28:32 -04:00 committed by Albert ARIBAUD
parent d4e53f063d
commit f6e593bb12
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
board/ti/beagle/beagle.c
View File

@ -164,18 +164,15 @@ int misc_init_r(void)
case REVISION_AXBX: case REVISION_AXBX:
printf("Beagle Rev Ax/Bx\n"); printf("Beagle Rev Ax/Bx\n");
setenv("beaglerev", "AxBx"); setenv("beaglerev", "AxBx");
setenv("mpurate", "600");
break; break;
case REVISION_CX: case REVISION_CX:
printf("Beagle Rev C1/C2/C3\n"); printf("Beagle Rev C1/C2/C3\n");
setenv("beaglerev", "Cx"); setenv("beaglerev", "Cx");
setenv("mpurate", "600");
MUX_BEAGLE_C(); MUX_BEAGLE_C();
break; break;
case REVISION_C4: case REVISION_C4:
printf("Beagle Rev C4\n"); printf("Beagle Rev C4\n");
setenv("beaglerev", "C4"); setenv("beaglerev", "C4");
setenv("mpurate", "720");
MUX_BEAGLE_C(); MUX_BEAGLE_C();
/* Set VAUX2 to 1.8V for EHCI PHY */ /* Set VAUX2 to 1.8V for EHCI PHY */
twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED, 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_VAUX2_DEV_GRP,
TWL4030_PM_RECEIVER_DEV_GRP_P1); TWL4030_PM_RECEIVER_DEV_GRP_P1);
break; break;
case REVISION_XM: case REVISION_XM_A:
printf("Beagle xM Rev A\n"); printf("Beagle xM Rev A\n");
setenv("beaglerev", "xMA"); 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(); MUX_BEAGLE_XM();
/* Set VAUX2 to 1.8V for EHCI PHY */ /* Set VAUX2 to 1.8V for EHCI PHY */
twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED, twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
@ -196,6 +202,12 @@ int misc_init_r(void)
break; break;
default: default:
printf("Beagle unknown 0x%02x\n", get_board_revision()); 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()) { switch (get_expansion_id()) {

3
board/ti/beagle/beagle.h
View File

@ -37,7 +37,8 @@ const omap3_sysinfo sysinfo = {
#define REVISION_AXBX 0x7 #define REVISION_AXBX 0x7
#define REVISION_CX 0x6 #define REVISION_CX 0x6
#define REVISION_C4 0x5 #define REVISION_C4 0x5
#define REVISION_XM 0x0 #define REVISION_XM_A 0x0
#define REVISION_XM_B 0x1
/* /*
* IEN - Input Enable * IEN - Input Enable

2
include/configs/omap3_beagle.h
View File

@ -203,7 +203,7 @@
"loadaddr=0x82000000\0" \ "loadaddr=0x82000000\0" \
"usbtty=cdc_acm\0" \ "usbtty=cdc_acm\0" \
"console=ttyS2,115200n8\0" \ "console=ttyS2,115200n8\0" \
"mpurate=500\0" \ "mpurate=auto\0" \
"vram=12M\0" \ "vram=12M\0" \
"dvimode=1024x768MR-16@60\0" \ "dvimode=1024x768MR-16@60\0" \
"defaultdisplay=dvi\0" \ "defaultdisplay=dvi\0" \