diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-28 10:31:11 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-05-29 19:50:30 -0400 |
commit | dcf9c7f9f4c5acd9ea72782263d2d76bbeadd9f7 (patch) | |
tree | ae3e7a40beb800f52240d740711516851b5b2e91 | |
parent | 2c4133c5d0e98ea5c7faca780e2b846d10f430c8 (diff) |
ARM: l2c: zynq: convert to generic l2c OF initialisation
Remove the explicit call to l2x0_of_init(), converting to the generic
infrastructure instead.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-zynq/common.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 1e617a6dedc3..d1e992e6403e 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c | |||
@@ -67,11 +67,6 @@ static void __init zynq_init_machine(void) | |||
67 | { | 67 | { |
68 | struct platform_device_info devinfo = { .name = "cpufreq-cpu0", }; | 68 | struct platform_device_info devinfo = { .name = "cpufreq-cpu0", }; |
69 | 69 | ||
70 | /* | ||
71 | * 64KB way size, 8-way associativity, parity disabled | ||
72 | */ | ||
73 | l2x0_of_init(0x02000000, 0xf0ffffff); | ||
74 | |||
75 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | 70 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
76 | 71 | ||
77 | platform_device_register(&zynq_cpuidle_device); | 72 | platform_device_register(&zynq_cpuidle_device); |
@@ -133,6 +128,9 @@ static const char * const zynq_dt_match[] = { | |||
133 | }; | 128 | }; |
134 | 129 | ||
135 | DT_MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform") | 130 | DT_MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform") |
131 | /* 64KB way size, 8-way associativity, parity disabled */ | ||
132 | .l2c_aux_val = 0x02000000, | ||
133 | .l2c_aux_mask = 0xf0ffffff, | ||
136 | .smp = smp_ops(zynq_smp_ops), | 134 | .smp = smp_ops(zynq_smp_ops), |
137 | .map_io = zynq_map_io, | 135 | .map_io = zynq_map_io, |
138 | .init_irq = zynq_irq_init, | 136 | .init_irq = zynq_irq_init, |