leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ARM] OMAP3 powerdomains: make USBTLL SAR only available on ES3.1 and beyond

Browse Source 
Richard Woodruff writes that chip errata prevent USBTLL SAR from working
on OMAP3 ES levels before ES3.1:

http://marc.info/?l=linux-arm-kernel&m=123319614808833&w=2

Update the OMAP3 powerdomain structures appropriately.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Richard Woodruff <r-woodruff2@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Paul Walmsley 2009-02-05 20:45:28 -07:00 committed by Russell King
parent d41ad52040
commit 7eb1afc976
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-omap2/powerdomains.h
View File

@ -171,7 +171,8 @@ static struct powerdomain *powerdomains_omap[] __initdata = {
&iva2_pwrdm, &iva2_pwrdm,
&mpu_34xx_pwrdm, &mpu_34xx_pwrdm,
&neon_pwrdm, &neon_pwrdm,
&core_34xx_pwrdm, &core_34xx_pre_es3_1_pwrdm,
&core_34xx_es3_1_pwrdm,
&cam_pwrdm, &cam_pwrdm,
&dss_pwrdm, &dss_pwrdm,
&per_pwrdm, &per_pwrdm,

25
arch/arm/mach-omap2/powerdomains34xx.h
View File

@ -200,10 +200,12 @@ static struct powerdomain mpu_34xx_pwrdm = {
}; };
/* No wkdeps or sleepdeps for 34xx core apparently */ /* No wkdeps or sleepdeps for 34xx core apparently */
static struct powerdomain core_34xx_pwrdm = { static struct powerdomain core_34xx_pre_es3_1_pwrdm = {
.name = "core_pwrdm", .name = "core_pwrdm",
.prcm_offs = CORE_MOD, .prcm_offs = CORE_MOD,
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES1 |
CHIP_IS_OMAP3430ES2 |
CHIP_IS_OMAP3430ES3_0),
.pwrsts = PWRSTS_OFF_RET_ON, .pwrsts = PWRSTS_OFF_RET_ON,
.dep_bit = OMAP3430_EN_CORE_SHIFT, .dep_bit = OMAP3430_EN_CORE_SHIFT,
.banks = 2, .banks = 2,
@ -217,6 +219,25 @@ static struct powerdomain core_34xx_pwrdm = {
}, },
}; };
/* No wkdeps or sleepdeps for 34xx core apparently */
static struct powerdomain core_34xx_es3_1_pwrdm = {
.name = "core_pwrdm",
.prcm_offs = CORE_MOD,
.omap_chip = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES3_1),
.pwrsts = PWRSTS_OFF_RET_ON,
.dep_bit = OMAP3430_EN_CORE_SHIFT,
.flags = PWRDM_HAS_HDWR_SAR, /* for USBTLL only */
.banks = 2,
.pwrsts_mem_ret = {
[0] = PWRSTS_OFF_RET, /* MEM1RETSTATE */
[1] = PWRSTS_OFF_RET, /* MEM2RETSTATE */
},
.pwrsts_mem_on = {
[0] = PWRSTS_OFF_RET_ON, /* MEM1ONSTATE */
[1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */
},
};
/* Another case of bit name collisions between several registers: EN_DSS */ /* Another case of bit name collisions between several registers: EN_DSS */
static struct powerdomain dss_pwrdm = { static struct powerdomain dss_pwrdm = {
.name = "dss_pwrdm", .name = "dss_pwrdm",