Commit bdb0c16a authored by Philipp Zabel's avatar Philipp Zabel Committed by Russell King
Browse files

[ARM] 4950/1: magician: enable MMC support


Signed-off-by: default avatarPhilipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent aa797590
...@@ -836,7 +836,21 @@ CONFIG_SND_PXA2XX_SOC=m ...@@ -836,7 +836,21 @@ CONFIG_SND_PXA2XX_SOC=m
# CONFIG_HID_SUPPORT is not set # CONFIG_HID_SUPPORT is not set
CONFIG_HID=m CONFIG_HID=m
# CONFIG_USB_SUPPORT is not set # CONFIG_USB_SUPPORT is not set
# CONFIG_MMC is not set CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
#
# MMC/SD Card Drivers
#
CONFIG_MMC_BLOCK=y
CONFIG_MMC_BLOCK_BOUNCE=y
CONFIG_SDIO_UART=m
#
# MMC/SD Host Controller Drivers
#
CONFIG_MMC_PXA=y
# CONFIG_NEW_LEDS is not set # CONFIG_NEW_LEDS is not set
CONFIG_RTC_LIB=y CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <asm/arch/pxa-regs.h> #include <asm/arch/pxa-regs.h>
#include <asm/arch/pxafb.h> #include <asm/arch/pxafb.h>
#include <asm/arch/i2c.h> #include <asm/arch/i2c.h>
#include <asm/arch/mmc.h>
#include <asm/arch/irda.h> #include <asm/arch/irda.h>
#include <asm/arch/ohci.h> #include <asm/arch/ohci.h>
...@@ -201,6 +202,44 @@ static struct platform_device backlight = { ...@@ -201,6 +202,44 @@ static struct platform_device backlight = {
}; };
/*
* MMC/SD
*/
static int magician_mci_init(struct device *dev,
irq_handler_t detect_irq, void *data)
{
return request_irq(IRQ_MAGICIAN_SD, detect_irq,
IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
"MMC card detect", data);
}
static void magician_mci_setpower(struct device *dev, unsigned int vdd)
{
struct pxamci_platform_data *pdata = dev->platform_data;
gpio_set_value(EGPIO_MAGICIAN_SD_POWER, (1 << vdd) & pdata->ocr_mask);
}
static int magician_mci_get_ro(struct device *dev)
{
return (!gpio_get_value(EGPIO_MAGICIAN_nSD_READONLY));
}
static void magician_mci_exit(struct device *dev, void *data)
{
free_irq(IRQ_MAGICIAN_SD, data);
}
static struct pxamci_platform_data magician_mci_info = {
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
.init = magician_mci_init,
.get_ro = magician_mci_get_ro,
.setpower = magician_mci_setpower,
.exit = magician_mci_exit,
};
/* /*
* USB OHCI * USB OHCI
*/ */
...@@ -267,6 +306,7 @@ static void __init magician_init(void) ...@@ -267,6 +306,7 @@ static void __init magician_init(void)
{ {
platform_add_devices(devices, ARRAY_SIZE(devices)); platform_add_devices(devices, ARRAY_SIZE(devices));
pxa_set_i2c_info(NULL); pxa_set_i2c_info(NULL);
pxa_set_mci_info(&magician_mci_info);
pxa_set_ohci_info(&magician_ohci_info); pxa_set_ohci_info(&magician_ohci_info);
pxa_set_ficp_info(&magician_ficp_info); pxa_set_ficp_info(&magician_ficp_info);
set_pxa_fb_info(&toppoly_info); set_pxa_fb_info(&toppoly_info);
......
Supports Markdown
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