Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC driver specific changes from Arnd Bergmann:

 - Updates to the ux500 cpufreq code

 - Moving the u300 DMA controller driver to drivers/dma

 - Moving versatile express drivers out of arch/arm for sharing with arch/arm64

 - Device tree bindings for the OMAP General Purpose Memory Controller

* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (27 commits)
  ARM: OMAP2+: gpmc: Add device tree documentation for elm handle
  ARM: OMAP2+: gpmc: add DT bindings for OneNAND
  ARM: OMAP2+: gpmc-onenand: drop __init annotation
  mtd: omap-onenand: pass device_node in platform data
  ARM: OMAP2+: Prevent potential crash if GPMC probe fails
  ARM: OMAP2+: gpmc: Remove unneeded of_node_put()
  arm: Move sp810.h to include/linux/amba/
  ARM: OMAP: gpmc: add DT bindings for GPMC timings and NAND
  ARM: OMAP: gpmc: enable hwecc for AM33xx SoCs
  ARM: OMAP: gpmc-nand: drop __init annotation
  mtd: omap-nand: pass device_node in platform data
  ARM: OMAP: gpmc: don't create devices from initcall on DT
  dma: coh901318: cut down on platform data abstraction
  dma: coh901318: merge header files
  dma: coh901318: push definitions into driver
  dma: coh901318: push header down into the DMA subsystem
  dma: coh901318: skip hard-coded addresses
  dma: coh901318: remove hardcoded target addresses
  dma: coh901318: push platform data into driver
  dma: coh901318: create a proper platform data file
  ...

3 files changed, 78 insertions, 1 deletions

diff --git a/include/linux/platform_data/dma-coh901318.h b/include/linux/platform_data/dma-coh901318.h
new file mode 100644
index 000000000000..c4cb9590d115
--- /dev/null
+++ b/include/linux/platform_data/dma-coh901318.h
@@ -0,0 +1,72 @@
+/*
+ * Platform data for the COH901318 DMA controller
+ * Copyright (C) 2007-2013 ST-Ericsson
+ * License terms: GNU General Public License (GPL) version 2
+ */
+
+#ifndef PLAT_COH901318_H
+#define PLAT_COH901318_H
+
+#ifdef CONFIG_COH901318
+
+/* We only support the U300 DMA channels */
+#define U300_DMA_MSL_TX_0               0
+#define U300_DMA_MSL_TX_1               1
+#define U300_DMA_MSL_TX_2               2
+#define U300_DMA_MSL_TX_3               3
+#define U300_DMA_MSL_TX_4               4
+#define U300_DMA_MSL_TX_5               5
+#define U300_DMA_MSL_TX_6               6
+#define U300_DMA_MSL_RX_0               7
+#define U300_DMA_MSL_RX_1               8
+#define U300_DMA_MSL_RX_2               9
+#define U300_DMA_MSL_RX_3               10
+#define U300_DMA_MSL_RX_4               11
+#define U300_DMA_MSL_RX_5               12
+#define U300_DMA_MSL_RX_6               13
+#define U300_DMA_MMCSD_RX_TX            14
+#define U300_DMA_MSPRO_TX               15
+#define U300_DMA_MSPRO_RX               16
+#define U300_DMA_UART0_TX               17
+#define U300_DMA_UART0_RX               18
+#define U300_DMA_APEX_TX                19
+#define U300_DMA_APEX_RX                20
+#define U300_DMA_PCM_I2S0_TX            21
+#define U300_DMA_PCM_I2S0_RX            22
+#define U300_DMA_PCM_I2S1_TX            23
+#define U300_DMA_PCM_I2S1_RX            24
+#define U300_DMA_XGAM_CDI               25
+#define U300_DMA_XGAM_PDI               26
+#define U300_DMA_SPI_TX                 27
+#define U300_DMA_SPI_RX                 28
+#define U300_DMA_GENERAL_PURPOSE_0      29
+#define U300_DMA_GENERAL_PURPOSE_1      30
+#define U300_DMA_GENERAL_PURPOSE_2      31
+#define U300_DMA_GENERAL_PURPOSE_3      32
+#define U300_DMA_GENERAL_PURPOSE_4      33
+#define U300_DMA_GENERAL_PURPOSE_5      34
+#define U300_DMA_GENERAL_PURPOSE_6      35
+#define U300_DMA_GENERAL_PURPOSE_7      36
+#define U300_DMA_GENERAL_PURPOSE_8      37
+#define U300_DMA_UART1_TX               38
+#define U300_DMA_UART1_RX               39
+
+#define U300_DMA_DEVICE_CHANNELS        32
+#define U300_DMA_CHANNELS               40
+
+/**
+ * coh901318_filter_id() - DMA channel filter function
+ * @chan: dma channel handle
+ * @chan_id: id of dma channel to be filter out
+ *
+ * In dma_request_channel() it specifies what channel id to be requested
+ */
+bool coh901318_filter_id(struct dma_chan *chan, void *chan_id);
+#else
+static inline bool coh901318_filter_id(struct dma_chan *chan, void *chan_id)
+{
+        return false;
+}
+#endif
+
+#endif /* PLAT_COH901318_H */
diff --git a/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h
index 24d32ca34bef..6bf9ef43ddb1 100644
--- a/include/linux/platform_data/mtd-nand-omap2.h
+++ b/include/linux/platform_data/mtd-nand-omap2.h
@@ -60,6 +60,8 @@ struct omap_nand_platform_data {
         int                     devsize;
         enum omap_ecc           ecc_opt;
         struct gpmc_nand_regs   reg;
-};
 
+        /* for passing the partitions */
+        struct device_node      *of_node;
+};
 #endif
diff --git a/include/linux/platform_data/mtd-onenand-omap2.h b/include/linux/platform_data/mtd-onenand-omap2.h
index 685af7e8b120..e9a9fb188f97 100644
--- a/include/linux/platform_data/mtd-onenand-omap2.h
+++ b/include/linux/platform_data/mtd-onenand-omap2.h
@@ -29,5 +29,8 @@ struct omap_onenand_platform_data {
         u8                      flags;
         u8                      regulator_can_sleep;
         u8                      skip_initial_unlocking;
+
+        /* for passing the partitions */
+        struct device_node      *of_node;
 };
 #endif