linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: STEricsson_nomadik_linux@list.st.com,
	linus.walleij@stericsson.com, arnd@arndb.de,
	Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 03/19] ARM: ux500: Pass SDI DMA information though AUX_DATA to MMCI
Date: Fri,  7 Sep 2012 12:14:43 +0100	[thread overview]
Message-ID: <1347016499-29354-4-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1347016499-29354-1-git-send-email-lee.jones@linaro.org>

There are four SDIs on the HREF, as opposed to the original two
enabled on Snowball. To get them working we have to pass their DMA
information in the same was as we need with the other two.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/board-mop500-sdi.c |    4 ++--
 arch/arm/mach-ux500/board-mop500.c     |    2 ++
 arch/arm/mach-ux500/board-mop500.h     |    2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index 18ff781..9c8e4a9 100644
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -152,7 +152,7 @@ static struct stedma40_chan_cfg sdi1_dma_cfg_tx = {
 };
 #endif
 
-static struct mmci_platform_data mop500_sdi1_data = {
+struct mmci_platform_data mop500_sdi1_data = {
 	.ocr_mask	= MMC_VDD_29_30,
 	.f_max		= 50000000,
 	.capabilities	= MMC_CAP_4_BIT_DATA,
@@ -189,7 +189,7 @@ static struct stedma40_chan_cfg mop500_sdi2_dma_cfg_tx = {
 };
 #endif
 
-static struct mmci_platform_data mop500_sdi2_data = {
+struct mmci_platform_data mop500_sdi2_data = {
 	.ocr_mask	= MMC_VDD_165_195,
 	.f_max		= 50000000,
 	.capabilities	= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA |
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 9d2d08e..9575150 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -754,6 +754,8 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
 	/* Requires DMA bindings. */
 	OF_DEV_AUXDATA("arm,pl022", 0x80002000, "ssp0",  &ssp0_plat),
 	OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0",  &mop500_sdi0_data),
+	OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1",  &mop500_sdi1_data),
+	OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2",  &mop500_sdi2_data),
 	OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4",  &mop500_sdi4_data),
 	/* Requires clock name bindings. */
 	OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e000, "gpio.0", NULL),
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index a0f920d..1f86387 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -81,6 +81,8 @@
 struct device;
 struct i2c_board_info;
 extern struct mmci_platform_data mop500_sdi0_data;
+extern struct mmci_platform_data mop500_sdi1_data;
+extern struct mmci_platform_data mop500_sdi2_data;
 extern struct mmci_platform_data mop500_sdi4_data;
 extern struct msp_i2s_platform_data msp0_platform_data;
 extern struct msp_i2s_platform_data msp1_platform_data;
-- 
1.7.9.5


  parent reply	other threads:[~2012-09-07 11:15 UTC|newest]

Thread overview: 87+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-07 11:14 [PATCH 00/19] First HREF Device Tree enablement patch-set Lee Jones
2012-09-07 11:14 ` [PATCH 01/19] ARM: ux500: Add skeleton Device Tree for the HREF reference board Lee Jones
2012-09-10  8:47   ` Linus Walleij
2012-09-14  9:37     ` Lee Jones
2012-09-14 14:01       ` Linus Walleij
2012-09-07 11:14 ` [PATCH 02/19] ARM: ux500: Add UART support to the HREF Device Tree Lee Jones
2012-09-10  8:49   ` Linus Walleij
2012-09-07 11:14 ` Lee Jones [this message]
2012-09-10  8:50   ` [PATCH 03/19] ARM: ux500: Pass SDI DMA information though AUX_DATA to MMCI Linus Walleij
2012-09-07 11:14 ` [PATCH 04/19] ARM: ux500: Add SDI (MMC) support to the HREF Device Tree Lee Jones
2012-09-07 12:29   ` Arnd Bergmann
2012-09-07 12:39     ` Lee Jones
2012-09-10  9:51   ` Linus Walleij
2012-09-07 11:14 ` [PATCH 05/19] ARM: ux500: Stop registering HREF's SDI devices from platform data Lee Jones
2012-09-07 12:30   ` Arnd Bergmann
2012-09-07 11:14 ` [PATCH 06/19] ARM: ux500: Add nodes for the MSP into the HREF Device Tree Lee Jones
2012-09-10  9:53   ` Linus Walleij
2012-09-14  9:23     ` Lee Jones
2012-09-14 14:00       ` Linus Walleij
2012-09-07 11:14 ` [PATCH 07/19] ARM: ux500: Add all encompassing sound node to " Lee Jones
2012-09-10  9:56   ` Linus Walleij
2012-09-14  9:20     ` Lee Jones
2012-09-07 11:14 ` [PATCH 08/19] ARM: ux500: Stop registering Audio devices for HREF when DT is enabled Lee Jones
2012-09-10  9:57   ` Linus Walleij
2012-09-07 11:14 ` [PATCH 09/19] ARM: ux500: Enable SSP (SPI) for HREF when booting Device Tree Lee Jones
2012-09-10 11:11   ` Linus Walleij
2012-09-14  9:18     ` Lee Jones
2012-09-17 17:03     ` Roland Stigge
2012-09-18 12:08       ` Linus Walleij
2012-09-18 12:13         ` Roland Stigge
2012-09-07 11:14 ` [PATCH 10/19] ARM: ux500: Remove redundant #gpio-cell properties from HREF and Snowball DT Lee Jones
2012-09-10 11:12   ` Linus Walleij
2012-09-14  9:10     ` Lee Jones
2012-09-14 13:58       ` Linus Walleij
2012-09-07 11:14 ` [PATCH 11/19] ARM: ux500: Add all known I2C sub-device nodes to the HREF DT Lee Jones
2012-09-10 11:34   ` Linus Walleij
2012-09-14  8:47     ` Lee Jones
2012-09-20  6:51       ` Linus Walleij
2012-09-18 15:49     ` Lee Jones
2012-09-07 11:14 ` [PATCH 12/19] i2c-nomadik: Register sub-devices when passed via Device Tree Lee Jones
2012-09-10 11:42   ` Linus Walleij
2012-09-12 10:52     ` Wolfram Sang
2012-09-14  8:27       ` Lee Jones
2012-09-14  8:41         ` Wolfram Sang
2012-09-14  9:02           ` Lee Jones
2012-09-14  9:39             ` Wolfram Sang
2012-09-14 10:15               ` Lee Jones
2012-09-14 11:32                 ` Wolfram Sang
2012-09-19 20:12                   ` Lee Jones
2012-10-06 11:25                     ` Wolfram Sang
2012-09-14  8:22     ` Lee Jones
2012-09-07 11:14 ` [PATCH 13/19] ARM: ux500: Stop registering I2C sub-devices for HREF when DT is enabled Lee Jones
2012-09-10 12:56   ` Linus Walleij
2012-09-07 11:14 ` [PATCH 14/19] ARM: ux500: Apply tc3589x's GPIO/IRQ properties to HREF's DT Lee Jones
2012-09-10 12:58   ` Linus Walleij
2012-09-14  8:33     ` Lee Jones
2012-09-07 11:14 ` [PATCH 15/19] mfd: Don't convert just one IRQ using irqdomain if a range is provided Lee Jones
2012-09-07 12:35   ` Arnd Bergmann
2012-09-07 12:46     ` Lee Jones
2012-09-07 13:37       ` Arnd Bergmann
2012-09-07 13:43         ` Lee Jones
2012-09-07 13:57           ` Arnd Bergmann
2012-09-17 13:45             ` Samuel Ortiz
2012-09-17 14:11               ` Lee Jones
2012-09-21 22:20                 ` Samuel Ortiz
2012-09-07 11:14 ` [PATCH 16/19] mfd: Provide the tc3589x with its own IRQ domain Lee Jones
2012-09-10 13:05   ` Linus Walleij
2012-09-16 23:45   ` Samuel Ortiz
2012-09-07 11:14 ` [PATCH 17/19] mfd: Enable the tc3589x for Device Tree Lee Jones
2012-09-10 13:08   ` Linus Walleij
2012-09-16 23:45   ` Samuel Ortiz
2012-09-07 11:14 ` [PATCH 18/19] gpio: Provide the tc3589x GPIO expander driver with an IRQ domain Lee Jones
2012-09-10 13:10   ` Linus Walleij
2012-09-12 13:04     ` Linus Walleij
2012-09-14  8:14     ` Lee Jones
2012-09-12 21:21   ` Linus Walleij
2012-09-07 11:14 ` [PATCH 19/19] gpio: Enable the tc3298x GPIO expander driver for Device Tree Lee Jones
2012-09-10 13:20   ` Linus Walleij
2012-09-12 21:21   ` Linus Walleij
2012-09-07 12:41 ` [PATCH 00/19] First HREF Device Tree enablement patch-set Arnd Bergmann
2012-09-07 13:01   ` Lee Jones
2012-09-07 13:58     ` Arnd Bergmann
2012-09-07 14:22       ` Lee Jones
2012-09-10  8:41       ` Linus Walleij
2012-09-10 10:13         ` Arnd Bergmann
2012-09-10 11:29           ` Linus Walleij
2012-09-10 13:49             ` Arnd Bergmann

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=1347016499-29354-4-git-send-email-lee.jones@linaro.org \
    --to=lee.jones@linaro.org \
    --cc=STEricsson_nomadik_linux@list.st.com \
    --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;
as well as URLs for NNTP newsgroup(s).