From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: arnd@arndb.de, linus.walleij@stericsson.com,
Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 28/32] ARM: ux500: Pass remnant platform data though to DMA40 driver
Date: Thu, 18 Apr 2013 11:12:10 +0100 [thread overview]
Message-ID: <1366279934-30761-29-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1366279934-30761-1-git-send-email-lee.jones@linaro.org>
Ironically, in order to remove lots of the auxdata assignments, we have
to add just one more. A lot of them require DMA information to be passed
into clients for DMA channel allocation, but we now have this capability
in Device Tree. However, the DMA40 driver still relies on a reverse table
look-up to obtain DMA addresses. Until all of the clients are converted,
over to the new API, we're stuck with this.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/mach-ux500/board-mop500.h | 1 +
arch/arm/mach-ux500/cpu-db8500.c | 3 +++
arch/arm/mach-ux500/devices-db8500.c | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index d38951b..2c5139d 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -93,6 +93,7 @@ extern struct amba_pl011_data uart0_plat;
extern struct amba_pl011_data uart1_plat;
extern struct amba_pl011_data uart2_plat;
extern struct pl022_ssp_controller ssp0_plat;
+extern struct stedma40_platform_data dma40_plat_data;
extern void mop500_sdi_init(struct device *parent);
extern void snowball_sdi_init(struct device *parent);
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index eae3e3a..b216233 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -273,6 +273,9 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
"ux500-msp-i2s.2", &msp2_platform_data),
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),
{},
};
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index 2fcb8c2..3e4993e 100644
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -120,7 +120,7 @@ static const dma_addr_t dma40_rx_map[DB8500_DMA_NR_DEV] = {
[DB8500_DMA_DEV48_CAC1] = U8500_CRYP1_BASE + CRYP1_RX_REG_OFFSET,
};
-static struct stedma40_platform_data dma40_plat_data = {
+struct stedma40_platform_data dma40_plat_data = {
.dev_rx = dma40_rx_map,
.dev_tx = dma40_tx_map,
.disabled_channels = {-1},
--
1.7.10.4
next prev parent reply other threads:[~2013-04-18 10:13 UTC|newest]
Thread overview: 168+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-18 10:11 [PATCH 00/32] dmaengine: Refactor the " Lee Jones
2013-04-18 10:11 ` [PATCH 01/32] dmaengine: ste_dma40: Assign memcpy channels in the driver Lee Jones
2013-04-22 9:22 ` Vinod Koul
2013-04-25 9:20 ` Linus Walleij
2013-04-18 10:11 ` [PATCH 02/32] dmaengine: ste_dma40: Move default memcpy configs into " Lee Jones
2013-04-22 9:21 ` Vinod Koul
2013-04-24 14:44 ` Linus Walleij
2013-04-18 10:11 ` [PATCH 03/32] dmaengine: ste_dma40: Use the BIT macro to replace ugly '(1 << x)'s Lee Jones
2013-04-18 10:43 ` Russell King - ARM Linux
2013-04-18 11:00 ` Lee Jones
2013-04-18 12:16 ` [PATCH 03/32 v2] " Lee Jones
2013-04-22 10:13 ` Vinod Koul
2013-04-24 14:54 ` Linus Walleij
2013-04-24 15:08 ` Lee Jones
2013-04-24 15:09 ` [PATCH 03/32] " Lee Jones
2013-04-24 15:11 ` [PATCH 03/32 v3] " Lee Jones
2013-04-24 19:24 ` Rabin Vincent
2013-04-25 8:13 ` Lee Jones
2013-04-26 11:39 ` [PATCH 03/32 v4] " Lee Jones
2013-04-26 15:04 ` Linus Walleij
2013-04-18 10:11 ` [PATCH 04/32] dmaengine: ste_dma40: Amalgamate DMA source and destination channel numbers Lee Jones
2013-04-25 8:06 ` Linus Walleij
2013-04-25 8:36 ` Arnd Bergmann
2013-04-25 8:55 ` Linus Walleij
2013-04-25 9:06 ` Lee Jones
2013-04-25 12:43 ` Linus Walleij
2013-04-25 13:09 ` Russell King - ARM Linux
2013-04-25 13:21 ` Linus Walleij
2013-04-25 13:20 ` Lee Jones
2013-04-25 13:24 ` Linus Walleij
2013-04-26 14:28 ` Lee Jones
2013-04-18 10:11 ` [PATCH 05/32] dmaengine: ste_dma40: Supply macros to resolve 'src' and 'dst' directions Lee Jones
2013-04-18 10:50 ` Arnd Bergmann
2013-04-22 9:42 ` Vinod Koul
2013-04-22 10:27 ` Lee Jones
2013-04-22 10:19 ` Vinod Koul
2013-04-24 8:53 ` Lee Jones
2013-04-25 8:22 ` Linus Walleij
2013-04-25 9:19 ` Lee Jones
2013-04-18 10:11 ` [PATCH 06/32] ARM: ux500: Strip out duplicate USB DMA configuration Lee Jones
2013-04-18 10:51 ` Arnd Bergmann
2013-04-25 8:24 ` Linus Walleij
2013-04-18 10:11 ` [PATCH 07/32] ARM: ux500: Supply address location names for the DMA40 DMA controller Lee Jones
2013-04-18 10:48 ` Arnd Bergmann
2013-04-18 11:01 ` Lee Jones
2013-04-18 11:09 ` Lee Jones
2013-04-25 8:26 ` Linus Walleij
2013-04-25 9:17 ` Lee Jones
2013-04-25 12:45 ` Linus Walleij
2013-04-18 10:11 ` [PATCH 08/32] dmaengine: ste_dma40: Optimise local MAX() macro Lee Jones
2013-04-18 10:46 ` Arnd Bergmann
2013-04-18 11:00 ` Russell King - ARM Linux
2013-04-18 11:19 ` Arnd Bergmann
2013-04-22 10:10 ` Vinod Koul
2013-04-22 10:53 ` Lee Jones
2013-04-24 8:49 ` [PATCH 08/32 v2] dmaengine: ste_dma40: Remove home-brew " Lee Jones
2013-04-25 12:48 ` Linus Walleij
2013-05-01 14:28 ` Lee Jones
2013-04-25 8:36 ` [PATCH 08/32] dmaengine: ste_dma40: Optimise local " Linus Walleij
2013-04-25 9:15 ` Lee Jones
2013-04-18 10:11 ` [PATCH 09/32] ARM: ux500: Remove unused 'data_width' attributes from SDI DMA configs Lee Jones
2013-04-25 8:44 ` Linus Walleij
2013-04-25 9:14 ` Lee Jones
2013-04-25 12:49 ` Linus Walleij
2013-04-25 13:13 ` Lee Jones
2013-04-18 10:11 ` [PATCH 10/32] ARM: ux500: Remove unused 'data_width' attributes from SSP " Lee Jones
2013-04-25 8:45 ` Linus Walleij
2013-04-18 10:11 ` [PATCH 11/32] ARM: ux500: Remove unused 'data_width' attributes from UART " Lee Jones
2013-04-25 8:45 ` Linus Walleij
2013-04-18 10:11 ` [PATCH 12/32] ARM: ux500: Remove superfluous 'psize' attribute from Audio platform data Lee Jones
2013-04-25 9:00 ` Linus Walleij
2013-05-01 14:42 ` Lee Jones
2013-05-02 8:38 ` Lee Jones
2013-05-03 13:57 ` Linus Walleij
2013-06-10 9:04 ` Lee Jones
2013-06-10 9:12 ` Lee Jones
2013-04-18 10:11 ` [PATCH 13/32] dmaengine: ste_dma40: Calculate number of logical channels from physical ones Lee Jones
2013-04-22 9:23 ` Vinod Koul
2013-04-22 10:11 ` Lee Jones
2013-04-25 9:13 ` Linus Walleij
2013-04-25 9:29 ` Lee Jones
2013-04-25 12:51 ` Linus Walleij
2013-04-18 10:11 ` [PATCH 14/32] dmaengine: ste_dma40: Remove 'always true' checking Lee Jones
2013-04-18 10:53 ` Arnd Bergmann
2013-04-22 9:44 ` Vinod Koul
2013-04-25 9:17 ` Linus Walleij
2013-04-25 9:24 ` Lee Jones
2013-04-18 10:11 ` [PATCH 15/32] dmaengine: ste_dma40: Separate Logical Global Interrupt Mask (GIM) unmasking Lee Jones
2013-04-18 10:45 ` Russell King - ARM Linux
2013-04-18 10:54 ` Arnd Bergmann
2013-04-22 9:51 ` Vinod Koul
2013-04-22 10:40 ` Lee Jones
2013-04-24 8:51 ` Lee Jones
2013-04-25 11:00 ` Linus Walleij
2013-04-18 10:11 ` [PATCH 16/32] dmaengine: ste_dma40: Remove unnecessary call to d40_phy_cfg() Lee Jones
2013-04-18 10:55 ` Arnd Bergmann
2013-04-22 9:52 ` Vinod Koul
2013-04-25 11:09 ` Linus Walleij
2013-04-18 10:11 ` [PATCH 17/32] dmaengine: ste_dma40: Remove redundant argument from d40_phy_cfg() Lee Jones
2013-04-22 9:34 ` Vinod Koul
2013-04-22 10:18 ` Lee Jones
2013-04-25 11:14 ` Linus Walleij
2013-04-24 8:55 ` Lee Jones
2013-04-25 11:12 ` Linus Walleij
2013-04-18 10:12 ` [PATCH 18/32] dmaengine: ste_dma40: Don't configure runtime configurable setup during allocate Lee Jones
2013-04-25 11:15 ` Linus Walleij
2013-04-18 10:12 ` [PATCH 19/32] dmaengine: ste_dma40: Move more setup into the configuration routines Lee Jones
2013-04-22 9:37 ` Vinod Koul
2013-04-25 11:17 ` Linus Walleij
2013-04-18 10:12 ` [PATCH 20/32] dmaengine: ste_dma40: Move rev error-check up to revision acquisition Lee Jones
2013-04-22 9:41 ` Vinod Koul
2013-04-25 11:17 ` Linus Walleij
2013-04-18 10:12 ` [PATCH 21/32] dmaengine: ste_dma40: Also report the number of logical channels Lee Jones
2013-04-22 9:36 ` Vinod Koul
2013-04-22 10:14 ` Lee Jones
2013-04-22 9:48 ` Vinod Koul
2013-04-22 10:37 ` Lee Jones
2013-04-22 10:23 ` Vinod Koul
2013-04-22 10:52 ` Russell King - ARM Linux
2013-04-24 8:35 ` Lee Jones
2013-04-24 8:39 ` [PATCH 21/32 v2] " Lee Jones
2013-04-25 11:20 ` Linus Walleij
2013-04-18 10:12 ` [PATCH 22/32] dmaengine: ste_dma40: Allocate plat_data on declaration Lee Jones
2013-04-22 9:38 ` Vinod Koul
2013-04-22 9:40 ` Vinod Koul
2013-04-25 11:22 ` Linus Walleij
2013-04-18 10:12 ` [PATCH 23/32] dmaengine: ste_dma40: Allow driver to be probe()able when DT is enabled Lee Jones
2013-04-18 10:58 ` Arnd Bergmann
2013-04-22 10:02 ` Vinod Koul
2013-04-25 11:24 ` Linus Walleij
2013-04-18 10:12 ` [PATCH 24/32] dmaengine: ste_dma40: Supply full Device Tree parsing support Lee Jones
2013-04-18 11:06 ` Arnd Bergmann
2013-04-18 11:31 ` Lee Jones
2013-04-18 11:37 ` Arnd Bergmann
2013-04-18 11:47 ` Lee Jones
2013-04-18 12:23 ` Arnd Bergmann
2013-04-18 11:07 ` Arnd Bergmann
2013-04-18 12:12 ` [PATCH 24/32 v2] " Lee Jones
2013-04-18 12:32 ` Arnd Bergmann
2013-04-18 13:43 ` Lee Jones
2013-04-18 14:17 ` [PATCH 24/32 v3] " Lee Jones
2013-04-18 21:53 ` Arnd Bergmann
2013-04-22 10:18 ` Vinod Koul
2013-04-25 11:33 ` Linus Walleij
2013-04-22 10:17 ` [PATCH 24/32 v2] " Vinod Koul
2013-04-22 10:16 ` [PATCH 24/32] " Vinod Koul
2013-04-18 10:12 ` [PATCH 25/32] ARM: ux500: Setup the DMA40 driver's DT node using the new DMA API Lee Jones
2013-04-18 11:08 ` Arnd Bergmann
2013-04-25 11:35 ` Linus Walleij
2013-04-18 10:12 ` [PATCH 26/32] ARM: ux500: Supply UART's DMA configuration via Device Tree Lee Jones
2013-04-25 11:36 ` Linus Walleij
2013-04-18 10:12 ` [PATCH 27/32] ARM: ux500: Stop registering DMA40 from platform data when DT is enabled Lee Jones
2013-04-25 11:37 ` Linus Walleij
2013-04-18 10:12 ` Lee Jones [this message]
2013-04-18 11:11 ` [PATCH 28/32] ARM: ux500: Pass remnant platform data though to DMA40 driver Arnd Bergmann
2013-04-25 11:39 ` Linus Walleij
2013-04-18 10:12 ` [PATCH 29/32] ARM: ux500: Stop passing UART's platform data for Device Tree boots Lee Jones
2013-04-25 11:41 ` Linus Walleij
2013-04-18 10:12 ` [PATCH 30/32] ARM: ux500: Supply MMC DMA configuration via Device Tree Lee Jones
2013-04-25 11:43 ` Linus Walleij
2013-04-25 11:49 ` Lee Jones
2013-04-25 12:56 ` Linus Walleij
2013-04-25 13:11 ` Lee Jones
2013-04-18 10:12 ` [PATCH 31/32] ARM: ux500: Stop passing MMC's platform data for Device Tree boots Lee Jones
2013-04-25 11:44 ` Linus Walleij
2013-04-18 10:12 ` [PATCH 32/32] ARM: ux500: Move SDI (MMC) and UART devices under more descriptive heading Lee Jones
2013-04-25 11:46 ` Linus Walleij
2013-04-26 13:42 ` Lee Jones
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=1366279934-30761-29-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=arnd@arndb.de \
--cc=linus.walleij@stericsson.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/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®