| From 29e424292a84c4db615e64beff9ed6ee66b11ca5 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Sun, 22 Apr 2012 23:53:40 -0700 |
| Subject: ARM: mach-shmobile: kzm9g: add MMCIF support |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Tested-by: Simon Horman <horms@verge.net.au> |
| Acked-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> |
| (cherry picked from commit 9cf94db3e4281bd6597d6bb585253106226882f3) |
| |
| Conflicts: |
| |
| arch/arm/mach-shmobile/board-kzm9g.c |
| |
| N.B: Not present in mainline yet |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-kzm9g.c | 49 ++++++++++++++++++++++++++++++++++++ |
| 1 file changed, 49 insertions(+) |
| |
| diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c |
| index 5674147..5b486ae 100644 |
| --- a/arch/arm/mach-shmobile/board-kzm9g.c |
| +++ b/arch/arm/mach-shmobile/board-kzm9g.c |
| @@ -22,6 +22,8 @@ |
| #include <linux/io.h> |
| #include <linux/irq.h> |
| #include <linux/i2c.h> |
| +#include <linux/mmc/host.h> |
| +#include <linux/mmc/sh_mmcif.h> |
| #include <linux/platform_device.h> |
| #include <linux/videodev2.h> |
| #include <mach/irqs.h> |
| @@ -87,6 +89,40 @@ static struct platform_device lcdc_device = { |
| }, |
| }; |
| |
| +/* MMCIF */ |
| +static struct resource sh_mmcif_resources[] = { |
| + [0] = { |
| + .name = "MMCIF", |
| + .start = 0xe6bd0000, |
| + .end = 0xe6bd00ff, |
| + .flags = IORESOURCE_MEM, |
| + }, |
| + [1] = { |
| + .start = gic_spi(141), |
| + .flags = IORESOURCE_IRQ, |
| + }, |
| + [2] = { |
| + .start = gic_spi(140), |
| + .flags = IORESOURCE_IRQ, |
| + }, |
| +}; |
| + |
| +static struct sh_mmcif_plat_data sh_mmcif_platdata = { |
| + .ocr = MMC_VDD_165_195, |
| + .caps = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE, |
| +}; |
| + |
| +static struct platform_device mmc_device = { |
| + .name = "sh_mmcif", |
| + .dev = { |
| + .dma_mask = NULL, |
| + .coherent_dma_mask = 0xffffffff, |
| + .platform_data = &sh_mmcif_platdata, |
| + }, |
| + .num_resources = ARRAY_SIZE(sh_mmcif_resources), |
| + .resource = sh_mmcif_resources, |
| +}; |
| + |
| static struct i2c_board_info i2c1_devices[] = { |
| { |
| I2C_BOARD_INFO("st1232-ts", 0x55), |
| @@ -96,6 +132,7 @@ static struct i2c_board_info i2c1_devices[] = { |
| |
| static struct platform_device *kzm_devices[] __initdata = { |
| &lcdc_device, |
| + &mmc_device, |
| }; |
| |
| /* |
| @@ -198,6 +235,18 @@ static void __init kzm_init(void) |
| gpio_request(GPIO_PORT223, NULL); /* IRQ8 */ |
| gpio_direction_input(GPIO_PORT223); |
| |
| + /* enable MMCIF */ |
| + gpio_request(GPIO_FN_MMCCLK0, NULL); |
| + gpio_request(GPIO_FN_MMCCMD0_PU, NULL); |
| + gpio_request(GPIO_FN_MMCD0_0_PU, NULL); |
| + gpio_request(GPIO_FN_MMCD0_1_PU, NULL); |
| + gpio_request(GPIO_FN_MMCD0_2_PU, NULL); |
| + gpio_request(GPIO_FN_MMCD0_3_PU, NULL); |
| + gpio_request(GPIO_FN_MMCD0_4_PU, NULL); |
| + gpio_request(GPIO_FN_MMCD0_5_PU, NULL); |
| + gpio_request(GPIO_FN_MMCD0_6_PU, NULL); |
| + gpio_request(GPIO_FN_MMCD0_7_PU, NULL); |
| + |
| #ifdef CONFIG_CACHE_L2X0 |
| /* Early BRESP enable, Shared attribute override enable, 64K*8way */ |
| l2x0_init(__io(0xf0100000), 0x40460000, 0x82000fff); |
| -- |
| 1.7.10.2.565.gbd578b5 |
| |