diff options
| author | Haojian Zhuang <haojian.zhuang@gmail.com> | 2012-08-04 11:57:38 -0400 |
|---|---|---|
| committer | Haojian Zhuang <haojian.zhuang@gmail.com> | 2012-08-16 04:17:00 -0400 |
| commit | a03d8b1e4606be10c0fedf1ccabe22dc3a5060f9 (patch) | |
| tree | b8bf5e898c654b4f17bed019fcc1b0ec7038d67e | |
| parent | c2b7e05c753156dfba3240c59c400d557c5c8746 (diff) | |
ARM: mmp: enable tauros2 cache in pxa910
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
| -rw-r--r-- | arch/arm/boot/dts/pxa910.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/mach-mmp/pxa910.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/pxa910.dtsi b/arch/arm/boot/dts/pxa910.dtsi index aebf32de73b4..a3be44d86bcd 100644 --- a/arch/arm/boot/dts/pxa910.dtsi +++ b/arch/arm/boot/dts/pxa910.dtsi | |||
| @@ -25,6 +25,11 @@ | |||
| 25 | interrupt-parent = <&intc>; | 25 | interrupt-parent = <&intc>; |
| 26 | ranges; | 26 | ranges; |
| 27 | 27 | ||
| 28 | L2: l2-cache { | ||
| 29 | compatible = "marvell,tauros2-cache"; | ||
| 30 | marvell,tauros2-cache-features = <0x3>; | ||
| 31 | }; | ||
| 32 | |||
| 28 | axi@d4200000 { /* AXI */ | 33 | axi@d4200000 { /* AXI */ |
| 29 | compatible = "mrvl,axi-bus", "simple-bus"; | 34 | compatible = "mrvl,axi-bus", "simple-bus"; |
| 30 | #address-cells = <1>; | 35 | #address-cells = <1>; |
diff --git a/arch/arm/mach-mmp/pxa910.c b/arch/arm/mach-mmp/pxa910.c index 6da52e9f2bdc..51ac8d1898c1 100644 --- a/arch/arm/mach-mmp/pxa910.c +++ b/arch/arm/mach-mmp/pxa910.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| 15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
| 16 | 16 | ||
| 17 | #include <asm/hardware/cache-tauros2.h> | ||
| 17 | #include <asm/mach/time.h> | 18 | #include <asm/mach/time.h> |
| 18 | #include <mach/addr-map.h> | 19 | #include <mach/addr-map.h> |
| 19 | #include <mach/regs-apbc.h> | 20 | #include <mach/regs-apbc.h> |
| @@ -116,6 +117,9 @@ static struct clk_lookup pxa910_clkregs[] = { | |||
| 116 | static int __init pxa910_init(void) | 117 | static int __init pxa910_init(void) |
| 117 | { | 118 | { |
| 118 | if (cpu_is_pxa910()) { | 119 | if (cpu_is_pxa910()) { |
| 120 | #ifdef CONFIG_CACHE_TAUROS2 | ||
| 121 | tauros2_init(0); | ||
| 122 | #endif | ||
| 119 | mfp_init_base(MFPR_VIRT_BASE); | 123 | mfp_init_base(MFPR_VIRT_BASE); |
| 120 | mfp_init_addr(pxa910_mfp_addr_map); | 124 | mfp_init_addr(pxa910_mfp_addr_map); |
| 121 | pxa_init_dma(IRQ_PXA910_DMA_INT0, 32); | 125 | pxa_init_dma(IRQ_PXA910_DMA_INT0, 32); |
