diff options
author | Tony Lindgren <tony@atomide.com> | 2012-06-29 06:07:08 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-06-29 06:07:08 -0700 |
commit | f6f1f12f6d4e9e4a44587e58ec96db25673083ec (patch) | |
tree | 68f44e3d64ebbee9f89c459136702ca243bbfa61 /arch/arm/mach-highbank/highbank.c | |
parent | e0246e8ecad10b9437381b89756292ac031d4cfa (diff) | |
parent | a77e1c4d09c88f98ac2e653382d2c1861dbb736f (diff) |
Merge tag 'omap-devel-d-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes-non-criticalomap-fixes-non-critical-for-v3.6
Some OMAP AM35xx fixes.
The powerdomain and clockdomain data for the AM35xx are finally fixed.
The AM35xx EMAC/MDIO Ethernet controller integration code has been
converted to use the OMAP device and hwmod framework. Also the UART4
and HSOTGUSB warnings have been fixed.
Diffstat (limited to 'arch/arm/mach-highbank/highbank.c')
-rw-r--r-- | arch/arm/mach-highbank/highbank.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 410a112bb52e..8777612b1a42 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -85,10 +85,24 @@ const static struct of_device_id irq_match[] = { {} }; +#ifdef CONFIG_CACHE_L2X0 +static void highbank_l2x0_disable(void) +{ + /* Disable PL310 L2 Cache controller */ + highbank_smc1(0x102, 0x0); +} +#endif + static void __init highbank_init_irq(void) { of_irq_init(irq_match); + +#ifdef CONFIG_CACHE_L2X0 + /* Enable PL310 L2 Cache controller */ + highbank_smc1(0x102, 0x1); l2x0_of_init(0, ~0UL); + outer_cache.disable = highbank_l2x0_disable; +#endif } static void __init highbank_timer_init(void) |