Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0d28047 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-soc-cleanups-for-3.11' of git://github.com/mripard/linux into next/cleanup 



From Maxime Ripard:
Cleanups in various machine definitions
  - Patches to remove the .init_irq definition when using irqchip_init
  - Make the ARM core code call debug_ll_io_init when no map_io callback is
    declared
  - Remove the .map_io definition in the various machines using it

(Some of these go through the platform maintainers, these are the ones who got
explicitly acked and not picked up by anyone else)

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>

* tag 'arm-soc-cleanups-for-3.11' of git://github.com/mripard/linux:
  ARM: sunxi: Remove the .map_io function declaration
  ARM: mxs: remove the .map_io declaration
  ARM: highbank: remove the .map_io declaration
  ARM: mmu: Call debug_ll_io_init if no map_io function is specified
  ARM: vt8500: Remove init_irq declaration in machine description
  ARM: virt: Remove init_irq declaration in machine description
  ARM: vexpress: Remove init_irq declaration in machine description
  ARM: sirf: Remove init_irq declaration in machine description
  ARM: spear: Remove init_irq declaration in machine description
  ARM: nomadik: Remove init_irq declaration in machine description
parents b891e30e 442f1508

arch/arm/mach-highbank/highbank.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -176,7 +176,6 @@ static const char *highbank_match[] __initconst = { 




DT_MACHINE_START(HIGHBANK, "Highbank")

DT_MACHINE_START(HIGHBANK, "Highbank")

	.smp		= smp_ops(highbank_smp_ops),

	.smp		= smp_ops(highbank_smp_ops),

	.map_io		= debug_ll_io_init,

	.init_irq	= highbank_init_irq,

	.init_irq	= highbank_init_irq,

	.init_time	= highbank_timer_init,

	.init_time	= highbank_timer_init,

	.init_machine	= highbank_init,

	.init_machine	= highbank_init,

arch/arm/mach-mxs/mach-mxs.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -434,7 +434,6 @@ static const char *mxs_dt_compat[] __initdata = { 
};

};





DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)")

DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)")

	.map_io		= debug_ll_io_init,

	.init_irq	= irqchip_init,

	.init_irq	= irqchip_init,

	.handle_irq	= icoll_handle_irq,

	.handle_irq	= icoll_handle_irq,

	.init_time	= mxs_timer_init,

	.init_time	= mxs_timer_init,

arch/arm/mach-nomadik/cpu-8815.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

#include <linux/irqchip.h>

#include <linux/platform_data/clk-nomadik.h>

#include <linux/platform_data/clk-nomadik.h>

#include <linux/platform_data/pinctrl-nomadik.h>

#include <linux/platform_data/pinctrl-nomadik.h>

#include <linux/pinctrl/machine.h>

#include <linux/pinctrl/machine.h>
@@ -323,7 +322,6 @@ static const char * cpu8815_board_compat[] = { 




DT_MACHINE_START(NOMADIK_DT, "Nomadik STn8815")

DT_MACHINE_START(NOMADIK_DT, "Nomadik STn8815")

	.map_io		= cpu8815_map_io,

	.map_io		= cpu8815_map_io,

	.init_irq	= irqchip_init,

	.init_time	= cpu8815_timer_init_of,

	.init_time	= cpu8815_timer_init_of,

	.init_machine	= cpu8815_init_of,

	.init_machine	= cpu8815_init_of,

	.restart	= cpu8815_restart,

	.restart	= cpu8815_restart,

arch/arm/mach-prima2/common.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <linux/clocksource.h>

#include <linux/clocksource.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/irqchip.h>

#include <asm/sizes.h>

#include <asm/sizes.h>

#include <asm/mach-types.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>
@@ -55,7 +54,6 @@ DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)") 
	/* Maintainer: Barry Song <baohua.song@csr.com> */

	/* Maintainer: Barry Song <baohua.song@csr.com> */

	.nr_irqs	= 128,

	.nr_irqs	= 128,

	.map_io         = sirfsoc_map_io,

	.map_io         = sirfsoc_map_io,

	.init_irq	= irqchip_init,

	.init_time	= sirfsoc_init_time,

	.init_time	= sirfsoc_init_time,

	.init_machine	= sirfsoc_mach_init,

	.init_machine	= sirfsoc_mach_init,

	.init_late	= sirfsoc_init_late,

	.init_late	= sirfsoc_init_late,
@@ -74,7 +72,6 @@ DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)") 
	/* Maintainer: Barry Song <baohua.song@csr.com> */

	/* Maintainer: Barry Song <baohua.song@csr.com> */

	.nr_irqs	= 128,

	.nr_irqs	= 128,

	.map_io         = sirfsoc_map_io,

	.map_io         = sirfsoc_map_io,

	.init_irq	= irqchip_init,

	.init_time	= sirfsoc_init_time,

	.init_time	= sirfsoc_init_time,

	.dma_zone_size	= SZ_256M,

	.dma_zone_size	= SZ_256M,

	.init_machine	= sirfsoc_mach_init,

	.init_machine	= sirfsoc_mach_init,
@@ -94,7 +91,6 @@ DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)") 
	/* Maintainer: Barry Song <baohua.song@csr.com> */

	/* Maintainer: Barry Song <baohua.song@csr.com> */

	.smp            = smp_ops(sirfsoc_smp_ops),

	.smp            = smp_ops(sirfsoc_smp_ops),

	.map_io         = sirfsoc_map_io,

	.map_io         = sirfsoc_map_io,

	.init_irq	= irqchip_init,

	.init_time	= sirfsoc_init_time,

	.init_time	= sirfsoc_init_time,

	.init_machine	= sirfsoc_mach_init,

	.init_machine	= sirfsoc_mach_init,

	.init_late	= sirfsoc_init_late,

	.init_late	= sirfsoc_init_late,

arch/arm/mach-spear/spear1310.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ 
#define pr_fmt(fmt) "SPEAr1310: " fmt

#define pr_fmt(fmt) "SPEAr1310: " fmt





#include <linux/amba/pl022.h>

#include <linux/amba/pl022.h>

#include <linux/irqchip.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/pata_arasan_cf_data.h>

#include <linux/pata_arasan_cf_data.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>
@@ -60,7 +59,6 @@ static void __init spear1310_map_io(void) 
DT_MACHINE_START(SPEAR1310_DT, "ST SPEAr1310 SoC with Flattened Device Tree")

DT_MACHINE_START(SPEAR1310_DT, "ST SPEAr1310 SoC with Flattened Device Tree")

	.smp		=	smp_ops(spear13xx_smp_ops),

	.smp		=	smp_ops(spear13xx_smp_ops),

	.map_io		=	spear1310_map_io,

	.map_io		=	spear1310_map_io,

	.init_irq	=	irqchip_init,

	.init_time	=	spear13xx_timer_init,

	.init_time	=	spear13xx_timer_init,

	.init_machine	=	spear1310_dt_init,

	.init_machine	=	spear1310_dt_init,

	.restart	=	spear_restart,

	.restart	=	spear_restart,