Merge branch 'kmemleak' of git://linux-arm.org/linux-2.6

[~andy/linux] / drivers / mfd / dm355evm_msp.c

diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
index 4214b3f724267dee58ee8df315b6466bbaa444bf..5b6e58a3ba46c3934e5ef96bdfcc2479172c20d7 100644 (file)
--- a/drivers/mfd/dm355evm_msp.c
+++ b/drivers/mfd/dm355evm_msp.c
@@ -32,8 +32,7 @@
  * This driver was tested with firmware revision A4.
  */
 
-#if defined(CONFIG_KEYBOARD_DM355EVM) \
-               || defined(CONFIG_KEYBOARD_DM355EVM_MODULE)
+#if defined(CONFIG_INPUT_DM355EVM) || defined(CONFIG_INPUT_DM355EVM_MODULE)
 #define msp_has_keyboard()     true
 #else
 #define msp_has_keyboard()     false
@@ -107,6 +106,9 @@ static const u8 msp_gpios[] = {
        MSP_GPIO(0, SWITCH1), MSP_GPIO(1, SWITCH1),
        MSP_GPIO(2, SWITCH1), MSP_GPIO(3, SWITCH1),
        MSP_GPIO(4, SWITCH1),
+       /* switches on MMC/SD sockets */
+       MSP_GPIO(1, SDMMC), MSP_GPIO(2, SDMMC), /* mmc0 WP, nCD */
+       MSP_GPIO(3, SDMMC), MSP_GPIO(4, SDMMC), /* mmc1 WP, nCD */
 };
 
 #define MSP_GPIO_REG(offset)   (msp_gpios[(offset)] >> 3)
@@ -304,6 +306,13 @@ static int add_children(struct i2c_client *client)
                gpio_export(gpio, false);
        }
 
+       /* MMC/SD inputs -- right after the last config input */
+       if (client->dev.platform_data) {
+               void (*mmcsd_setup)(unsigned) = client->dev.platform_data;
+
+               mmcsd_setup(dm355evm_msp_gpio.base + 8 + 5);
+       }
+
        /* RTC is a 32 bit counter, no alarm */
        if (msp_has_rtc()) {
                child = add_child(client, "rtc-dm355evm",