[U-Boot] [PATCH] ARMV7: OMAP3: BeagleBoard: add more expansionboard IDs
From: Koen Kooi koen@dominion.thruhere.net
Signed-off-by: Koen Kooi koen@dominion.thruhere.net Signed-off-by: Jason Kridner jkridner@beagleboard.org --- board/ti/beagle/beagle.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index d9b6f01..520e57d 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -48,6 +48,10 @@ #define TINCANTOOLS_TRAINER 0x04000100 #define TINCANTOOLS_SHOWDOG 0x03000100 #define KBADC_BEAGLEFPGA 0x01000600 +#define LW_BEAGLETOUCH 0x01000700 +#define LCDOG_BRAINMUX 0x01000800 +#define LCDOG_BRAINMUXTOUCH 0x02000800 +#define SF_HARDHAT 0x01000900
#define BEAGLE_NO_EEPROM 0xffffffff
@@ -223,6 +227,18 @@ int misc_init_r(void) MUX_KBADC_BEAGLEFPGA(); setenv("buddy", "beaglefpga"); break; + case LW_BEAGLETOUCH: + printf("Recognized Liquidware Beagletouch board\n"); + setenv("buddy", "beagletouch"); + break; + case LCDOG_BRAINMUX: + printf("Recognized Brainmux LCDog board\n"); + setenv("buddy", "lcdog"); + break; + case LCDOG_BRAINMUXTOUCH: + printf("Recognized Brainmux LCDog Touch board\n"); + setenv("buddy", "lcdogtouch"); + break; case BEAGLE_NO_EEPROM: printf("No EEPROM on expansion board\n"); setenv("buddy", "none");
From: Koen Kooi koen@dominion.thruhere.net
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: Jason Kridner jkridner@beagleboard.org --- board/ti/beagle/beagle.c | 20 +++++++++++++++++++- board/ti/beagle/beagle.h | 3 ++- 2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 520e57d..93c452e 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -176,7 +176,7 @@ 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"); @@ -187,8 +187,26 @@ int misc_init_r(void) 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"); + 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; default: printf("Beagle unknown 0x%02x\n", get_board_revision()); + 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); }
switch (get_expansion_id()) { diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h index 7d8dee0..fa893c4 100644 --- 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
Jason Kridner wrote, on 11/05/2010 01:46 AM:
From: Koen Kooikoen@dominion.thruhere.net
Patch was updated by Jason Kridnerjkridner@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: Jason Kridnerjkridner@beagleboard.org
not signed-off-by: Koen?
board/ti/beagle/beagle.c | 20 +++++++++++++++++++- board/ti/beagle/beagle.h | 3 ++- 2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 520e57d..93c452e 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -176,7 +176,7 @@ 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");
@@ -187,8 +187,26 @@ int misc_init_r(void) 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");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;setenv("mpurate", "1000");
It looks to me looking at the file that mpurate usage is CPU based and NOT board based.. maybe you should use the cpu idendity to decide on mpurate instead?
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 7d8dee0..fa893c4 100644 --- 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
On Fri, Nov 5, 2010 at 10:54 AM, Nishanth Menon menon.nishanth@gmail.com wrote:
Jason Kridner wrote, on 11/05/2010 01:46 AM:
From: Koen Kooikoen@dominion.thruhere.net
Patch was updated by Jason Kridnerjkridner@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: Jason Kridnerjkridner@beagleboard.org
not signed-off-by: Koen?
board/ti/beagle/beagle.c | 20 +++++++++++++++++++- board/ti/beagle/beagle.h | 3 ++- 2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 520e57d..93c452e 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -176,7 +176,7 @@ 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"); @@ -187,8 +187,26 @@ int misc_init_r(void) 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");
- 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;
default: printf("Beagle unknown 0x%02x\n", get_board_revision());
- setenv("mpurate", "1000");
It looks to me looking at the file that mpurate usage is CPU based and NOT board based.. maybe you should use the cpu idendity to decide on mpurate instead?
I noticed this too. I just submitted a patch for Overo that sets the mpurate to the cpu maximum (based on cpu type and version) if the mpurate environment variable is set to "auto"
This solves an additional issue: with things as they are now, it is not possible for a user to set the mpurate to a specific value -- it will always be overwritten. The scheme above allows the user to set a specific value or to allow u-boot to set the maximum automatically.
Note that for 36xx my patch sets the max to 720 -- this is because mainline/linux-omap currently does not support 1000. We can adjust that when kernel support for 1000 appears.
My plan was to submit a similar patch for Beagle.
Steve
- 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 7d8dee0..fa893c4 100644 --- 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
-- Regards, Nishanth Menon _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Steve Sakoman wrote, on 11/05/2010 11:05 PM:
On Fri, Nov 5, 2010 at 10:54 AM, Nishanth Menon menon.nishanth@gmail.com wrote:
Jason Kridner wrote, on 11/05/2010 01:46 AM:
From: Koen Kooikoen@dominion.thruhere.net
Patch was updated by Jason Kridnerjkridner@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: Jason Kridnerjkridner@beagleboard.org
not signed-off-by: Koen?
board/ti/beagle/beagle.c | 20 +++++++++++++++++++- board/ti/beagle/beagle.h | 3 ++- 2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 520e57d..93c452e 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -176,7 +176,7 @@ 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");@@ -187,8 +187,26 @@ int misc_init_r(void) 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");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; default: printf("Beagle unknown 0x%02x\n", get_board_revision());setenv("mpurate", "1000");It looks to me looking at the file that mpurate usage is CPU based and NOT board based.. maybe you should use the cpu idendity to decide on mpurate instead?
I noticed this too. I just submitted a patch for Overo that sets the mpurate to the cpu maximum (based on cpu type and version) if the mpurate environment variable is set to "auto"
just for the record, saw this and I liked it :) thanks.
This solves an additional issue: with things as they are now, it is not possible for a user to set the mpurate to a specific value -- it will always be overwritten. The scheme above allows the user to set a specific value or to allow u-boot to set the maximum automatically.
Note that for 36xx my patch sets the max to 720 -- this is because mainline/linux-omap currently does not support 1000. We can adjust that when kernel support for 1000 appears.
Errr.. that is not completely true[1](ignoring the lack of upstream DVFS for OMAP3+) - Here is the explanation for it:
36xx family of silicon comes in 4 variants - the ones that support upto 600MHz, ones that do 800MHz, ones that do 1GHz and the ones that do 1.2GHz. the defaults posted upstream enables the least common denominator - 300,600MHz and it leaves it to board files to mention if they have silicon of additional capability- unfortunately, there is no bits that tell the s/w that(for those wondering - yeah s/w folks did try to convince h/w folks for those additional bits.. but after a long debate never succeeded) :(
Anyway, to put a long story short - if your board file supports 1GHz, with upstream OPP layer, you do have the flexibility to enable 1GHz OPP - just look at opp_enable[2] usage documentation [3]. I used thermal management as an example here, but no reason why we cant use it as well.. this way, you can infact support cpufreq if you would like to as well.
Ref: [1] https://patchwork.kernel.org/patch/266911/ (search for omap36xx_opp_def_list) [2] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=in... [3] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=Do...
-----Original Message----- From: u-boot-bounces@lists.denx.de [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Steve Sakoman Sent: Saturday, November 06, 2010 8:35 AM To: Nishanth Menon Cc: u-boot@lists.denx.de; Koen Kooi Subject: Re: [U-Boot] [PATCH] ARMV7: OMAP3: BeagleBoard: add xM rev B to ID table
[snip]
Note that for 36xx my patch sets the max to 720 -- this is because mainline/linux-omap currently does not support 1000. We can adjust that when kernel support for 1000 appears.
[sp] 720MHz is not a valid frequency for 36x. It is the highest freq for OMAP35x - subject to associated bit set in the silicon. 600MHz would be be safe for all OMAP35x family processors.
For 36xx, the freq should be 800MHz (if you don't want 1GHz).
[snip]
Premi, Sanjeev wrote, on 11/07/2010 03:16 AM:
-----Original Message----- From: u-boot-bounces@lists.denx.de [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Steve Sakoman Sent: Saturday, November 06, 2010 8:35 AM To: Nishanth Menon Cc: u-boot@lists.denx.de; Koen Kooi Subject: Re: [U-Boot] [PATCH] ARMV7: OMAP3: BeagleBoard: add xM rev B to ID table
[snip]
Note that for 36xx my patch sets the max to 720 -- this is because mainline/linux-omap currently does not support 1000. We can adjust that when kernel support for 1000 appears.
[sp] 720MHz is not a valid frequency for 36x. It is the highest freq for OMAP35x - subject to associated bit set in the silicon. 600MHz would be be safe for all OMAP35x family processors.
For 36xx, the freq should be 800MHz (if you don't want 1GHz).
yep, Good catch :) , 720 is not valid either 800/1GHz :(
On Sun, Nov 7, 2010 at 6:56 AM, Nishanth Menon menon.nishanth@gmail.com wrote:
Premi, Sanjeev wrote, on 11/07/2010 03:16 AM:
-----Original Message----- From: u-boot-bounces@lists.denx.de [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Steve Sakoman Sent: Saturday, November 06, 2010 8:35 AM To: Nishanth Menon Cc: u-boot@lists.denx.de; Koen Kooi Subject: Re: [U-Boot] [PATCH] ARMV7: OMAP3: BeagleBoard: add xM rev B to ID table
[snip]
Note that for 36xx my patch sets the max to 720 -- this is because mainline/linux-omap currently does not support 1000. We can adjust that when kernel support for 1000 appears.
[sp] 720MHz is not a valid frequency for 36x. It is the highest freq for OMAP35x - subject to associated bit set in the silicon. 600MHz would be be safe for all OMAP35x family processors.
For 36xx, the freq should be 800MHz (if you don't want 1GHz).
yep, Good catch :) , 720 is not valid either 800/1GHz :(
Thanks for pointing out that I can go up to 800 Mhz.
For the record, on my 3730 based system, using:
Linux version 2.6.36 (steve@build.sakoman.com) (gcc version 4.3.3 (GCC) ) #1 Thu Nov 4 21:19:18 PDT 2010
The kernel reports the processor as:
OMAP3630 ES1.0 (l2cache iva sgx neon isp 192mhz_clk )
I tried mpurate settings of 720, 800, and 1000.
Though you say it is "not valid", an mpurate setting of 720 is successful and yields:
Switched to new clocking rate (Crystal/Core/MPU): 26.0/720/359 MHz
An mpurate setting of 800 is successful and yields:
Switched to new clocking rate (Crystal/Core/MPU): 26.0/800/359 MHz
An mpurate setting of 1000 is not successful and yields:
WARNING: at arch/arm/mach-omap2/clock.c:440 omap2_clk_switch_mpurate_at_boot+0x80/0xb4() clock: dpll1_ck: unable to set MPU rate to 1000: -22
I will resubmit the patch changing to 800 for 36XX/37XX.
Steve
Steve Sakoman wrote, on 11/07/2010 11:00 AM:
Though you say it is "not valid", an mpurate setting of 720 is successful and yields:
Switched to new clocking rate (Crystal/Core/MPU): 26.0/720/359 MHz
this should be reported to linux-omap for a fix -> unless someone has made some assumption in kernel.org that frequency x really means <=x ;) might be good to know why if so..
From: Koen Kooi koen@dominion.thruhere.net
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' --- v2 Changes * Updated with feedback from http://patchwork.ozlabs.org/patch/71995/ * Removed setting of mpurate based on board revision * Set mpurate to auto in default environment variables
Cc: Koen Kooi koen@dominion.thruhere.net Signed-off-by: Jason Kridner jkridner@beagleboard.org --- board/ti/beagle/beagle.c | 22 +++++++++++++++++----- board/ti/beagle/beagle.h | 3 ++- include/configs/omap3_beagle.h | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 3884ca1..4049606 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -157,18 +157,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, @@ -176,10 +173,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, @@ -189,6 +195,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 b22b653..b0e26e5 100644 --- 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 c85537c..51e14d0 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -190,7 +190,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" \
From: Koen Kooi koen@dominion.thruhere.net
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'
v2 Changes
- Updated with feedback from http://patchwork.ozlabs.org/patch/71995/
- Removed setting of mpurate based on board revision
- Set mpurate to auto in default environment variables
Cc: Koen Kooi koen@dominion.thruhere.net Signed-off-by: Jason Kridner jkridner@beagleboard.org
Pushed to u-boot-ti
Dear Jason Kridner,
In message 1288936010-30462-1-git-send-email-jkridner@beagleboard.org you wrote:
From: Koen Kooi koen@dominion.thruhere.net
Signed-off-by: Koen Kooi koen@dominion.thruhere.net Signed-off-by: Jason Kridner jkridner@beagleboard.org
board/ti/beagle/beagle.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index d9b6f01..520e57d 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -48,6 +48,10 @@ #define TINCANTOOLS_TRAINER 0x04000100 #define TINCANTOOLS_SHOWDOG 0x03000100 #define KBADC_BEAGLEFPGA 0x01000600 +#define LW_BEAGLETOUCH 0x01000700 +#define LCDOG_BRAINMUX 0x01000800 +#define LCDOG_BRAINMUXTOUCH 0x02000800 +#define SF_HARDHAT 0x01000900
^^^^^^^^^^^^^^^^^^^^^^
Where is this being used?
Best regards,
Wolfgang Denk
-----Original Message----- From: u-boot-bounces@lists.denx.de [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Jason Kridner Sent: Friday, November 05, 2010 11:17 AM To: u-boot@lists.denx.de Cc: Koen Kooi Subject: [U-Boot] [PATCH] ARMV7: OMAP3: BeagleBoard: add more expansionboard IDs
[sp] Is it really necessary to mention ARMV7 in the subject line? OMAP3 & BeagbeBoard seem sufficient.
From: Koen Kooi koen@dominion.thruhere.net
Signed-off-by: Koen Kooi koen@dominion.thruhere.net Signed-off-by: Jason Kridner jkridner@beagleboard.org
board/ti/beagle/beagle.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index d9b6f01..520e57d 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -48,6 +48,10 @@ #define TINCANTOOLS_TRAINER 0x04000100 #define TINCANTOOLS_SHOWDOG 0x03000100 #define KBADC_BEAGLEFPGA 0x01000600 +#define LW_BEAGLETOUCH 0x01000700 +#define LCDOG_BRAINMUX 0x01000800 +#define LCDOG_BRAINMUXTOUCH 0x02000800
[sp] Don't see any mechanism to read these values. Assuming the detection mechanism is consistent i.e. no difference due to different eeprom etc. etc.
+#define SF_HARDHAT 0x01000900
[sp] Don't see this used below
#define BEAGLE_NO_EEPROM 0xffffffff
@@ -223,6 +227,18 @@ int misc_init_r(void) MUX_KBADC_BEAGLEFPGA(); setenv("buddy", "beaglefpga"); break;
- case LW_BEAGLETOUCH:
printf("Recognized Liquidware Beagletouch board\n");setenv("buddy", "beagletouch");break;- case LCDOG_BRAINMUX:
printf("Recognized Brainmux LCDog board\n");setenv("buddy", "lcdog");break;- case LCDOG_BRAINMUXTOUCH:
printf("Recognized Brainmux LCDog Touch board\n");setenv("buddy", "lcdogtouch");break;-- 1.5.6.4
U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
From: Koen Kooi koen@dominion.thruhere.net
Information on configurations pulled from http://www.elinux.org/BeagleBoardPinMux#Vendor_and_Device_IDs
Boards added: * Added BeagleBoardToys WiFi, VGA and LCD boards * Added KBADC Beagle FPGA board * Added Brainmux LCDog and LCDog Touch * Added Liquidware BeagleTouch --- v2 updates * Feedback from http://www.mail-archive.com/u-boot@lists.denx.de/msg41851.html - Removed unused definitions - The detection mechanism *is* consistent, simple read from an EEPROM * Added BeagleBoardToys board configurations * Made definition names consistent as VENDOR_BOARD
Signed-off-by: Jason Kridner jkridner@beagleboard.org Cc: Koen Kooi koen@dominion.thruhere.net --- board/ti/beagle/beagle.c | 30 +++++++++++++++++++++++++++++- board/ti/beagle/beagle.h | 12 ++++++++++++ 2 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 4049606..e05232f 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -48,7 +48,12 @@ #define TINCANTOOLS_TRAINER 0x04000100 #define TINCANTOOLS_SHOWDOG 0x03000100 #define KBADC_BEAGLEFPGA 0x01000600 - +#define LW_BEAGLETOUCH 0x01000700 +#define BRAINMUX_LCDOG 0x01000800 +#define BRAINMUX_LCDOGTOUCH 0x02000800 +#define BBTOYS_WIFI 0x01000B00 +#define BBTOYS_VGA 0x02000B00 +#define BBTOYS_LCD 0x03000B00 #define BEAGLE_NO_EEPROM 0xffffffff
DECLARE_GLOBAL_DATA_PTR; @@ -239,6 +244,29 @@ int misc_init_r(void) MUX_KBADC_BEAGLEFPGA(); setenv("buddy", "beaglefpga"); break; + case LW_BEAGLETOUCH: + printf("Recognized Liquidware BeagleTouch board\n"); + setenv("buddy", "beagletouch"); + break; + case BRAINMUX_LCDOG: + printf("Recognized Brainmux LCDog board\n"); + setenv("buddy", "lcdog"); + break; + case BRAINMUX_LCDOGTOUCH: + printf("Recognized Brainmux LCDog Touch board\n"); + setenv("buddy", "lcdogtouch"); + break; + case BBTOYS_WIFI: + printf("Recognized BeagleBoardToys WiFi board\n"); + MUX_BBTOYS_WIFI() + setenv("buddy", "bbtoys-wifi"); + break;; + case BBTOYS_VGA: + printf("Recognized BeagleBoardToys VGA board\n"); + break;; + case BBTOYS_LCD: + printf("Recognized BeagleBoardToys LCD board\n"); + break;; case BEAGLE_NO_EEPROM: printf("No EEPROM on expansion board\n"); setenv("buddy", "none"); diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h index b0e26e5..0f21790 100644 --- a/board/ti/beagle/beagle.h +++ b/board/ti/beagle/beagle.h @@ -458,4 +458,16 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(MCBSP1_DR), (IEN | PTU | EN | M1)) /*MCSPI4_SOMI*/\ MUX_VAL(CP(MCBSP1_FSX), (IDIS | PTU | DIS | M1)) /*MCSPI4_CS0*/
+#define MUX_BBTOYS_WIFI() \ + MUX_VAL(CP(MMC2_CLK), (IEN | PTU | EN | M0)) /*MMC2_CLK*/\ + MUX_VAL(CP(MMC2_CMD), (IEN | PTU | EN | M0)) /*MMC2_CMD*/\ + MUX_VAL(CP(MMC2_DAT0), (IEN | PTU | EN | M0)) /*MMC2_DAT0*/\ + MUX_VAL(CP(MMC2_DAT1), (IEN | PTU | EN | M0)) /*MMC2_DAT1*/\ + MUX_VAL(CP(MMC2_DAT2), (IEN | PTU | EN | M0)) /*MMC2_DAT2*/\ + MUX_VAL(CP(MMC2_DAT3), (IEN | PTU | EN | M0)) /*MMC2_DAT3*/\ + MUX_VAL(CP(MMC2_DAT4), (IDIS | PTU | EN | M4)) /*GPIO_136 FM_EN/BT_WU*/\ + MUX_VAL(CP(MMC2_DAT5), (IEN | PTU | EN | M4)) /*GPIO_137 WLAN_IRQ*/\ + MUX_VAL(CP(MMC2_DAT6), (IDIS | PTU | EN | M4)) /*GPIO_138 BT_EN*/\ + MUX_VAL(CP(MMC2_DAT7), (IDIS | PTU | EN | M4)) /*GPIO_139 WLAN_EN*/ + #endif
From: Koen Kooi koen@dominion.thruhere.net
Information on configurations pulled from http://www.elinux.org/BeagleBoardPinMux#Vendor_and_Device_IDs
Boards added:
- Added BeagleBoardToys WiFi, VGA and LCD boards
- Added KBADC Beagle FPGA board
- Added Brainmux LCDog and LCDog Touch
- Added Liquidware BeagleTouch
v2 updates
- Feedback from http://www.mail-archive.com/u-
boot@lists.denx.de/msg41851.html - Removed unused definitions - The detection mechanism *is* consistent, simple read from an EEPROM
- Added BeagleBoardToys board configurations
- Made definition names consistent as VENDOR_BOARD
Signed-off-by: Jason Kridner jkridner@beagleboard.org
Pushed to u-boot-ti
participants (6)
-
Jason Kridner -
Nishanth Menon -
Paulraj, Sandeep -
Premi, Sanjeev -
Steve Sakoman -
Wolfgang Denk