From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, balbi@ti.com,
linux-usb@vger.kernel.org, linux-crypto@vger.kernel.org,
davem@davemloft.net, herbert@gondor.hengli.com.au,
vinod.koul@intel.com
Cc: arnd@arndb.de, linus.walleij@stericsson.com,
srinidhi.kasagar@stericsson.com, Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 09/39] ARM: ux500: Remove DMA address look-up table
Date: Wed, 15 May 2013 10:51:32 +0100 [thread overview]
Message-ID: <1368611522-9984-10-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1368611522-9984-1-git-send-email-lee.jones@linaro.org>
DMA addresses are now passed as part of the dmaengine API by invoking
dmaengine_slave_config(). So there's no requirement for the DMA40
driver to look them up in a table provided by platform data. This
method does not fit in well using Device Tree either.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/mach-ux500/devices-db8500.c | 80 ---------------------------
include/linux/platform_data/dma-ste-dma40.h | 2 -
2 files changed, 82 deletions(-)
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index bed25a3..e21ffd8 100644
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -42,87 +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,
-};
-
struct stedma40_platform_data dma40_plat_data = {
- .dev_rx = dma40_rx_map,
- .dev_tx = dma40_tx_map,
.disabled_channels = {-1},
};
diff --git a/include/linux/platform_data/dma-ste-dma40.h b/include/linux/platform_data/dma-ste-dma40.h
index c54af61..af0064e 100644
--- a/include/linux/platform_data/dma-ste-dma40.h
+++ b/include/linux/platform_data/dma-ste-dma40.h
@@ -152,8 +152,6 @@ struct stedma40_chan_cfg {
* for 'multiple of 4' channels, like 8.
*/
struct stedma40_platform_data {
- const dma_addr_t *dev_tx;
- const dma_addr_t *dev_rx;
int disabled_channels[STEDMA40_MAX_PHYS];
int *soft_lli_chans;
int num_of_soft_lli_chans;
--
1.7.10.4
next prev parent reply other threads:[~2013-05-15 9:52 UTC|newest]
Thread overview: 126+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-15 9:51 [PATCH 00/39] Continuation of DMA changes in ux500 based drivers Lee Jones
2013-05-15 9:51 ` [PATCH 01/39] dmaengine: ste_dma40: Separate Logical Global Interrupt Mask (GIM) unmasking Lee Jones
2013-05-15 16:29 ` Linus Walleij
2013-05-16 6:35 ` Vinod Koul
2013-05-16 7:26 ` Lee Jones
2013-05-15 9:51 ` [PATCH 02/39] dmaengine: ste_dma40: Remove unnecessary call to d40_phy_cfg() Lee Jones
2013-05-15 16:33 ` Linus Walleij
2013-05-16 6:35 ` Vinod Koul
2013-05-16 7:25 ` Lee Jones
2013-05-16 9:40 ` Vinod Koul
2013-05-16 10:59 ` Lee Jones
2013-05-20 12:01 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 03/39] dmaengine: ste_dma40: Don't configure runtime configurable setup during allocate Lee Jones
2013-05-15 16:44 ` Linus Walleij
2013-05-16 6:36 ` Vinod Koul
2013-05-15 9:51 ` [PATCH 04/39] ARM: ux500: Stop passing UART's platform data for Device Tree boots Lee Jones
2013-05-15 16:48 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 05/39] ARM: ux500: Stop passing MMC's " Lee Jones
2013-05-15 16:50 ` Linus Walleij
2013-06-10 9:15 ` Lee Jones
2013-06-11 9:31 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 06/39] ARM: ux500: Move SDI (MMC) and UART devices under more descriptive heading Lee Jones
2013-05-15 16:51 ` Linus Walleij
2013-06-10 9:17 ` Lee Jones
2013-06-11 9:40 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 07/39] dmaengine: ste_dma40: Only use addresses passed as configuration information Lee Jones
2013-05-15 16:54 ` Linus Walleij
2013-05-16 6:40 ` Vinod Koul
2013-05-15 9:51 ` [PATCH 08/39] dmaengine: ste_dma40: Remove redundant address fetching function Lee Jones
2013-05-15 16:56 ` Linus Walleij
2013-05-16 6:41 ` Vinod Koul
2013-05-15 9:51 ` Lee Jones [this message]
2013-05-15 17:03 ` [PATCH 09/39] ARM: ux500: Remove DMA address look-up table Linus Walleij
2013-05-15 9:51 ` [PATCH 10/39] dmaengine: ste_dma40: Correct copy/paste error Lee Jones
2013-05-15 17:04 ` Linus Walleij
2013-05-16 6:42 ` Vinod Koul
2013-05-15 9:51 ` [PATCH 11/39] ARM: ux500: Remove unnecessary attributes from DMA channel request pdata Lee Jones
2013-05-15 17:05 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 12/39] crypto: ux500/hash - Prepare clock before enabling it Lee Jones
2013-05-15 17:07 ` Linus Walleij
2013-05-16 6:53 ` Lee Jones
2013-05-16 7:00 ` Herbert Xu
2013-05-20 12:05 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 13/39] crypto: ux500/hash - Set DMA configuration though dma_slave_config() Lee Jones
2013-05-15 17:09 ` Linus Walleij
2013-05-16 7:01 ` Herbert Xu
2013-05-20 12:06 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 14/39] ARM: ux500: Stop passing Hash DMA channel config information though pdata Lee Jones
2013-05-20 12:09 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 15/39] crypto: ux500/cryp - Prepare clock before enabling it Lee Jones
2013-05-15 17:11 ` Linus Walleij
2013-05-16 7:01 ` Herbert Xu
2013-05-20 12:10 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 16/39] crypto: ux500/cryp - Set DMA configuration though dma_slave_config() Lee Jones
2013-05-16 7:01 ` Herbert Xu
2013-05-20 12:12 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 17/39] ARM: ux500: Stop passing Cryp DMA channel config information though pdata Lee Jones
2013-05-15 9:51 ` [PATCH 18/39] crypto: ux500/[cryp|hash] - Show successful start-up in the bootlog Lee Jones
2013-05-16 7:02 ` Herbert Xu
2013-05-20 12:15 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 19/39] ARM: ux500: Register Cyrp and Hash platform drivers on Snowball Lee Jones
2013-05-20 12:17 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 20/39] usb: musb: ux500: move channel number knowledge into the driver Lee Jones
2013-05-15 17:18 ` Linus Walleij
2013-05-15 20:14 ` Fabio Baltieri
2013-05-17 6:35 ` Linus Walleij
2013-05-28 16:27 ` Felipe Balbi
2013-05-28 16:48 ` Lee Jones
2013-05-29 11:57 ` Linus Walleij
2013-05-20 12:19 ` Linus Walleij
2013-05-29 17:57 ` Felipe Balbi
2013-05-30 7:48 ` Linus Walleij
2013-05-30 8:12 ` Lee Jones
2013-05-30 19:06 ` Felipe Balbi
2013-05-30 7:44 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 21/39] usb: musb: ux500: move the MUSB HDRC configuration " Lee Jones
2013-05-30 8:30 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 22/39] usb: musb: ux500: take the dma_mask from coherent_dma_mask Lee Jones
2013-05-30 8:32 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 23/39] usb: musb: ux500: harden checks for platform data Lee Jones
2013-05-30 8:34 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 24/39] usb: musb: ux500: attempt to find channels by name before using pdata Lee Jones
2013-05-30 8:35 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 25/39] usb: musb: ux500: add device tree probing support Lee Jones
2013-05-30 8:38 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 26/39] ARM: ux500: Add an auxdata entry for MUSB for clock-name look-up Lee Jones
2013-05-30 8:42 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 27/39] ARM: ux500: Remove ux500-musb platform registation when booting with DT Lee Jones
2013-05-30 8:44 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 28/39] ARM: ux500: Remove empty function u8500_of_init_devices() Lee Jones
2013-05-30 8:45 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 29/39] dmaengine: ste_dma40: Use the BIT macro to replace ugly '(1 << x)'s Lee Jones
2013-05-30 8:47 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 30/39] ARM: ux500: Replace ST-E's home-brew DMA direction definition with the generic one Lee Jones
2013-05-30 8:52 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 31/39] dmaengine: ste_dma40: Replace ST-E's home-brew DMA direction defs with generic ones Lee Jones
2013-05-16 5:17 ` Vinod Koul
2013-05-16 7:06 ` Lee Jones
2013-05-16 6:43 ` Vinod Koul
2013-05-30 8:54 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 32/39] ARM: ux500: Remove recently unused stedma40_xfer_dir enums Lee Jones
2013-05-30 8:56 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 33/39] dmaengine: ste_dma40_ll: Use the BIT macro to replace ugly '(1 << x)'s Lee Jones
2013-05-16 5:13 ` Vinod Koul
2013-05-30 8:58 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 34/39] dmaengine: ste_dma40: Convert data_width from register bit format to value Lee Jones
2013-05-16 6:32 ` Vinod Koul
2013-05-16 7:35 ` Lee Jones
2013-05-16 9:41 ` Vinod Koul
2013-05-30 9:01 ` Linus Walleij
2013-05-15 9:51 ` [PATCH 35/39] dmaengine: ste_dma40_ll: Replace meaningless register set with comment Lee Jones
2013-05-16 5:18 ` Vinod Koul
2013-05-16 6:58 ` Lee Jones
2013-05-30 9:04 ` Linus Walleij
2013-05-30 17:56 ` Vinod Koul
2013-05-15 9:51 ` [PATCH 36/39] dmaengine: ste_dma40: Allow memcpy channels to be configured from DT Lee Jones
2013-05-16 5:05 ` Vinod Koul
2013-05-30 9:06 ` Linus Walleij
2013-05-15 9:52 ` [PATCH 37/39] ARM: ux500: Stop passing DMA platform data though AUXDATA Lee Jones
2013-05-30 9:12 ` Linus Walleij
2013-05-15 9:52 ` [PATCH 38/39] dmaengine: ste_dma40: Fetch the number of physical channels from DT Lee Jones
2013-05-16 6:34 ` Vinod Koul
2013-05-30 9:15 ` Linus Walleij
2013-05-15 9:52 ` [PATCH 39/39] dmaengine: ste_dma40: Fetch disabled " Lee Jones
2013-05-16 6:08 ` Vinod Koul
2013-05-30 9:16 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1368611522-9984-10-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=arnd@arndb.de \
--cc=balbi@ti.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.hengli.com.au \
--cc=linus.walleij@stericsson.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=srinidhi.kasagar@stericsson.com \
--cc=vinod.koul@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®