Merge tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[~andy/linux] / arch / arm / mach-ux500 / devices-db8500.c

diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index 7989c564e47a36febefda4eb1c9af4516c611fd4..516a6f57d1598b2379c623c24cc88362389eea7f 100644 (file)
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -42,88 +42,7 @@ static struct resource dma40_resources[] = {
        }
 };
 
-/*
- * Mapping between destination event lines and physical device address.
- * The event line is tied to a device and therefore the address is constant.
- * When the address comes from a primecell it will be configured in runtime
- * and we set the address to -1 as a placeholder.
- */
-static const dma_addr_t dma40_tx_map[DB8500_DMA_NR_DEV] = {
-       /* MUSB - these will be runtime-reconfigured */
-       [DB8500_DMA_DEV39_USB_OTG_IEP_AND_OEP_8] = -1,
-       [DB8500_DMA_DEV16_USB_OTG_IEP_AND_OEP_7_15] = -1,
-       [DB8500_DMA_DEV17_USB_OTG_IEP_AND_OEP_6_14] = -1,
-       [DB8500_DMA_DEV18_USB_OTG_IEP_AND_OEP_5_13] = -1,
-       [DB8500_DMA_DEV19_USB_OTG_IEP_AND_OEP_4_12] = -1,
-       [DB8500_DMA_DEV36_USB_OTG_IEP_AND_OEP_3_11] = -1,
-       [DB8500_DMA_DEV37_USB_OTG_IEP_AND_OEP_2_10] = -1,
-       [DB8500_DMA_DEV38_USB_OTG_IEP_AND_OEP_1_9] = -1,
-       /* PrimeCells - run-time configured */
-       [DB8500_DMA_DEV0_SPI0] = -1,
-       [DB8500_DMA_DEV1_SD_MMC0] = -1,
-       [DB8500_DMA_DEV2_SD_MMC1] = -1,
-       [DB8500_DMA_DEV3_SD_MMC2] = -1,
-       [DB8500_DMA_DEV8_SSP0] = -1,
-       [DB8500_DMA_DEV9_SSP1] = -1,
-       [DB8500_DMA_DEV11_UART2] = -1,
-       [DB8500_DMA_DEV12_UART1] = -1,
-       [DB8500_DMA_DEV13_UART0] = -1,
-       [DB8500_DMA_DEV28_SD_MM2] = -1,
-       [DB8500_DMA_DEV29_SD_MM0] = -1,
-       [DB8500_DMA_DEV32_SD_MM1] = -1,
-       [DB8500_DMA_DEV33_SPI2] = -1,
-       [DB8500_DMA_DEV35_SPI1] = -1,
-       [DB8500_DMA_DEV40_SPI3] = -1,
-       [DB8500_DMA_DEV41_SD_MM3] = -1,
-       [DB8500_DMA_DEV42_SD_MM4] = -1,
-       [DB8500_DMA_DEV43_SD_MM5] = -1,
-       [DB8500_DMA_DEV14_MSP2] = U8500_MSP2_BASE + MSP_TX_RX_REG_OFFSET,
-       [DB8500_DMA_DEV30_MSP1] = U8500_MSP1_BASE + MSP_TX_RX_REG_OFFSET,
-       [DB8500_DMA_DEV31_MSP0_SLIM0_CH0] = U8500_MSP0_BASE + MSP_TX_RX_REG_OFFSET,
-       [DB8500_DMA_DEV48_CAC1] = U8500_CRYP1_BASE + CRYP1_TX_REG_OFFSET,
-       [DB8500_DMA_DEV50_HAC1_TX] = U8500_HASH1_BASE + HASH1_TX_REG_OFFSET,
-};
-
-/* Mapping between source event lines and physical device address */
-static const dma_addr_t dma40_rx_map[DB8500_DMA_NR_DEV] = {
-       /* MUSB - these will be runtime-reconfigured */
-       [DB8500_DMA_DEV39_USB_OTG_IEP_AND_OEP_8] = -1,
-       [DB8500_DMA_DEV16_USB_OTG_IEP_AND_OEP_7_15] = -1,
-       [DB8500_DMA_DEV17_USB_OTG_IEP_AND_OEP_6_14] = -1,
-       [DB8500_DMA_DEV18_USB_OTG_IEP_AND_OEP_5_13] = -1,
-       [DB8500_DMA_DEV19_USB_OTG_IEP_AND_OEP_4_12] = -1,
-       [DB8500_DMA_DEV36_USB_OTG_IEP_AND_OEP_3_11] = -1,
-       [DB8500_DMA_DEV37_USB_OTG_IEP_AND_OEP_2_10] = -1,
-       [DB8500_DMA_DEV38_USB_OTG_IEP_AND_OEP_1_9] = -1,
-       /* PrimeCells */
-       [DB8500_DMA_DEV0_SPI0] = -1,
-       [DB8500_DMA_DEV1_SD_MMC0] = -1,
-       [DB8500_DMA_DEV2_SD_MMC1] = -1,
-       [DB8500_DMA_DEV3_SD_MMC2] = -1,
-       [DB8500_DMA_DEV8_SSP0] = -1,
-       [DB8500_DMA_DEV9_SSP1] = -1,
-       [DB8500_DMA_DEV11_UART2] = -1,
-       [DB8500_DMA_DEV12_UART1] = -1,
-       [DB8500_DMA_DEV13_UART0] = -1,
-       [DB8500_DMA_DEV28_SD_MM2] = -1,
-       [DB8500_DMA_DEV29_SD_MM0] = -1,
-       [DB8500_DMA_DEV32_SD_MM1] = -1,
-       [DB8500_DMA_DEV33_SPI2] = -1,
-       [DB8500_DMA_DEV35_SPI1] = -1,
-       [DB8500_DMA_DEV40_SPI3] = -1,
-       [DB8500_DMA_DEV41_SD_MM3] = -1,
-       [DB8500_DMA_DEV42_SD_MM4] = -1,
-       [DB8500_DMA_DEV43_SD_MM5] = -1,
-       [DB8500_DMA_DEV14_MSP2] = U8500_MSP2_BASE + MSP_TX_RX_REG_OFFSET,
-       [DB8500_DMA_DEV30_MSP3] = U8500_MSP3_BASE + MSP_TX_RX_REG_OFFSET,
-       [DB8500_DMA_DEV31_MSP0_SLIM0_CH0] = U8500_MSP0_BASE + MSP_TX_RX_REG_OFFSET,
-       [DB8500_DMA_DEV48_CAC1] = U8500_CRYP1_BASE + CRYP1_RX_REG_OFFSET,
-};
-
-static struct stedma40_platform_data dma40_plat_data = {
-       .dev_len = DB8500_DMA_NR_DEV,
-       .dev_rx = dma40_rx_map,
-       .dev_tx = dma40_tx_map,
+struct stedma40_platform_data dma40_plat_data = {
        .disabled_channels = {-1},
 };
 
@@ -187,7 +106,7 @@ static struct resource db8500_prcmu_res[] = {
        {
                .name  = "prcmu-tcpm",
                .start = U8500_PRCMU_TCPM_BASE,
-               .end   = U8500_PRCMU_TCPM_BASE + SZ_4K - 1,
+               .end   = U8500_PRCMU_TCPM_BASE + SZ_32K - 1,
                .flags = IORESOURCE_MEM,
        },
 };