1 files changed, 20 insertions, 2 deletions

diff --git a/arch/arm/mach-u300/mmc.c b/arch/arm/mach-u300/mmc.c
index 585cc013639d..7b6b016786bb 100644
--- a/arch/arm/mach-u300/mmc.c
+++ b/arch/arm/mach-u300/mmc.c
@@ -19,15 +19,16 @@
 #include <linux/regulator/consumer.h>
 #include <linux/regulator/machine.h>
 #include <linux/gpio.h>
+#include <linux/amba/mmci.h>
 
-#include <asm/mach/mmc.h>
 #include "mmc.h"
+#include "padmux.h"
 
 struct mmci_card_event {
         struct input_dev *mmc_input;
         int mmc_inserted;
         struct work_struct workq;
-        struct mmc_platform_data mmc0_plat_data;
+        struct mmci_platform_data mmc0_plat_data;
 };
 
 static unsigned int mmc_status(struct device *dev)
@@ -146,6 +147,7 @@ int __devinit mmc_init(struct amba_device *adev)
 {
         struct mmci_card_event *mmci_card;
         struct device *mmcsd_device = &adev->dev;
+        struct pmx *pmx;
         int ret = 0;
 
         mmci_card = kzalloc(sizeof(struct mmci_card_event), GFP_KERNEL);
@@ -158,6 +160,8 @@ int __devinit mmc_init(struct amba_device *adev)
         mmci_card->mmc0_plat_data.status = mmc_status;
         mmci_card->mmc0_plat_data.gpio_wp = -1;
         mmci_card->mmc0_plat_data.gpio_cd = -1;
+        mmci_card->mmc0_plat_data.capabilities = MMC_CAP_MMC_HIGHSPEED |
+                MMC_CAP_SD_HIGHSPEED | MMC_CAP_4_BIT_DATA;
 
         mmcsd_device->platform_data = (void *) &mmci_card->mmc0_plat_data;
 
@@ -207,6 +211,20 @@ int __devinit mmc_init(struct amba_device *adev)
 
         input_set_drvdata(mmci_card->mmc_input, mmci_card);
 
+        /*
+         * Setup padmuxing for MMC. Since this must always be
+         * compiled into the kernel, pmx is never released.
+         */
+        pmx = pmx_get(mmcsd_device, U300_APP_PMX_MMC_SETTING);
+
+        if (IS_ERR(pmx))
+                pr_warning("Could not get padmux handle\n");
+        else {
+                ret = pmx_activate(mmcsd_device, pmx);
+                if (IS_ERR_VALUE(ret))
+                        pr_warning("Could not activate padmuxing\n");
+        }
+
         ret = gpio_register_callback(U300_GPIO_PIN_MMC_CD, mmci_callback,
                                      mmci_card);