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

From Simon Horman:
Third round of Renesas ARM based SoC cleanups for v3.12

* Remove global GPIO_NR definition from sh73a0 SoC
* Remove unnecessary nfsroot settings from bootargs of
  kzm9d and armadillo800eva
* Rename irq initialisation functions of r8a7779 SoC
  to make them consistent with other SoCs
* Simplify irq initialisation of r8a7740 SoC
* Add missing __initdata annotations to bockw board, and
  r8a7790 and r8a7779 SoCs
* Refactor time initialisation and remove shmobile_init_time.
  - This affects the following boards: kzm9g, marzen, ape6evm,
    armadillo800eva and bockw
  - This affects the following SoCs: r8a7790, r8a7779, r7a7740, r7a73a4
* Cleanup device registration code of r8a7778 SoC

* tag 'renesas-cleanup3-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (45 commits)
  ARM: shmobile: sh73a0: Remove global GPIO_NR definition
  ARM: shmobile: kzm9d: remove nfsroot settings from bootargs
  ARM: shmobile: armadillo800eva: remove nfsroot settings from bootargs
  ARM: shmobile: r8a7779: move r8a7779_init_irq_xxx() to setup
  ARM: shmobile: r8a7740: move r8a7740_init_irq_of() to setup
  ARM: shmobile: bockw: add missing __initdata
  ARM: shmobile: r8a7790: add missing __initdata
  ARM: shmobile: r8a7779: add missing __initdata
  ARM: shmobile: Remove unused shmobile_init_time()
  ARM: shmobile: Use clocksource_of_init() on r8a7790
  ARM: shmobile: Use default ->init_time() on KZM9G DT ref
  ARM: shmobile: Use default ->init_time() on Marzen DT ref
  ARM: shmobile: Use default ->init_time() on APE6EVM DT ref
  ARM: shmobile: Use default ->init_time() on APE6EVM
  ARM: shmobile: Use default ->init_time() on Armadillo DT ref
  ARM: shmobile: Use default ->init_time() on Bockw DT ref
  ARM: shmobile: Use default ->init_time() on Bockw
  ARM: shmobile: Use default ->init_time() on r8a7779
  ARM: shmobile: Use default ->init_time() on r8a7778
  ARM: shmobile: Use default ->init_time() on r8a7740
  ...

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

1 files changed, 0 insertions, 130 deletions

diff --git a/arch/arm/mach-shmobile/intc-r8a7779.c b/arch/arm/mach-shmobile/intc-r8a7779.c
deleted file mode 100644
index 5f9e5dc0238b..000000000000
--- a/arch/arm/mach-shmobile/intc-r8a7779.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * r8a7779 processor support - INTC hardware block
- *
- * Copyright (C) 2011  Renesas Solutions Corp.
- * Copyright (C) 2011  Magnus Damm
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/io.h>
-#include <linux/irqchip/arm-gic.h>
-#include <linux/platform_data/irq-renesas-intc-irqpin.h>
-#include <linux/irqchip.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
-#include <mach/r8a7779.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#define INT2SMSKCR0 IOMEM(0xfe7822a0)
-#define INT2SMSKCR1 IOMEM(0xfe7822a4)
-#define INT2SMSKCR2 IOMEM(0xfe7822a8)
-#define INT2SMSKCR3 IOMEM(0xfe7822ac)
-#define INT2SMSKCR4 IOMEM(0xfe7822b0)
-
-#define INT2NTSR0 IOMEM(0xfe700060)
-#define INT2NTSR1 IOMEM(0xfe700064)
-
-static struct renesas_intc_irqpin_config irqpin0_platform_data = {
-        .irq_base = irq_pin(0), /* IRQ0 -> IRQ3 */
-        .sense_bitfield_width = 2,
-};
-
-static struct resource irqpin0_resources[] = {
-        DEFINE_RES_MEM(0xfe78001c, 4), /* ICR1 */
-        DEFINE_RES_MEM(0xfe780010, 4), /* INTPRI */
-        DEFINE_RES_MEM(0xfe780024, 4), /* INTREQ */
-        DEFINE_RES_MEM(0xfe780044, 4), /* INTMSK0 */
-        DEFINE_RES_MEM(0xfe780064, 4), /* INTMSKCLR0 */
-        DEFINE_RES_IRQ(gic_spi(27)), /* IRQ0 */
-        DEFINE_RES_IRQ(gic_spi(28)), /* IRQ1 */
-        DEFINE_RES_IRQ(gic_spi(29)), /* IRQ2 */
-        DEFINE_RES_IRQ(gic_spi(30)), /* IRQ3 */
-};
-
-static struct platform_device irqpin0_device = {
-        .name           = "renesas_intc_irqpin",
-        .id             = 0,
-        .resource       = irqpin0_resources,
-        .num_resources  = ARRAY_SIZE(irqpin0_resources),
-        .dev            = {
-                .platform_data  = &irqpin0_platform_data,
-        },
-};
-
-void __init r8a7779_init_irq_extpin(int irlm)
-{
-        void __iomem *icr0 = ioremap_nocache(0xfe780000, PAGE_SIZE);
-        unsigned long tmp;
-
-        if (icr0) {
-                tmp = ioread32(icr0);
-                if (irlm)
-                        tmp |= 1 << 23; /* IRQ0 -> IRQ3 as individual pins */
-                else
-                        tmp &= ~(1 << 23); /* IRL mode - not supported */
-                tmp |= (1 << 21); /* LVLMODE = 1 */
-                iowrite32(tmp, icr0);
-                iounmap(icr0);
-
-                if (irlm)
-                        platform_device_register(&irqpin0_device);
-        } else
-                pr_warn("r8a7779: unable to setup external irq pin mode\n");
-}
-
-static int r8a7779_set_wake(struct irq_data *data, unsigned int on)
-{
-        return 0; /* always allow wakeup */
-}
-
-static void __init r8a7779_init_irq_common(void)
-{
-        gic_arch_extn.irq_set_wake = r8a7779_set_wake;
-
-        /* route all interrupts to ARM */
-        __raw_writel(0xffffffff, INT2NTSR0);
-        __raw_writel(0x3fffffff, INT2NTSR1);
-
-        /* unmask all known interrupts in INTCS2 */
-        __raw_writel(0xfffffff0, INT2SMSKCR0);
-        __raw_writel(0xfff7ffff, INT2SMSKCR1);
-        __raw_writel(0xfffbffdf, INT2SMSKCR2);
-        __raw_writel(0xbffffffc, INT2SMSKCR3);
-        __raw_writel(0x003fee3f, INT2SMSKCR4);
-}
-
-void __init r8a7779_init_irq(void)
-{
-        void __iomem *gic_dist_base = IOMEM(0xf0001000);
-        void __iomem *gic_cpu_base = IOMEM(0xf0000100);
-
-        /* use GIC to handle interrupts */
-        gic_init(0, 29, gic_dist_base, gic_cpu_base);
-
-        r8a7779_init_irq_common();
-}
-
-#ifdef CONFIG_OF
-void __init r8a7779_init_irq_dt(void)
-{
-        irqchip_init();
-        r8a7779_init_irq_common();
-}
-#endif