Merge tag 'ux500-dma40-for-arm-soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/drivers

From Linus Walleij:
Second set of DMA40 changes: refactorings and device tree
support for the DMA40. Now with MUSB and some platform
data removal.

* tag 'ux500-dma40-for-arm-soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  dmaengine: ste_dma40: Fetch disabled channels from DT
  dmaengine: ste_dma40: Fetch the number of physical channels from DT
  ARM: ux500: Stop passing DMA platform data though AUXDATA
  dmaengine: ste_dma40: Allow memcpy channels to be configured from DT
  dmaengine: ste_dma40_ll: Replace meaningless register set with comment
  dmaengine: ste_dma40: Convert data_width from register bit format to value
  dmaengine: ste_dma40_ll: Use the BIT macro to replace ugly '(1 << x)'s
  ARM: ux500: Remove recently unused stedma40_xfer_dir enums
  dmaengine: ste_dma40: Replace ST-E's home-brew DMA direction defs with generic ones
  ARM: ux500: Replace ST-E's home-brew DMA direction definition with the generic one
  dmaengine: ste_dma40: Use the BIT macro to replace ugly '(1 << x)'s
  ARM: ux500: Remove empty function u8500_of_init_devices()
  ARM: ux500: Remove ux500-musb platform registation when booting with DT
  usb: musb: ux500: add device tree probing support
  usb: musb: ux500: attempt to find channels by name before using pdata
  usb: musb: ux500: harden checks for platform data
  usb: musb: ux500: take the dma_mask from coherent_dma_mask
  usb: musb: ux500: move the MUSB HDRC configuration into the driver
  usb: musb: ux500: move channel number knowledge into the driver

5 files changed, 35 insertions, 63 deletions

diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c
index ec872622340f..bfe443daf4b0 100644
--- a/arch/arm/mach-ux500/board-mop500-audio.c
+++ b/arch/arm/mach-ux500/board-mop500-audio.c
@@ -21,13 +21,13 @@
 
 static struct stedma40_chan_cfg msp0_dma_rx = {
         .high_priority = true,
-        .dir = STEDMA40_PERIPH_TO_MEM,
+        .dir = DMA_DEV_TO_MEM,
         .dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0,
 };
 
 static struct stedma40_chan_cfg msp0_dma_tx = {
         .high_priority = true,
-        .dir = STEDMA40_MEM_TO_PERIPH,
+        .dir = DMA_MEM_TO_DEV,
         .dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0,
 };
 
@@ -39,13 +39,13 @@ struct msp_i2s_platform_data msp0_platform_data = {
 
 static struct stedma40_chan_cfg msp1_dma_rx = {
         .high_priority = true,
-        .dir = STEDMA40_PERIPH_TO_MEM,
+        .dir = DMA_DEV_TO_MEM,
         .dev_type = DB8500_DMA_DEV30_MSP3,
 };
 
 static struct stedma40_chan_cfg msp1_dma_tx = {
         .high_priority = true,
-        .dir = STEDMA40_MEM_TO_PERIPH,
+        .dir = DMA_MEM_TO_DEV,
         .dev_type = DB8500_DMA_DEV30_MSP1,
 };
 
@@ -57,13 +57,13 @@ struct msp_i2s_platform_data msp1_platform_data = {
 
 static struct stedma40_chan_cfg msp2_dma_rx = {
         .high_priority = true,
-        .dir = STEDMA40_PERIPH_TO_MEM,
+        .dir = DMA_DEV_TO_MEM,
         .dev_type = DB8500_DMA_DEV14_MSP2,
 };
 
 static struct stedma40_chan_cfg msp2_dma_tx = {
         .high_priority = true,
-        .dir = STEDMA40_MEM_TO_PERIPH,
+        .dir = DMA_MEM_TO_DEV,
         .dev_type = DB8500_DMA_DEV14_MSP2,
         .use_fixed_channel = true,
         .phy_channel = 1,
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index 29be714b8a73..e6891d1933fa 100644
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -34,13 +34,13 @@
 #ifdef CONFIG_STE_DMA40
 struct stedma40_chan_cfg mop500_sdi0_dma_cfg_rx = {
         .mode = STEDMA40_MODE_LOGICAL,
-        .dir = STEDMA40_PERIPH_TO_MEM,
+        .dir = DMA_DEV_TO_MEM,
         .dev_type = DB8500_DMA_DEV29_SD_MM0,
 };
 
 static struct stedma40_chan_cfg mop500_sdi0_dma_cfg_tx = {
         .mode = STEDMA40_MODE_LOGICAL,
-        .dir = STEDMA40_MEM_TO_PERIPH,
+        .dir = DMA_MEM_TO_DEV,
         .dev_type = DB8500_DMA_DEV29_SD_MM0,
 };
 #endif
@@ -81,13 +81,13 @@ void mop500_sdi_tc35892_init(struct device *parent)
 #ifdef CONFIG_STE_DMA40
 static struct stedma40_chan_cfg sdi1_dma_cfg_rx = {
         .mode = STEDMA40_MODE_LOGICAL,
-        .dir = STEDMA40_PERIPH_TO_MEM,
+        .dir = DMA_DEV_TO_MEM,
         .dev_type = DB8500_DMA_DEV32_SD_MM1,
 };
 
 static struct stedma40_chan_cfg sdi1_dma_cfg_tx = {
         .mode = STEDMA40_MODE_LOGICAL,
-        .dir = STEDMA40_MEM_TO_PERIPH,
+        .dir = DMA_MEM_TO_DEV,
         .dev_type = DB8500_DMA_DEV32_SD_MM1,
 };
 #endif
@@ -112,13 +112,13 @@ struct mmci_platform_data mop500_sdi1_data = {
 #ifdef CONFIG_STE_DMA40
 struct stedma40_chan_cfg mop500_sdi2_dma_cfg_rx = {
         .mode = STEDMA40_MODE_LOGICAL,
-        .dir = STEDMA40_PERIPH_TO_MEM,
+        .dir = DMA_DEV_TO_MEM,
         .dev_type =  DB8500_DMA_DEV28_SD_MM2,
 };
 
 static struct stedma40_chan_cfg mop500_sdi2_dma_cfg_tx = {
         .mode = STEDMA40_MODE_LOGICAL,
-        .dir = STEDMA40_MEM_TO_PERIPH,
+        .dir = DMA_MEM_TO_DEV,
         .dev_type = DB8500_DMA_DEV28_SD_MM2,
 };
 #endif
@@ -144,13 +144,13 @@ struct mmci_platform_data mop500_sdi2_data = {
 #ifdef CONFIG_STE_DMA40
 struct stedma40_chan_cfg mop500_sdi4_dma_cfg_rx = {
         .mode = STEDMA40_MODE_LOGICAL,
-        .dir = STEDMA40_PERIPH_TO_MEM,
+        .dir = DMA_DEV_TO_MEM,
         .dev_type =  DB8500_DMA_DEV42_SD_MM4,
 };
 
 static struct stedma40_chan_cfg mop500_sdi4_dma_cfg_tx = {
         .mode = STEDMA40_MODE_LOGICAL,
-        .dir = STEDMA40_MEM_TO_PERIPH,
+        .dir = DMA_MEM_TO_DEV,
         .dev_type = DB8500_DMA_DEV42_SD_MM4,
 };
 #endif
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index f59d52806afe..2d70e2b45660 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -424,19 +424,19 @@ void mop500_snowball_ethernet_clock_enable(void)
 
 static struct cryp_platform_data u8500_cryp1_platform_data = {
                 .mem_to_engine = {
-                                .dir = STEDMA40_MEM_TO_PERIPH,
+                                .dir = DMA_MEM_TO_DEV,
                                 .dev_type = DB8500_DMA_DEV48_CAC1,
                                 .mode = STEDMA40_MODE_LOGICAL,
                 },
                 .engine_to_mem = {
-                                .dir = STEDMA40_PERIPH_TO_MEM,
+                                .dir = DMA_DEV_TO_MEM,
                                 .dev_type = DB8500_DMA_DEV48_CAC1,
                                 .mode = STEDMA40_MODE_LOGICAL,
                 }
 };
 
 static struct stedma40_chan_cfg u8500_hash_dma_cfg_tx = {
-                .dir = STEDMA40_MEM_TO_PERIPH,
+                .dir = DMA_MEM_TO_DEV,
                 .dev_type = DB8500_DMA_DEV50_HAC1_TX,
                 .mode = STEDMA40_MODE_LOGICAL,
 };
@@ -455,13 +455,13 @@ static struct platform_device *mop500_platform_devs[] __initdata = {
 #ifdef CONFIG_STE_DMA40
 static struct stedma40_chan_cfg ssp0_dma_cfg_rx = {
         .mode = STEDMA40_MODE_LOGICAL,
-        .dir = STEDMA40_PERIPH_TO_MEM,
+        .dir = DMA_DEV_TO_MEM,
         .dev_type = DB8500_DMA_DEV8_SSP0,
 };
 
 static struct stedma40_chan_cfg ssp0_dma_cfg_tx = {
         .mode = STEDMA40_MODE_LOGICAL,
-        .dir = STEDMA40_MEM_TO_PERIPH,
+        .dir = DMA_MEM_TO_DEV,
         .dev_type = DB8500_DMA_DEV8_SSP0,
 };
 #endif
@@ -490,37 +490,37 @@ static void __init mop500_spi_init(struct device *parent)
 #ifdef CONFIG_STE_DMA40
 static struct stedma40_chan_cfg uart0_dma_cfg_rx = {
         .mode = STEDMA40_MODE_LOGICAL,
-        .dir = STEDMA40_PERIPH_TO_MEM,
+        .dir = DMA_DEV_TO_MEM,
         .dev_type = DB8500_DMA_DEV13_UART0,
 };
 
 static struct stedma40_chan_cfg uart0_dma_cfg_tx = {
         .mode = STEDMA40_MODE_LOGICAL,
-        .dir = STEDMA40_MEM_TO_PERIPH,
+        .dir = DMA_MEM_TO_DEV,
         .dev_type = DB8500_DMA_DEV13_UART0,
 };
 
 static struct stedma40_chan_cfg uart1_dma_cfg_rx = {
         .mode = STEDMA40_MODE_LOGICAL,
-        .dir = STEDMA40_PERIPH_TO_MEM,
+        .dir = DMA_DEV_TO_MEM,
         .dev_type = DB8500_DMA_DEV12_UART1,
 };
 
 static struct stedma40_chan_cfg uart1_dma_cfg_tx = {
         .mode = STEDMA40_MODE_LOGICAL,
-        .dir = STEDMA40_MEM_TO_PERIPH,
+        .dir = DMA_MEM_TO_DEV,
         .dev_type = DB8500_DMA_DEV12_UART1,
 };
 
 static struct stedma40_chan_cfg uart2_dma_cfg_rx = {
         .mode = STEDMA40_MODE_LOGICAL,
-        .dir = STEDMA40_PERIPH_TO_MEM,
+        .dir = DMA_DEV_TO_MEM,
         .dev_type = DB8500_DMA_DEV11_UART2,
 };
 
 static struct stedma40_chan_cfg uart2_dma_cfg_tx = {
         .mode = STEDMA40_MODE_LOGICAL,
-        .dir = STEDMA40_MEM_TO_PERIPH,
+        .dir = DMA_MEM_TO_DEV,
         .dev_type = DB8500_DMA_DEV11_UART2,
 };
 #endif
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 243b91b66ae0..f63847dabe7d 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -215,17 +215,6 @@ struct device * __init u8500_init_devices(void)
 }
 
 #ifdef CONFIG_MACH_UX500_DT
-
-/* TODO: Once all pieces are DT:ed, remove completely. */
-static struct device * __init u8500_of_init_devices(void)
-{
-        struct device *parent = db8500_soc_device_init();
-
-        db8500_add_usb(parent, usb_db8500_dma_cfg, usb_db8500_dma_cfg);
-
-        return parent;
-}
-
 static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
         /* Requires call-back bindings. */
         OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &db8500_pmu_platdata),
@@ -269,8 +258,7 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
         OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000,
                 "ux500-msp-i2s.3", &msp3_platform_data),
         /* Requires clock name bindings and channel address lookup table. */
-        OF_DEV_AUXDATA("stericsson,db8500-dma40", 0x801C0000,
-                       "dma40.0", &dma40_plat_data),
+        OF_DEV_AUXDATA("stericsson,db8500-dma40", 0x801C0000, "dma40.0", NULL),
         {},
 };
 
@@ -284,7 +272,7 @@ static const struct of_device_id u8500_local_bus_nodes[] = {
 
 static void __init u8500_init_machine(void)
 {
-        struct device *parent = NULL;
+        struct device *parent = db8500_soc_device_init();
 
         /* Pinmaps must be in place before devices register */
         if (of_machine_is_compatible("st-ericsson,mop500"))
@@ -297,9 +285,6 @@ static void __init u8500_init_machine(void)
         else if (of_machine_is_compatible("st-ericsson,ccu9540")) {}
                 /* TODO: Add pinmaps for ccu9540 board. */
 
-        /* TODO: Export SoC, USB, cpu-freq and DMA40 */
-        parent = u8500_of_init_devices();
-
         /* automatically probe child nodes of db8500 device */
         of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent);
 }
diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c
index 72754e369417..b7bd8d3a5507 100644
--- a/arch/arm/mach-ux500/usb.c
+++ b/arch/arm/mach-ux500/usb.c
@@ -14,15 +14,15 @@
 
 #define MUSB_DMA40_RX_CH { \
                 .mode = STEDMA40_MODE_LOGICAL, \
-                .dir = STEDMA40_PERIPH_TO_MEM, \
+                .dir = DMA_DEV_TO_MEM, \
         }
 
 #define MUSB_DMA40_TX_CH { \
                 .mode = STEDMA40_MODE_LOGICAL, \
-                .dir = STEDMA40_MEM_TO_PERIPH, \
+                .dir = DMA_MEM_TO_DEV, \
         }
 
-static struct stedma40_chan_cfg musb_dma_rx_ch[UX500_MUSB_DMA_NUM_RX_CHANNELS]
+static struct stedma40_chan_cfg musb_dma_rx_ch[UX500_MUSB_DMA_NUM_RX_TX_CHANNELS]
         = {
         MUSB_DMA40_RX_CH,
         MUSB_DMA40_RX_CH,
@@ -34,7 +34,7 @@ static struct stedma40_chan_cfg musb_dma_rx_ch[UX500_MUSB_DMA_NUM_RX_CHANNELS]
         MUSB_DMA40_RX_CH
 };
 
-static struct stedma40_chan_cfg musb_dma_tx_ch[UX500_MUSB_DMA_NUM_TX_CHANNELS]
+static struct stedma40_chan_cfg musb_dma_tx_ch[UX500_MUSB_DMA_NUM_RX_TX_CHANNELS]
         = {
         MUSB_DMA40_TX_CH,
         MUSB_DMA40_TX_CH,
@@ -46,7 +46,7 @@ static struct stedma40_chan_cfg musb_dma_tx_ch[UX500_MUSB_DMA_NUM_TX_CHANNELS]
         MUSB_DMA40_TX_CH,
 };
 
-static void *ux500_dma_rx_param_array[UX500_MUSB_DMA_NUM_RX_CHANNELS] = {
+static void *ux500_dma_rx_param_array[UX500_MUSB_DMA_NUM_RX_TX_CHANNELS] = {
         &musb_dma_rx_ch[0],
         &musb_dma_rx_ch[1],
         &musb_dma_rx_ch[2],
@@ -57,7 +57,7 @@ static void *ux500_dma_rx_param_array[UX500_MUSB_DMA_NUM_RX_CHANNELS] = {
         &musb_dma_rx_ch[7]
 };
 
-static void *ux500_dma_tx_param_array[UX500_MUSB_DMA_NUM_TX_CHANNELS] = {
+static void *ux500_dma_tx_param_array[UX500_MUSB_DMA_NUM_RX_TX_CHANNELS] = {
         &musb_dma_tx_ch[0],
         &musb_dma_tx_ch[1],
         &musb_dma_tx_ch[2],
@@ -71,23 +71,11 @@ static void *ux500_dma_tx_param_array[UX500_MUSB_DMA_NUM_TX_CHANNELS] = {
 static struct ux500_musb_board_data musb_board_data = {
         .dma_rx_param_array = ux500_dma_rx_param_array,
         .dma_tx_param_array = ux500_dma_tx_param_array,
-        .num_rx_channels = UX500_MUSB_DMA_NUM_RX_CHANNELS,
-        .num_tx_channels = UX500_MUSB_DMA_NUM_TX_CHANNELS,
         .dma_filter = stedma40_filter,
 };
 
-static u64 ux500_musb_dmamask = DMA_BIT_MASK(32);
-
-static struct musb_hdrc_config musb_hdrc_config = {
-        .multipoint     = true,
-        .dyn_fifo       = true,
-        .num_eps        = 16,
-        .ram_bits       = 16,
-};
-
 static struct musb_hdrc_platform_data musb_platform_data = {
         .mode = MUSB_OTG,
-        .config = &musb_hdrc_config,
         .board_data = &musb_board_data,
 };
 
@@ -108,7 +96,6 @@ struct platform_device ux500_musb_device = {
         .id = 0,
         .dev = {
                 .platform_data = &musb_platform_data,
-                .dma_mask = &ux500_musb_dmamask,
                 .coherent_dma_mask = DMA_BIT_MASK(32),
         },
         .num_resources = ARRAY_SIZE(usb_resources),
@@ -119,7 +106,7 @@ static inline void ux500_usb_dma_update_rx_ch_config(int *dev_type)
 {
         u32 idx;
 
-        for (idx = 0; idx < UX500_MUSB_DMA_NUM_RX_CHANNELS; idx++)
+        for (idx = 0; idx < UX500_MUSB_DMA_NUM_RX_TX_CHANNELS; idx++)
                 musb_dma_rx_ch[idx].dev_type = dev_type[idx];
 }
 
@@ -127,7 +114,7 @@ static inline void ux500_usb_dma_update_tx_ch_config(int *dev_type)
 {
         u32 idx;
 
-        for (idx = 0; idx < UX500_MUSB_DMA_NUM_TX_CHANNELS; idx++)
+        for (idx = 0; idx < UX500_MUSB_DMA_NUM_RX_TX_CHANNELS; idx++)
                 musb_dma_tx_ch[idx].dev_type = dev_type[idx];
 }