Commit 361778d6 authored by Eric Miao's avatar Eric Miao

[ARM] pxa/littleton: add support for the Micro-SD slot (MMC1)

Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent f6394e26
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include <mach/pxa300.h> #include <mach/pxa300.h>
#include <mach/pxafb.h> #include <mach/pxafb.h>
#include <mach/ssp.h> #include <mach/ssp.h>
#include <mach/mmc.h>
#include <mach/pxa2xx_spi.h> #include <mach/pxa2xx_spi.h>
#include <plat/i2c.h> #include <plat/i2c.h>
#include <mach/pxa27x_keypad.h> #include <mach/pxa27x_keypad.h>
...@@ -50,6 +51,8 @@ ...@@ -50,6 +51,8 @@
#include "generic.h" #include "generic.h"
#define GPIO_MMC1_CARD_DETECT mfp_to_gpio(MFP_PIN_GPIO15)
/* Littleton MFP configurations */ /* Littleton MFP configurations */
static mfp_cfg_t littleton_mfp_cfg[] __initdata = { static mfp_cfg_t littleton_mfp_cfg[] __initdata = {
/* LCD */ /* LCD */
...@@ -98,6 +101,15 @@ static mfp_cfg_t littleton_mfp_cfg[] __initdata = { ...@@ -98,6 +101,15 @@ static mfp_cfg_t littleton_mfp_cfg[] __initdata = {
GPIO123_KP_MKOUT_2, GPIO123_KP_MKOUT_2,
GPIO124_KP_MKOUT_3, GPIO124_KP_MKOUT_3,
GPIO125_KP_MKOUT_4, GPIO125_KP_MKOUT_4,
/* MMC1 */
GPIO3_MMC1_DAT0,
GPIO4_MMC1_DAT1,
GPIO5_MMC1_DAT2,
GPIO6_MMC1_DAT3,
GPIO7_MMC1_CLK,
GPIO8_MMC1_CMD,
GPIO15_GPIO, /* card detect */
}; };
static struct resource smc91x_resources[] = { static struct resource smc91x_resources[] = {
...@@ -252,6 +264,56 @@ static void __init littleton_init_keypad(void) ...@@ -252,6 +264,56 @@ static void __init littleton_init_keypad(void)
static inline void littleton_init_keypad(void) {} static inline void littleton_init_keypad(void) {}
#endif #endif
#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
static int littleton_mci_init(struct device *dev,
irq_handler_t littleton_detect_int, void *data)
{
int err, gpio_cd = GPIO_MMC1_CARD_DETECT;
err = gpio_request(gpio_cd, "mmc card detect");
if (err)
goto err_request_cd;
gpio_direction_input(gpio_cd);
err = request_irq(gpio_to_irq(gpio_cd), littleton_detect_int,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
"mmc card detect", data);
if (err) {
dev_err(dev, "failed to request card detect IRQ\n");
goto err_request_irq;
}
return 0;
err_request_irq:
gpio_free(gpio_cd);
err_request_cd:
return err;
}
static void littleton_mci_exit(struct device *dev, void *data)
{
int gpio_cd = GPIO_MMC1_CARD_DETECT;
free_irq(gpio_to_irq(gpio_cd), data);
gpio_free(gpio_cd);
}
static struct pxamci_platform_data littleton_mci_platform_data = {
.detect_delay = 20,
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
.init = littleton_mci_init,
.exit = littleton_mci_exit,
};
static void __init littleton_init_mmc(void)
{
pxa_set_mci_info(&littleton_mci_platform_data);
}
#else
static inline void littleton_init_mmc(void) {}
#endif
#if defined(CONFIG_MTD_NAND_PXA3xx) || defined(CONFIG_MTD_NAND_PXA3xx_MODULE) #if defined(CONFIG_MTD_NAND_PXA3xx) || defined(CONFIG_MTD_NAND_PXA3xx_MODULE)
static struct mtd_partition littleton_nand_partitions[] = { static struct mtd_partition littleton_nand_partitions[] = {
[0] = { [0] = {
...@@ -392,6 +454,7 @@ static void __init littleton_init(void) ...@@ -392,6 +454,7 @@ static void __init littleton_init(void)
littleton_init_spi(); littleton_init_spi();
littleton_init_i2c(); littleton_init_i2c();
littleton_init_mmc();
littleton_init_lcd(); littleton_init_lcd();
littleton_init_keypad(); littleton_init_keypad();
littleton_init_nand(); littleton_init_nand();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment