--- zzzz-none-000/linux-3.10.107/arch/arm/mach-prima2/common.c 2017-06-27 09:49:32.000000000 +0000 +++ scorpion-7490-727/linux-3.10.107/arch/arm/mach-prima2/common.c 2021-02-04 17:41:59.000000000 +0000 @@ -6,10 +6,8 @@ * Licensed under GPLv2 or later. */ -#include #include #include -#include #include #include #include @@ -17,88 +15,51 @@ #include #include "common.h" -static struct of_device_id sirfsoc_of_bus_ids[] __initdata = { - { .compatible = "simple-bus", }, - {}, -}; - -void __init sirfsoc_mach_init(void) -{ - of_platform_bus_probe(NULL, sirfsoc_of_bus_ids, NULL); -} - -void __init sirfsoc_init_late(void) +static void __init sirfsoc_init_late(void) { sirfsoc_pm_init(); } -static __init void sirfsoc_init_time(void) -{ - /* initialize clocking early, we want to set the OS timer */ - sirfsoc_of_clk_init(); - clocksource_of_init(); -} - -static __init void sirfsoc_map_io(void) -{ - sirfsoc_map_lluart(); - sirfsoc_map_scu(); -} - #ifdef CONFIG_ARCH_ATLAS6 -static const char *atlas6_dt_match[] __initdata = { +static const char *const atlas6_dt_match[] __initconst = { "sirf,atlas6", NULL }; DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)") /* Maintainer: Barry Song */ - .nr_irqs = 128, - .map_io = sirfsoc_map_io, - .init_irq = irqchip_init, - .init_time = sirfsoc_init_time, - .init_machine = sirfsoc_mach_init, + .l2c_aux_val = 0, + .l2c_aux_mask = ~0, .init_late = sirfsoc_init_late, .dt_compat = atlas6_dt_match, - .restart = sirfsoc_restart, MACHINE_END #endif #ifdef CONFIG_ARCH_PRIMA2 -static const char *prima2_dt_match[] __initdata = { - "sirf,prima2", - NULL +static const char *const prima2_dt_match[] __initconst = { + "sirf,prima2", + NULL }; DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)") /* Maintainer: Barry Song */ - .nr_irqs = 128, - .map_io = sirfsoc_map_io, - .init_irq = irqchip_init, - .init_time = sirfsoc_init_time, + .l2c_aux_val = 0, + .l2c_aux_mask = ~0, .dma_zone_size = SZ_256M, - .init_machine = sirfsoc_mach_init, .init_late = sirfsoc_init_late, .dt_compat = prima2_dt_match, - .restart = sirfsoc_restart, MACHINE_END #endif -#ifdef CONFIG_ARCH_MARCO -static const char *marco_dt_match[] __initdata = { - "sirf,marco", +#ifdef CONFIG_ARCH_ATLAS7 +static const char *const atlas7_dt_match[] __initconst = { + "sirf,atlas7", NULL }; -DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)") +DT_MACHINE_START(ATLAS7_DT, "Generic ATLAS7 (Flattened Device Tree)") /* Maintainer: Barry Song */ .smp = smp_ops(sirfsoc_smp_ops), - .map_io = sirfsoc_map_io, - .init_irq = irqchip_init, - .init_time = sirfsoc_init_time, - .init_machine = sirfsoc_mach_init, - .init_late = sirfsoc_init_late, - .dt_compat = marco_dt_match, - .restart = sirfsoc_restart, + .dt_compat = atlas7_dt_match, MACHINE_END #endif