diff options
| author | Yong Shen <yong.shen@freescale.com> | 2011-01-07 12:25:34 +0800 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-07 15:20:53 +0100 |
| commit | 410d3458e56bfe85ea4ac6358d5ae16d2f9acda6 (patch) | |
| tree | 7b1c82cdaf1c6f2f435bbf3d0a69273f2d665c0c /arch/arm/mach-mx5 | |
| parent | 0d7671ee66964760a718aa6d0277453b02a2c9b3 (diff) | |
| download | linux-3.10-410d3458e56bfe85ea4ac6358d5ae16d2f9acda6.tar.gz linux-3.10-410d3458e56bfe85ea4ac6358d5ae16d2f9acda6.tar.bz2 linux-3.10-410d3458e56bfe85ea4ac6358d5ae16d2f9acda6.zip | |
ARM i.MX53 enable sdhc support on EVK board
1. changes some register address to fit macro definition
2. add platform data and clock for sdhc
Signed-off-by: Yong Shen <yong.shen@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx5')
| -rw-r--r-- | arch/arm/mach-mx5/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/board-mx53_evk.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/clock-mx51-mx53.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/devices-imx53.h | 5 |
4 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig index 632d711f192..23b0e3f5cad 100644 --- a/arch/arm/mach-mx5/Kconfig +++ b/arch/arm/mach-mx5/Kconfig @@ -125,6 +125,7 @@ config MACH_MX53_EVK select SOC_IMX53 select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_IMX_I2C + select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX help Include support for MX53 EVK platform. This includes specific configurations for the board and its peripherals. diff --git a/arch/arm/mach-mx5/board-mx53_evk.c b/arch/arm/mach-mx5/board-mx53_evk.c index d0b4570f44e..4043451798d 100644 --- a/arch/arm/mach-mx5/board-mx53_evk.c +++ b/arch/arm/mach-mx5/board-mx53_evk.c @@ -99,6 +99,9 @@ static void __init mx53_evk_board_init(void) imx53_add_imx_i2c(0, &mx53_evk_i2c_data); imx53_add_imx_i2c(1, &mx53_evk_i2c_data); + + imx53_add_sdhci_esdhc_imx(0, NULL); + imx53_add_sdhci_esdhc_imx(1, NULL); } static void __init mx53_evk_timer_init(void) diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c index 0ade3c4cc6c..15fa89ed5d0 100644 --- a/arch/arm/mach-mx5/clock-mx51-mx53.c +++ b/arch/arm/mach-mx5/clock-mx51-mx53.c @@ -1328,6 +1328,8 @@ static struct clk_lookup mx53_lookups[] = { _REGISTER_CLOCK(NULL, "iim_clk", iim_clk) _REGISTER_CLOCK("imx-i2c.0", NULL, i2c1_clk) _REGISTER_CLOCK("imx-i2c.1", NULL, i2c2_clk) + _REGISTER_CLOCK("sdhci-esdhc-imx.0", NULL, esdhc1_clk) + _REGISTER_CLOCK("sdhci-esdhc-imx.1", NULL, esdhc2_clk) }; static void clk_tree_init(void) diff --git a/arch/arm/mach-mx5/devices-imx53.h b/arch/arm/mach-mx5/devices-imx53.h index ca1232bcede..f7c89ef2f66 100644 --- a/arch/arm/mach-mx5/devices-imx53.h +++ b/arch/arm/mach-mx5/devices-imx53.h @@ -20,3 +20,8 @@ extern const struct imx_imx_uart_1irq_data imx53_imx_uart_data[] __initconst; extern const struct imx_imx_i2c_data imx53_imx_i2c_data[] __initconst; #define imx53_add_imx_i2c(id, pdata) \ imx_add_imx_i2c(&imx53_imx_i2c_data[id], pdata) + +extern const struct imx_sdhci_esdhc_imx_data +imx53_sdhci_esdhc_imx_data[] __initconst; +#define imx53_add_sdhci_esdhc_imx(id, pdata) \ + imx_add_sdhci_esdhc_imx(&imx53_sdhci_esdhc_imx_data[id], pdata) |