|
@@ -46,10 +46,10 @@ static struct of_device_id zynq_of_bus_ids[] __initdata = {
|
|
|
};
|
|
|
|
|
|
/**
|
|
|
- * xilinx_init_machine() - System specific initialization, intended to be
|
|
|
- * called from board specific initialization.
|
|
|
+ * zynq_init_machine - System specific initialization, intended to be
|
|
|
+ * called from board specific initialization.
|
|
|
*/
|
|
|
-static void __init xilinx_init_machine(void)
|
|
|
+static void __init zynq_init_machine(void)
|
|
|
{
|
|
|
/*
|
|
|
* 64KB way size, 8-way associativity, parity disabled
|
|
@@ -59,7 +59,7 @@ static void __init xilinx_init_machine(void)
|
|
|
of_platform_bus_probe(NULL, zynq_of_bus_ids, NULL);
|
|
|
}
|
|
|
|
|
|
-static void __init xilinx_zynq_timer_init(void)
|
|
|
+static void __init zynq_timer_init(void)
|
|
|
{
|
|
|
zynq_slcr_init();
|
|
|
clocksource_of_init();
|
|
@@ -84,9 +84,9 @@ static void __init zynq_scu_map_io(void)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * xilinx_map_io() - Create memory mappings needed for early I/O.
|
|
|
+ * zynq_map_io - Create memory mappings needed for early I/O.
|
|
|
*/
|
|
|
-static void __init xilinx_map_io(void)
|
|
|
+static void __init zynq_map_io(void)
|
|
|
{
|
|
|
debug_ll_io_init();
|
|
|
zynq_scu_map_io();
|
|
@@ -97,17 +97,17 @@ static void zynq_system_reset(char mode, const char *cmd)
|
|
|
zynq_slcr_system_reset();
|
|
|
}
|
|
|
|
|
|
-static const char *xilinx_dt_match[] = {
|
|
|
+static const char * const zynq_dt_match[] = {
|
|
|
"xlnx,zynq-zc702",
|
|
|
"xlnx,zynq-7000",
|
|
|
NULL
|
|
|
};
|
|
|
|
|
|
MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform")
|
|
|
- .map_io = xilinx_map_io,
|
|
|
+ .map_io = zynq_map_io,
|
|
|
.init_irq = irqchip_init,
|
|
|
- .init_machine = xilinx_init_machine,
|
|
|
- .init_time = xilinx_zynq_timer_init,
|
|
|
- .dt_compat = xilinx_dt_match,
|
|
|
+ .init_machine = zynq_init_machine,
|
|
|
+ .init_time = zynq_timer_init,
|
|
|
+ .dt_compat = zynq_dt_match,
|
|
|
.restart = zynq_system_reset,
|
|
|
MACHINE_END
|