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

Commit 1cb3fd09 authored Aug 04, 2013 by Olof Johansson

Merge tag 'renesas-cleanup-for-v3.12' of...

Merge tag 'renesas-cleanup-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

From Simon Horman:
renesas-cleanup-for-v3.12 Renesas ARM based SoC cleanups for v3.12

* remove mach/dma.h, it is not used
* r8a7778 SoC: Removed unused r8a7778_init_irq
* emev2 SoC: Use less verbose resource declarations
* emev2 SoC: Correct typo in comment
* r8a7790 SoC: Remove redundant init_machine callback
* emev2, r8a7740, r8a7778, r8a7779, sh7372 and sh73a0 SoCs: Remove auxdata
* emev2, r8a73a4, ape6evm, r8a7790 and sh73a0 SoCs, and
  lager and kzm9g boards: remove init_irq declaration in machine description
* sh73a0 SoC: pinmux platform device cleanup
* r8a7778 SoC: add __initdata on resource and device data
* armadillo800eva board: Remove unused commend and define

* tag 'renesas-cleanup-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

: (22 commits)
  ARM: shmobile: Remove unused mach/dma.h
  ARM: shmobile: r8a7778: remove r8a7778_init_irq()
  ARM: shmobile: Fix EMEV2 clock comment typo
  ARM: shmobile: Make EMEV2 platform devices more compact
  ARM: shmobile: Remove unused EMEV2/KZM9D early console
  ARM: shmobile: Remove redundant r8a7790 callback
  ARM: shmobile: Remove unused sh73a0 auxdata table
  ARM: shmobile: Remove unused sh7372 auxdata table
  ARM: shmobile: Remove unused r8a7779 auxdata table
  ARM: shmobile: Remove unused r8a7778 auxdata and callback
  ARM: shmobile: Remove unused r8a7740 auxdata table
  ARM: shmobile: Remove unused EMEV2 auxdata and callback
  ARM: shmobile: kzm9g: Remove init_irq declaration in machine description
  ARM: shmobile: sh73a0: Remove init_irq declaration in machine description
  ARM: shmobile: lager: Remove init_irq declaration in machine description
  ARM: shmobile: r8a7790: Remove init_irq declaration in machine description
  ARM: shmobile: ape6evm: Remove init_irq declaration in machine description
  ARM: shmobile: r8a73a4: Remove init_irq declaration in machine description
  ARM: shmobile: emev2: Remove init_irq declaration in machine description
  ARM: shmobile: sh73a0 pinmux platform device cleanup
  ...

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

parents 087bd3d4 ebd9616f

arch/arm/mach-shmobile/board-ape6evm.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@

		#include <linux/gpio.h>
		#include <linux/interrupt.h>
		#include <linux/irqchip.h>
		#include <linux/kernel.h>
		#include <linux/pinctrl/machine.h>
		#include <linux/platform_device.h>
		@@ -102,7 +101,6 @@ static const char *ape6evm_boards_compat_dt[] __initdata = {
		};

		DT_MACHINE_START(APE6EVM_DT, "ape6evm")
		.init_irq = irqchip_init,
		.init_time = shmobile_timer_init,
		.init_machine = ape6evm_add_standard_devices,
		.dt_compat = ape6evm_boards_compat_dt,

arch/arm/mach-shmobile/board-armadillo800eva.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -679,15 +679,6 @@ static struct platform_device vcc_sdhi1 = {
		};

		/* SDHI0 */
		/*
		* FIXME
		*
		* It use polling mode here, since
		* CD (= Card Detect) pin is not connected to SDHI0_CD.
		* We can use IRQ31 as card detect irq,
		* but it needs chattering removal operation
		*/
		#define IRQ31 irq_pin(31)
		static struct sh_mobile_sdhi_info sdhi0_info = {
		.dma_slave_tx = SHDMA_SLAVE_SDHI0_TX,
		.dma_slave_rx = SHDMA_SLAVE_SDHI0_RX,

arch/arm/mach-shmobile/board-kzm9d.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ static const char *kzm9d_boards_compat_dt[] __initdata = {
		DT_MACHINE_START(KZM9D_DT, "kzm9d")
		.smp = smp_ops(emev2_smp_ops),
		.map_io = emev2_map_io,
		.init_early = emev2_add_early_devices,
		.init_early = emev2_init_delay,
		.nr_irqs = NR_IRQS_LEGACY,
		.init_irq = emev2_init_irq,
		.init_machine = kzm9d_add_standard_devices,

arch/arm/mach-shmobile/board-kzm9g-reference.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@
		#include <linux/gpio.h>
		#include <linux/io.h>
		#include <linux/irq.h>
		#include <linux/irqchip.h>
		#include <linux/input.h>
		#include <linux/of_platform.h>
		#include <linux/pinctrl/machine.h>
		@@ -99,7 +98,6 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-reference")
		.map_io = sh73a0_map_io,
		.init_early = sh73a0_init_delay,
		.nr_irqs = NR_IRQS_LEGACY,
		.init_irq = irqchip_init,
		.init_machine = kzm_init,
		.init_time = shmobile_timer_init,
		.dt_compat = kzm9g_boards_compat_dt,

arch/arm/mach-shmobile/board-lager.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@
		#include <linux/gpio_keys.h>
		#include <linux/input.h>
		#include <linux/interrupt.h>
		#include <linux/irqchip.h>
		#include <linux/kernel.h>
		#include <linux/leds.h>
		#include <linux/pinctrl/machine.h>
		@@ -103,7 +102,6 @@ static const char *lager_boards_compat_dt[] __initdata = {
		};

		DT_MACHINE_START(LAGER_DT, "lager")
		.init_irq = irqchip_init,
		.init_time = r8a7790_timer_init,
		.init_machine = lager_add_standard_devices,
		.dt_compat = lager_boards_compat_dt,