Browse Source

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>
Russell King 11 years ago
parent
commit
dcf9c7f9f4
1 changed files with 3 additions and 5 deletions
  1. 3 5
      arch/arm/mach-zynq/common.c

+ 3 - 5
arch/arm/mach-zynq/common.c

@@ -67,11 +67,6 @@ static void __init zynq_init_machine(void)
 {
 {
 	struct platform_device_info devinfo = { .name = "cpufreq-cpu0", };
 	struct platform_device_info devinfo = { .name = "cpufreq-cpu0", };
 
 
-	/*
-	 * 64KB way size, 8-way associativity, parity disabled
-	 */
-	l2x0_of_init(0x02000000, 0xf0ffffff);
-
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
 
 	platform_device_register(&zynq_cpuidle_device);
 	platform_device_register(&zynq_cpuidle_device);
@@ -133,6 +128,9 @@ static const char * const zynq_dt_match[] = {
 };
 };
 
 
 DT_MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform")
 DT_MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform")
+	/* 64KB way size, 8-way associativity, parity disabled */
+	.l2c_aux_val	= 0x02000000,
+	.l2c_aux_mask	= 0xf0ffffff,
 	.smp		= smp_ops(zynq_smp_ops),
 	.smp		= smp_ops(zynq_smp_ops),
 	.map_io		= zynq_map_io,
 	.map_io		= zynq_map_io,
 	.init_irq	= zynq_irq_init,
 	.init_irq	= zynq_irq_init,