summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@stericsson.com>2011-10-12 15:54:19 +0200
committerLee Jones <lee.jones@linaro.org>2012-01-05 10:10:24 +0000
commit87a41adddfaaea56f304924a5284abe52dd9f671 (patch)
treeb30c7ad1481453193871f6c0ab077e7b9c76f75a /arch
parent27e0341acf8ec7ecda81e146b835983fd17decfd (diff)
mach-ux500:sdi3: Added platform data for SDIO support
Added platform data for SDIO support on U4500 board Needs rework for power saving part (MMC_CAP_DISABLE, wakeup_handler not present) ST-Ericsson Id: AP 337858 Change-Id: I963abcf7ada91dc88251301f3a29a0a490eab3d8 Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/22500 Reviewed-by: Preetham-rao K <preetham.rao@stericsson.com> Tested-by: Preetham-rao K <preetham.rao@stericsson.com> Reviewed-by: QATEST Reviewed-by: Ulf HANSSON <ulf.hansson@stericsson.com> Conflicts: arch/arm/mach-ux500/board-u5500-sdi.c Conflicts: arch/arm/mach-ux500/board-u5500-sdi.c
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ux500/board-u5500.c8
-rw-r--r--arch/arm/mach-ux500/devices-db5500.h6
2 files changed, 11 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c
index 43e32d97f87..aa9c54c72ed 100644
--- a/arch/arm/mach-ux500/board-u5500.c
+++ b/arch/arm/mach-ux500/board-u5500.c
@@ -113,6 +113,14 @@ static pin_cfg_t u5500_pins[] = {
GPIO227_GPIO,
GPIO185_GPIO,
+ /* SDI3 (SDIO) */
+ GPIO171_MC3_DAT0 | PIN_INPUT_PULLUP,
+ GPIO172_MC3_DAT1 | PIN_INPUT_PULLUP,
+ GPIO173_MC3_DAT2 | PIN_INPUT_PULLUP,
+ GPIO174_MC3_DAT3 | PIN_INPUT_PULLUP,
+ GPIO175_MC3_CMD | PIN_INPUT_PULLUP,
+ GPIO176_MC3_CLK | PIN_OUTPUT_LOW,
+
/* Display & HDMI HW sync */
GPIO204_LCD_VSI1 | PIN_INPUT_PULLUP,
};
diff --git a/arch/arm/mach-ux500/devices-db5500.h b/arch/arm/mach-ux500/devices-db5500.h
index 0c4bccd02b9..53bd0ac6a3f 100644
--- a/arch/arm/mach-ux500/devices-db5500.h
+++ b/arch/arm/mach-ux500/devices-db5500.h
@@ -44,13 +44,13 @@
dbx500_add_sdi("sdi1", U5500_SDI1_BASE, IRQ_DB5500_SDMMC1, pdata, \
0x10480180)
#define db5500_add_sdi2(pdata) \
- dbx500_add_sdi("sdi2", U5500_SDI2_BASE, IRQ_DB5500_SDMMC2, pdata \
+ dbx500_add_sdi("sdi2", U5500_SDI2_BASE, IRQ_DB5500_SDMMC2, pdata, \
0x10480180)
#define db5500_add_sdi3(pdata) \
- dbx500_add_sdi("sdi3", U5500_SDI3_BASE, IRQ_DB5500_SDMMC3, pdata \
+ dbx500_add_sdi("sdi3", U5500_SDI3_BASE, IRQ_DB5500_SDMMC3, pdata, \
0x10480180)
#define db5500_add_sdi4(pdata) \
- dbx500_add_sdi("sdi4", U5500_SDI4_BASE, IRQ_DB5500_SDMMC4, pdata \
+ dbx500_add_sdi("sdi4", U5500_SDI4_BASE, IRQ_DB5500_SDMMC4, pdata, \
0x10480180)
/* This one has a bad peripheral ID in the U5500 silicon */