Merge tag 'cleanup-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC late cleanups from Arnd Bergmann:
 "These are cleanups and smaller changes that either depend on earlier
  feature branches or came in late during the development cycle.  We
  normally try to get all cleanups early, so these are the exceptions:

   - A follow-up on the clocksource reworks, hopefully the last time we
     need to merge clocksource subsystem changes through arm-soc.

     A first set of patches was part of the original 3.10 arm-soc
     cleanup series because of interdependencies with timer drivers now
     moved out of arch/arm.

   - Migrating the SPEAr13xx platform away from using auxdata for DMA
     channel descriptions towards using information in device tree,
     based on the earlier SPEAr multiplatform series

   - A few follow-ups on the Atmel SAMA5 support and other changes for
     Atmel at91 based on the larger at91 reworks.

   - Moving the armada irqchip implementation to drivers/irqchip

   - Several OMAP cleanups following up on the larger series already
     merged in 3.10."

* tag 'cleanup-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (50 commits)
  ARM: OMAP4: change the device names in usb_bind_phy
  ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a
  ARM: SPEAr: conditionalize SMP code
  ARM: arch_timer: Silence debug preempt warnings
  ARM: OMAP: remove unused variable
  serial: amba-pl011: fix !CONFIG_DMA_ENGINE case
  ata: arasan: remove the need for platform_data
  ARM: at91/sama5d34ek.dts: remove not needed compatibility string
  ARM: at91: dts: add MCI DMA support
  ARM: at91: dts: add i2c dma support
  ARM: at91: dts: set #dma-cells to the correct value
  ARM: at91: suspend both memory controllers on at91sam9263
  irqchip: armada-370-xp: slightly cleanup irq controller driver
  irqchip: armada-370-xp: move IRQ handler to avoid forward declaration
  irqchip: move IRQ driver for Armada 370/XP
  ARM: mvebu: move L2 cache initialization in init_early()
  devtree: add binding documentation for sp804
  ARM: integrator-cp: convert use CLKSRC_OF for timer init
  ARM: versatile: use OF init for sp804 timer
  ARM: versatile: add versatile dtbs to dtbs target
  ...

7 files changed, 6 insertions, 257 deletions

diff --git a/arch/arm/mach-spear/Makefile b/arch/arm/mach-spear/Makefile
index af9bffb94f1c..a946c19ab31a 100644
--- a/arch/arm/mach-spear/Makefile
+++ b/arch/arm/mach-spear/Makefile
@@ -7,10 +7,10 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
 # Common support
 obj-y   := restart.o time.o
 
-obj-$(CONFIG_SMP)               += headsmp.o platsmp.o
-obj-$(CONFIG_HOTPLUG_CPU)       += hotplug.o
+smp-$(CONFIG_SMP)               += headsmp.o platsmp.o
+smp-$(CONFIG_HOTPLUG_CPU)       += hotplug.o
 
-obj-$(CONFIG_ARCH_SPEAR13XX)    += spear13xx.o
+obj-$(CONFIG_ARCH_SPEAR13XX)    += spear13xx.o $(smp-y)
 obj-$(CONFIG_MACH_SPEAR1310)    += spear1310.o
 obj-$(CONFIG_MACH_SPEAR1340)    += spear1340.o
 
diff --git a/arch/arm/mach-spear/generic.h b/arch/arm/mach-spear/generic.h
index 8ba7e75b648d..a9fd45362fee 100644
--- a/arch/arm/mach-spear/generic.h
+++ b/arch/arm/mach-spear/generic.h
@@ -22,11 +22,6 @@ extern void spear13xx_timer_init(void);
 extern void spear3xx_timer_init(void);
 extern struct pl022_ssp_controller pl022_plat_data;
 extern struct pl08x_platform_data pl080_plat_data;
-extern struct dw_dma_platform_data dmac_plat_data;
-extern struct dw_dma_slave cf_dma_priv;
-extern struct dw_dma_slave nand_read_dma_priv;
-extern struct dw_dma_slave nand_write_dma_priv;
-bool dw_dma_filter(struct dma_chan *chan, void *slave);
 
 void __init spear_setup_of_timer(void);
 void __init spear3xx_clk_init(void __iomem *misc_base,
diff --git a/arch/arm/mach-spear/include/mach/spear.h b/arch/arm/mach-spear/include/mach/spear.h
index 374ddc393df1..cf3a5369eeca 100644
--- a/arch/arm/mach-spear/include/mach/spear.h
+++ b/arch/arm/mach-spear/include/mach/spear.h
@@ -82,8 +82,6 @@
 #define VA_L2CC_BASE                            IOMEM(UL(0xFB000000))
 
 /* others */
-#define DMAC0_BASE                              UL(0xEA800000)
-#define DMAC1_BASE                              UL(0xEB000000)
 #define MCIF_CF_BASE                            UL(0xB2800000)
 
 /* Debug uart for linux, will be used for debug and uncompress messages */
diff --git a/arch/arm/mach-spear/spear1310.c b/arch/arm/mach-spear/spear1310.c
index ed3b5c287a7b..9eaac2c881ea 100644
--- a/arch/arm/mach-spear/spear1310.c
+++ b/arch/arm/mach-spear/spear1310.c
@@ -23,40 +23,12 @@
 #include <mach/spear.h>
 
 /* Base addresses */
-#define SPEAR1310_SSP1_BASE                     UL(0x5D400000)
-#define SPEAR1310_SATA0_BASE                    UL(0xB1000000)
-#define SPEAR1310_SATA1_BASE                    UL(0xB1800000)
-#define SPEAR1310_SATA2_BASE                    UL(0xB4000000)
-
 #define SPEAR1310_RAS_GRP1_BASE                 UL(0xD8000000)
 #define VA_SPEAR1310_RAS_GRP1_BASE              UL(0xFA000000)
 
-static struct arasan_cf_pdata cf_pdata = {
-        .cf_if_clk = CF_IF_CLK_166M,
-        .quirk = CF_BROKEN_UDMA,
-        .dma_priv = &cf_dma_priv,
-};
-
-/* ssp device registration */
-static struct pl022_ssp_controller ssp1_plat_data = {
-        .enable_dma = 0,
-};
-
-/* Add SPEAr1310 auxdata to pass platform data */
-static struct of_dev_auxdata spear1310_auxdata_lookup[] __initdata = {
-        OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, &cf_pdata),
-        OF_DEV_AUXDATA("snps,dma-spear1340", DMAC0_BASE, NULL, &dmac_plat_data),
-        OF_DEV_AUXDATA("snps,dma-spear1340", DMAC1_BASE, NULL, &dmac_plat_data),
-        OF_DEV_AUXDATA("arm,pl022", SSP_BASE, NULL, &pl022_plat_data),
-
-        OF_DEV_AUXDATA("arm,pl022", SPEAR1310_SSP1_BASE, NULL, &ssp1_plat_data),
-        {}
-};
-
 static void __init spear1310_dt_init(void)
 {
-        of_platform_populate(NULL, of_default_bus_match_table,
-                        spear1310_auxdata_lookup, NULL);
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
 static const char * const spear1310_dt_board_compat[] = {
diff --git a/arch/arm/mach-spear/spear1340.c b/arch/arm/mach-spear/spear1340.c
index 75e38644bbfb..a04a7fe76f71 100644
--- a/arch/arm/mach-spear/spear1340.c
+++ b/arch/arm/mach-spear/spear1340.c
@@ -16,18 +16,16 @@
 #include <linux/ahci_platform.h>
 #include <linux/amba/serial.h>
 #include <linux/delay.h>
-#include <linux/dw_dmac.h>
 #include <linux/of_platform.h>
 #include <linux/irqchip.h>
 #include <asm/mach/arch.h>
 #include "generic.h"
 #include <mach/spear.h>
 
-#include "spear13xx-dma.h"
+/* FIXME: Move SATA PHY code into a standalone driver */
 
 /* Base addresses */
 #define SPEAR1340_SATA_BASE                     UL(0xB1000000)
-#define SPEAR1340_UART1_BASE                    UL(0xB4100000)
 
 /* Power Management Registers */
 #define SPEAR1340_PCM_CFG                       (VA_MISC_BASE + 0x100)
@@ -79,28 +77,6 @@
                         (SPEAR1340_MIPHY_OSC_BYPASS_EXT | \
                         SPEAR1340_MIPHY_PLL_RATIO_TOP(25))
 
-static struct dw_dma_slave uart1_dma_param[] = {
-        {
-                /* Tx */
-                .cfg_hi = DWC_CFGH_DST_PER(SPEAR1340_DMA_REQ_UART1_TX),
-                .cfg_lo = 0,
-                .src_master = DMA_MASTER_MEMORY,
-                .dst_master = SPEAR1340_DMA_MASTER_UART1,
-        }, {
-                /* Rx */
-                .cfg_hi = DWC_CFGH_SRC_PER(SPEAR1340_DMA_REQ_UART1_RX),
-                .cfg_lo = 0,
-                .src_master = SPEAR1340_DMA_MASTER_UART1,
-                .dst_master = DMA_MASTER_MEMORY,
-        }
-};
-
-static struct amba_pl011_data uart1_data = {
-        .dma_filter = dw_dma_filter,
-        .dma_tx_param = &uart1_dma_param[0],
-        .dma_rx_param = &uart1_dma_param[1],
-};
-
 /* SATA device registration */
 static int sata_miphy_init(struct device *dev, void __iomem *addr)
 {
@@ -159,14 +135,8 @@ static struct ahci_platform_data sata_pdata = {
 
 /* Add SPEAr1340 auxdata to pass platform data */
 static struct of_dev_auxdata spear1340_auxdata_lookup[] __initdata = {
-        OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, &cf_dma_priv),
-        OF_DEV_AUXDATA("snps,dma-spear1340", DMAC0_BASE, NULL, &dmac_plat_data),
-        OF_DEV_AUXDATA("snps,dma-spear1340", DMAC1_BASE, NULL, &dmac_plat_data),
-        OF_DEV_AUXDATA("arm,pl022", SSP_BASE, NULL, &pl022_plat_data),
-
         OF_DEV_AUXDATA("snps,spear-ahci", SPEAR1340_SATA_BASE, NULL,
                         &sata_pdata),
-        OF_DEV_AUXDATA("arm,pl011", SPEAR1340_UART1_BASE, NULL, &uart1_data),
         {}
 };
 
diff --git a/arch/arm/mach-spear/spear13xx-dma.h b/arch/arm/mach-spear/spear13xx-dma.h
deleted file mode 100644
index d50bdb605925..000000000000
--- a/arch/arm/mach-spear/spear13xx-dma.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * arch/arm/mach-spear13xx/include/mach/dma.h
- *
- * DMA information for SPEAr13xx machine family
- *
- * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.linux@gmail.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#ifndef __MACH_DMA_H
-#define __MACH_DMA_H
-
-/* request id of all the peripherals */
-enum dma_master_info {
-        /* Accessible from only one master */
-        DMA_MASTER_MCIF = 0,
-        DMA_MASTER_FSMC = 1,
-        /* Accessible from both 0 & 1 */
-        DMA_MASTER_MEMORY = 0,
-        DMA_MASTER_ADC = 0,
-        DMA_MASTER_UART0 = 0,
-        DMA_MASTER_SSP0 = 0,
-        DMA_MASTER_I2C0 = 0,
-
-#ifdef CONFIG_MACH_SPEAR1310
-        /* Accessible from only one master */
-        SPEAR1310_DMA_MASTER_JPEG = 1,
-
-        /* Accessible from both 0 & 1 */
-        SPEAR1310_DMA_MASTER_I2S = 0,
-        SPEAR1310_DMA_MASTER_UART1 = 0,
-        SPEAR1310_DMA_MASTER_UART2 = 0,
-        SPEAR1310_DMA_MASTER_UART3 = 0,
-        SPEAR1310_DMA_MASTER_UART4 = 0,
-        SPEAR1310_DMA_MASTER_UART5 = 0,
-        SPEAR1310_DMA_MASTER_I2C1 = 0,
-        SPEAR1310_DMA_MASTER_I2C2 = 0,
-        SPEAR1310_DMA_MASTER_I2C3 = 0,
-        SPEAR1310_DMA_MASTER_I2C4 = 0,
-        SPEAR1310_DMA_MASTER_I2C5 = 0,
-        SPEAR1310_DMA_MASTER_I2C6 = 0,
-        SPEAR1310_DMA_MASTER_I2C7 = 0,
-        SPEAR1310_DMA_MASTER_SSP1 = 0,
-#endif
-
-#ifdef CONFIG_MACH_SPEAR1340
-        /* Accessible from only one master */
-        SPEAR1340_DMA_MASTER_I2S_PLAY = 1,
-        SPEAR1340_DMA_MASTER_I2S_REC = 1,
-        SPEAR1340_DMA_MASTER_I2C1 = 1,
-        SPEAR1340_DMA_MASTER_UART1 = 1,
-
-        /* following are accessible from both master 0 & 1 */
-        SPEAR1340_DMA_MASTER_SPDIF = 0,
-        SPEAR1340_DMA_MASTER_CAM = 1,
-        SPEAR1340_DMA_MASTER_VIDEO_IN = 0,
-        SPEAR1340_DMA_MASTER_MALI = 0,
-#endif
-};
-
-enum request_id {
-        DMA_REQ_ADC = 0,
-        DMA_REQ_SSP0_TX = 4,
-        DMA_REQ_SSP0_RX = 5,
-        DMA_REQ_UART0_TX = 6,
-        DMA_REQ_UART0_RX = 7,
-        DMA_REQ_I2C0_TX = 8,
-        DMA_REQ_I2C0_RX = 9,
-
-#ifdef CONFIG_MACH_SPEAR1310
-        SPEAR1310_DMA_REQ_FROM_JPEG = 2,
-        SPEAR1310_DMA_REQ_TO_JPEG = 3,
-        SPEAR1310_DMA_REQ_I2S_TX = 10,
-        SPEAR1310_DMA_REQ_I2S_RX = 11,
-
-        SPEAR1310_DMA_REQ_I2C1_RX = 0,
-        SPEAR1310_DMA_REQ_I2C1_TX = 1,
-        SPEAR1310_DMA_REQ_I2C2_RX = 2,
-        SPEAR1310_DMA_REQ_I2C2_TX = 3,
-        SPEAR1310_DMA_REQ_I2C3_RX = 4,
-        SPEAR1310_DMA_REQ_I2C3_TX = 5,
-        SPEAR1310_DMA_REQ_I2C4_RX = 6,
-        SPEAR1310_DMA_REQ_I2C4_TX = 7,
-        SPEAR1310_DMA_REQ_I2C5_RX = 8,
-        SPEAR1310_DMA_REQ_I2C5_TX = 9,
-        SPEAR1310_DMA_REQ_I2C6_RX = 10,
-        SPEAR1310_DMA_REQ_I2C6_TX = 11,
-        SPEAR1310_DMA_REQ_UART1_RX = 12,
-        SPEAR1310_DMA_REQ_UART1_TX = 13,
-        SPEAR1310_DMA_REQ_UART2_RX = 14,
-        SPEAR1310_DMA_REQ_UART2_TX = 15,
-        SPEAR1310_DMA_REQ_UART5_RX = 16,
-        SPEAR1310_DMA_REQ_UART5_TX = 17,
-        SPEAR1310_DMA_REQ_SSP1_RX = 18,
-        SPEAR1310_DMA_REQ_SSP1_TX = 19,
-        SPEAR1310_DMA_REQ_I2C7_RX = 20,
-        SPEAR1310_DMA_REQ_I2C7_TX = 21,
-        SPEAR1310_DMA_REQ_UART3_RX = 28,
-        SPEAR1310_DMA_REQ_UART3_TX = 29,
-        SPEAR1310_DMA_REQ_UART4_RX = 30,
-        SPEAR1310_DMA_REQ_UART4_TX = 31,
-#endif
-
-#ifdef CONFIG_MACH_SPEAR1340
-        SPEAR1340_DMA_REQ_SPDIF_TX = 2,
-        SPEAR1340_DMA_REQ_SPDIF_RX = 3,
-        SPEAR1340_DMA_REQ_I2S_TX = 10,
-        SPEAR1340_DMA_REQ_I2S_RX = 11,
-        SPEAR1340_DMA_REQ_UART1_TX = 12,
-        SPEAR1340_DMA_REQ_UART1_RX = 13,
-        SPEAR1340_DMA_REQ_I2C1_TX = 14,
-        SPEAR1340_DMA_REQ_I2C1_RX = 15,
-        SPEAR1340_DMA_REQ_CAM0_EVEN = 0,
-        SPEAR1340_DMA_REQ_CAM0_ODD = 1,
-        SPEAR1340_DMA_REQ_CAM1_EVEN = 2,
-        SPEAR1340_DMA_REQ_CAM1_ODD = 3,
-        SPEAR1340_DMA_REQ_CAM2_EVEN = 4,
-        SPEAR1340_DMA_REQ_CAM2_ODD = 5,
-        SPEAR1340_DMA_REQ_CAM3_EVEN = 6,
-        SPEAR1340_DMA_REQ_CAM3_ODD = 7,
-#endif
-};
-
-#endif /* __MACH_DMA_H */
diff --git a/arch/arm/mach-spear/spear13xx.c b/arch/arm/mach-spear/spear13xx.c
index 6dd208997176..3621599c38ad 100644
--- a/arch/arm/mach-spear/spear13xx.c
+++ b/arch/arm/mach-spear/spear13xx.c
@@ -16,70 +16,12 @@
 #include <linux/amba/pl022.h>
 #include <linux/clk.h>
 #include <linux/clocksource.h>
-#include <linux/dw_dmac.h>
 #include <linux/err.h>
 #include <linux/of.h>
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/mach/map.h>
-#include "generic.h"
 #include <mach/spear.h>
-
-#include "spear13xx-dma.h"
-
-/* common dw_dma filter routine to be used by peripherals */
-bool dw_dma_filter(struct dma_chan *chan, void *slave)
-{
-        struct dw_dma_slave *dws = (struct dw_dma_slave *)slave;
-
-        if (chan->device->dev == dws->dma_dev) {
-                chan->private = slave;
-                return true;
-        } else {
-                return false;
-        }
-}
-
-/* ssp device registration */
-static struct dw_dma_slave ssp_dma_param[] = {
-        {
-                /* Tx */
-                .cfg_hi = DWC_CFGH_DST_PER(DMA_REQ_SSP0_TX),
-                .cfg_lo = 0,
-                .src_master = DMA_MASTER_MEMORY,
-                .dst_master = DMA_MASTER_SSP0,
-        }, {
-                /* Rx */
-                .cfg_hi = DWC_CFGH_SRC_PER(DMA_REQ_SSP0_RX),
-                .cfg_lo = 0,
-                .src_master = DMA_MASTER_SSP0,
-                .dst_master = DMA_MASTER_MEMORY,
-        }
-};
-
-struct pl022_ssp_controller pl022_plat_data = {
-        .enable_dma = 1,
-        .dma_filter = dw_dma_filter,
-        .dma_rx_param = &ssp_dma_param[1],
-        .dma_tx_param = &ssp_dma_param[0],
-};
-
-/* CF device registration */
-struct dw_dma_slave cf_dma_priv = {
-        .cfg_hi = 0,
-        .cfg_lo = 0,
-        .src_master = 0,
-        .dst_master = 0,
-};
-
-/* dmac device registeration */
-struct dw_dma_platform_data dmac_plat_data = {
-        .nr_channels = 8,
-        .chan_allocation_order = CHAN_ALLOCATION_DESCENDING,
-        .chan_priority = CHAN_PRIORITY_DESCENDING,
-        .block_size = 4095U,
-        .nr_masters = 2,
-        .data_width = { 3, 3, 0, 0 },
-};
+#include "generic.h"
 
 void __init spear13xx_l2x0_init(void)
 {