Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt

From Sascha Hauer <s.hauer@pengutronix.de>:

ARM i.MX dt updates for 3.8

* tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6:
  Add device tree file for the armadeus apf27
  ARM i.MX: Add Ka-Ro TX25 devicetree
  ARM i.MX25: Add devicetree
  ARM i.MX25: Add devicetree support
  ARM i.MX25: Add missing clock gates

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --combined arch/arm/Kconfig
index 041cf07747766e4e18195a500137ba43916d16d5,f0430deae197b005a4eee7f5b0478ded567f86eb..d33dc606f7ece1bb03ca7e77387fbd4848f6013b
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -433,19 -433,6 +433,6 @@@ config ARCH_FOOTBRIDG
          Support for systems based on the DC21285 companion chip
          ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
  
- config ARCH_MXC
-       bool "Freescale MXC/iMX-based"
-       select ARCH_REQUIRE_GPIOLIB
-       select CLKDEV_LOOKUP
-       select CLKSRC_MMIO
-       select GENERIC_CLOCKEVENTS
-       select GENERIC_IRQ_CHIP
-       select MULTI_IRQ_HANDLER
-       select SPARSE_IRQ
-       select USE_OF
-       help
-         Support for Freescale MXC/iMX-based family of processors
- 
  config ARCH_MXS
        bool "Freescale MXS-based"
        select ARCH_REQUIRE_GPIOLIB
@@@ -937,6 -924,7 +924,6 @@@ config ARCH_OMA
        select CLKSRC_MMIO
        select GENERIC_CLOCKEVENTS
        select HAVE_CLK
 -      select NEED_MACH_GPIO_H
        help
          Support for TI's OMAP platform (OMAP1/2/3/4).
  
@@@ -1057,7 -1045,7 +1044,7 @@@ source "arch/arm/mach-msm/Kconfig
  
  source "arch/arm/mach-mv78xx0/Kconfig"
  
- source "arch/arm/plat-mxc/Kconfig"
+ source "arch/arm/mach-imx/Kconfig"
  
  source "arch/arm/mach-mxs/Kconfig"
  

diff --combined drivers/mmc/host/omap_hsmmc.c
index 9b24bd46aad3ea5fd26d887e91eef1f46bdb76b5,fedd258cc4ea2effe547f1fc15729f60277d8c33..e7c185233b181c98e1f62c2ae92f39f8ea211fb2
--- 1/drivers/mmc/host/omap_hsmmc.c
--- 2/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@@ -38,7 -38,9 +38,7 @@@
  #include <linux/gpio.h>
  #include <linux/regulator/consumer.h>
  #include <linux/pm_runtime.h>
 -#include <mach/hardware.h>
 -#include <plat/mmc.h>
 -#include <plat/cpu.h>
 +#include <linux/platform_data/mmc-omap.h>
  
  /* OMAP HSMMC Host Controller Registers */
  #define OMAP_HSMMC_SYSSTATUS  0x0014
@@@ -176,7 -178,8 +176,8 @@@ struct omap_hsmmc_host 
  
  static int omap_hsmmc_card_detect(struct device *dev, int slot)
  {
-       struct omap_mmc_platform_data *mmc = dev->platform_data;
+       struct omap_hsmmc_host *host = dev_get_drvdata(dev);
+       struct omap_mmc_platform_data *mmc = host->pdata;
  
        /* NOTE: assumes card detect signal is active-low */
        return !gpio_get_value_cansleep(mmc->slots[0].switch_pin);
@@@ -184,7 -187,8 +185,8 @@@
  
  static int omap_hsmmc_get_wp(struct device *dev, int slot)
  {
-       struct omap_mmc_platform_data *mmc = dev->platform_data;
+       struct omap_hsmmc_host *host = dev_get_drvdata(dev);
+       struct omap_mmc_platform_data *mmc = host->pdata;
  
        /* NOTE: assumes write protect signal is active-high */
        return gpio_get_value_cansleep(mmc->slots[0].gpio_wp);
@@@ -192,7 -196,8 +194,8 @@@
  
  static int omap_hsmmc_get_cover_state(struct device *dev, int slot)
  {
-       struct omap_mmc_platform_data *mmc = dev->platform_data;
+       struct omap_hsmmc_host *host = dev_get_drvdata(dev);
+       struct omap_mmc_platform_data *mmc = host->pdata;
  
        /* NOTE: assumes card detect signal is active-low */
        return !gpio_get_value_cansleep(mmc->slots[0].switch_pin);
@@@ -202,7 -207,8 +205,8 @@@
  
  static int omap_hsmmc_suspend_cdirq(struct device *dev, int slot)
  {
-       struct omap_mmc_platform_data *mmc = dev->platform_data;
+       struct omap_hsmmc_host *host = dev_get_drvdata(dev);
+       struct omap_mmc_platform_data *mmc = host->pdata;
  
        disable_irq(mmc->slots[0].card_detect_irq);
        return 0;
@@@ -210,7 -216,8 +214,8 @@@
  
  static int omap_hsmmc_resume_cdirq(struct device *dev, int slot)
  {
-       struct omap_mmc_platform_data *mmc = dev->platform_data;
+       struct omap_hsmmc_host *host = dev_get_drvdata(dev);
+       struct omap_mmc_platform_data *mmc = host->pdata;
  
        enable_irq(mmc->slots[0].card_detect_irq);
        return 0;
@@@ -2007,9 -2014,9 +2012,9 @@@ static int __devexit omap_hsmmc_remove(
                clk_put(host->dbclk);
        }
  
-       mmc_free_host(host->mmc);
+       omap_hsmmc_gpio_free(host->pdata);
        iounmap(host->base);
-       omap_hsmmc_gpio_free(pdev->dev.platform_data);
+       mmc_free_host(host->mmc);
  
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (res)