Merge branch 'omap/dt-missed-3.4' into next/dt

* omap/dt-missed-3.4:
  arm/dts: OMAP3: Add mmc controller nodes and board data
  arm/dts: OMAP4: Add mmc controller nodes and board data
  arm/dts: twl: Pass regulator data from dt
  arm/dts: omap4-sdp: Add ks8851 ethernet SPI device
  arm/dts: OMAP3: Add SPI controller nodes
  arm/dts: OMAP4: Add SPI controller nodes
  arm/dts: OMAP3: Add gpio nodes
  arm/dts: OMAP4: Add gpio nodes
  ARM: OMAP2+: board-generic: Remove i2c static init
  arm/dts: omap3-beagle: Add twl4030 and i2c EEPROM
  arm/dts: omap4-sdp: Add twl6030, i2c3 and i2c4 devices
  arm/dts: omap4-panda: Add twl6030 and i2c EEPROM
  arm/dts: twl4030: Add DTS file for twl4030 PM + Audio IC
  arm/dts: twl6030: Add DTS file for twl6030 PMIC

diff --combined arch/arm/mach-omap2/devices.c
index e4336035c0ea85f94ce4e9d4e6b1cd0752e1f5e4,8a489ba687142db817ae61a2ea5f8ff37e45f951..98cab3a204b9332e86ef21118a30073af70ae89a
--- 1/arch/arm/mach-omap2/devices.c
--- 2/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -17,7 -17,6 +17,7 @@@
  #include <linux/err.h>
  #include <linux/slab.h>
  #include <linux/of.h>
 +#include <linux/platform_data/omap4-keypad.h>
  
  #include <mach/hardware.h>
  #include <mach/irqs.h>
@@@ -25,8 -24,9 +25,8 @@@
  #include <asm/mach/map.h>
  #include <asm/pmu.h>
  
 -#include <plat/tc.h>
 +#include "iomap.h"
  #include <plat/board.h>
 -#include <plat/mcbsp.h>
  #include <plat/mmc.h>
  #include <plat/dma.h>
  #include <plat/omap_hwmod.h>
@@@ -276,7 -276,7 +276,7 @@@ int __init omap4_keyboard_init(struct o
  }
  
  #if defined(CONFIG_OMAP_MBOX_FWK) || defined(CONFIG_OMAP_MBOX_FWK_MODULE)
 -static inline void omap_init_mbox(void)
 +static inline void __init omap_init_mbox(void)
  {
        struct omap_hwmod *oh;
        struct platform_device *pdev;
@@@ -304,8 -304,29 +304,8 @@@ static struct platform_device omap_pcm 
        .id     = -1,
  };
  
 -/*
 - * OMAP2420 has 2 McBSP ports
 - * OMAP2430 has 5 McBSP ports
 - * OMAP3 has 5 McBSP ports
 - * OMAP4 has 4 McBSP ports
 - */
 -OMAP_MCBSP_PLATFORM_DEVICE(1);
 -OMAP_MCBSP_PLATFORM_DEVICE(2);
 -OMAP_MCBSP_PLATFORM_DEVICE(3);
 -OMAP_MCBSP_PLATFORM_DEVICE(4);
 -OMAP_MCBSP_PLATFORM_DEVICE(5);
 -
  static void omap_init_audio(void)
  {
 -      platform_device_register(&omap_mcbsp1);
 -      platform_device_register(&omap_mcbsp2);
 -      if (cpu_is_omap243x() || cpu_is_omap34xx() || cpu_is_omap44xx()) {
 -              platform_device_register(&omap_mcbsp3);
 -              platform_device_register(&omap_mcbsp4);
 -      }
 -      if (cpu_is_omap243x() || cpu_is_omap34xx())
 -              platform_device_register(&omap_mcbsp5);
 -
        platform_device_register(&omap_pcm);
  }
  
@@@ -316,7 -337,7 +316,7 @@@ static inline void omap_init_audio(void
  #if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \
                defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)
  
 -static void omap_init_mcpdm(void)
 +static void __init omap_init_mcpdm(void)
  {
        struct omap_hwmod *oh;
        struct platform_device *pdev;
@@@ -337,7 -358,7 +337,7 @@@ static inline void omap_init_mcpdm(void
  #if defined(CONFIG_SND_OMAP_SOC_DMIC) || \
                defined(CONFIG_SND_OMAP_SOC_DMIC_MODULE)
  
 -static void omap_init_dmic(void)
 +static void __init omap_init_dmic(void)
  {
        struct omap_hwmod *oh;
        struct platform_device *pdev;
@@@ -359,7 -380,7 +359,7 @@@ static inline void omap_init_dmic(void
  
  #include <plat/mcspi.h>
  
 -static int omap_mcspi_init(struct omap_hwmod *oh, void *unused)
 +static int __init omap_mcspi_init(struct omap_hwmod *oh, void *unused)
  {
        struct platform_device *pdev;
        char *name = "omap2_mcspi";
@@@ -633,7 -654,9 +633,7 @@@ void __init omap242x_init_mmc(struct om
  /*-------------------------------------------------------------------------*/
  
  #if defined(CONFIG_HDQ_MASTER_OMAP) || defined(CONFIG_HDQ_MASTER_OMAP_MODULE)
 -#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430)
  #define OMAP_HDQ_BASE 0x480B2000
 -#endif
  static struct resource omap_hdq_resources[] = {
        {
                .start          = OMAP_HDQ_BASE,
@@@ -656,10 -679,7 +656,10 @@@ static struct platform_device omap_hdq_
  };
  static inline void omap_hdq_init(void)
  {
 -      (void) platform_device_register(&omap_hdq_dev);
 +      if (cpu_is_omap2420())
 +              return;
 +
 +      platform_device_register(&omap_hdq_dev);
  }
  #else
  static inline void omap_hdq_init(void) {}
@@@ -705,7 -725,9 +705,9 @@@ static int __init omap2_init_devices(vo
        omap_init_dmic();
        omap_init_camera();
        omap_init_mbox();
-       omap_init_mcspi();
+       /* If dtb is there, the devices will be created dynamically */
+       if (!of_have_populated_dt())
+               omap_init_mcspi();
        omap_init_pmu();
        omap_hdq_init();
        omap_init_sti();

diff --combined arch/arm/mach-omap2/gpio.c
index 2f994e5194e85c932836421f79b90fe7efe0ce4c,8412746bad71c01f7c52f35714151389f7cba75c..18f9c7bd72003e616f3cc01beebc31dfd01fe5b1
--- 1/arch/arm/mach-omap2/gpio.c
--- 2/arch/arm/mach-omap2/gpio.c
+++ b/arch/arm/mach-omap2/gpio.c
@@@ -20,21 -20,18 +20,22 @@@
  #include <linux/err.h>
  #include <linux/slab.h>
  #include <linux/interrupt.h>
+ #include <linux/of.h>
  
  #include <plat/omap_hwmod.h>
  #include <plat/omap_device.h>
 +#include <plat/omap-pm.h>
  
 -static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
 +#include "powerdomain.h"
 +
 +static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
  {
        struct platform_device *pdev;
        struct omap_gpio_platform_data *pdata;
        struct omap_gpio_dev_attr *dev_attr;
        char *name = "omap_gpio";
        int id;
 +      struct powerdomain *pwrdm;
  
        /*
         * extract the device id from name field available in the
@@@ -56,7 -53,7 +57,7 @@@
        pdata->bank_width = dev_attr->bank_width;
        pdata->dbck_flag = dev_attr->dbck_flag;
        pdata->virtual_irq_start = IH_GPIO_BASE + 32 * (id - 1);
 -
 +      pdata->get_context_loss_count = omap_pm_get_dev_context_loss_count;
        pdata->regs = kzalloc(sizeof(struct omap_gpio_reg_offs), GFP_KERNEL);
        if (!pdata) {
                pr_err("gpio%d: Memory allocation failed\n", id);
@@@ -65,15 -62,8 +66,15 @@@
  
        switch (oh->class->rev) {
        case 0:
 +              if (id == 1)
 +                      /* non-wakeup GPIO pins for OMAP2 Bank1 */
 +                      pdata->non_wakeup_gpios = 0xe203ffc0;
 +              else if (id == 2)
 +                      /* non-wakeup GPIO pins for OMAP2 Bank2 */
 +                      pdata->non_wakeup_gpios = 0x08700040;
 +              /* fall through */
 +
        case 1:
 -              pdata->bank_type = METHOD_GPIO_24XX;
                pdata->regs->revision = OMAP24XX_GPIO_REVISION;
                pdata->regs->direction = OMAP24XX_GPIO_OE;
                pdata->regs->datain = OMAP24XX_GPIO_DATAIN;
@@@ -83,19 -73,13 +84,19 @@@
                pdata->regs->irqstatus = OMAP24XX_GPIO_IRQSTATUS1;
                pdata->regs->irqstatus2 = OMAP24XX_GPIO_IRQSTATUS2;
                pdata->regs->irqenable = OMAP24XX_GPIO_IRQENABLE1;
 +              pdata->regs->irqenable2 = OMAP24XX_GPIO_IRQENABLE2;
                pdata->regs->set_irqenable = OMAP24XX_GPIO_SETIRQENABLE1;
                pdata->regs->clr_irqenable = OMAP24XX_GPIO_CLEARIRQENABLE1;
                pdata->regs->debounce = OMAP24XX_GPIO_DEBOUNCE_VAL;
                pdata->regs->debounce_en = OMAP24XX_GPIO_DEBOUNCE_EN;
 +              pdata->regs->ctrl = OMAP24XX_GPIO_CTRL;
 +              pdata->regs->wkup_en = OMAP24XX_GPIO_WAKE_EN;
 +              pdata->regs->leveldetect0 = OMAP24XX_GPIO_LEVELDETECT0;
 +              pdata->regs->leveldetect1 = OMAP24XX_GPIO_LEVELDETECT1;
 +              pdata->regs->risingdetect = OMAP24XX_GPIO_RISINGDETECT;
 +              pdata->regs->fallingdetect = OMAP24XX_GPIO_FALLINGDETECT;
                break;
        case 2:
 -              pdata->bank_type = METHOD_GPIO_44XX;
                pdata->regs->revision = OMAP4_GPIO_REVISION;
                pdata->regs->direction = OMAP4_GPIO_OE;
                pdata->regs->datain = OMAP4_GPIO_DATAIN;
@@@ -105,17 -89,10 +106,17 @@@
                pdata->regs->irqstatus = OMAP4_GPIO_IRQSTATUS0;
                pdata->regs->irqstatus2 = OMAP4_GPIO_IRQSTATUS1;
                pdata->regs->irqenable = OMAP4_GPIO_IRQSTATUSSET0;
 +              pdata->regs->irqenable2 = OMAP4_GPIO_IRQSTATUSSET1;
                pdata->regs->set_irqenable = OMAP4_GPIO_IRQSTATUSSET0;
                pdata->regs->clr_irqenable = OMAP4_GPIO_IRQSTATUSCLR0;
                pdata->regs->debounce = OMAP4_GPIO_DEBOUNCINGTIME;
                pdata->regs->debounce_en = OMAP4_GPIO_DEBOUNCENABLE;
 +              pdata->regs->ctrl = OMAP4_GPIO_CTRL;
 +              pdata->regs->wkup_en = OMAP4_GPIO_IRQWAKEN0;
 +              pdata->regs->leveldetect0 = OMAP4_GPIO_LEVELDETECT0;
 +              pdata->regs->leveldetect1 = OMAP4_GPIO_LEVELDETECT1;
 +              pdata->regs->risingdetect = OMAP4_GPIO_RISINGDETECT;
 +              pdata->regs->fallingdetect = OMAP4_GPIO_FALLINGDETECT;
                break;
        default:
                WARN(1, "Invalid gpio bank_type\n");
@@@ -123,9 -100,6 +124,9 @@@
                return -EINVAL;
        }
  
 +      pwrdm = omap_hwmod_get_pwrdm(oh);
 +      pdata->loses_context = pwrdm_can_ever_lose_context(pwrdm);
 +
        pdev = omap_device_build(name, id - 1, oh, pdata,
                                sizeof(*pdata), NULL, 0, false);
        kfree(pdata);
@@@ -136,6 -110,9 +137,6 @@@
                return PTR_ERR(pdev);
        }
  
 -      omap_device_disable_idle_on_suspend(pdev);
 -
 -      gpio_bank_count++;
        return 0;
  }
  
@@@ -146,7 -123,10 +147,10 @@@
   */
  static int __init omap2_gpio_init(void)
  {
-       return omap_hwmod_for_each_by_class("gpio", omap2_gpio_dev_init,
-                                               NULL);
+       /* If dtb is there, the devices will be created dynamically */
+       if (of_have_populated_dt())
+               return -ENODEV;
+ 
+       return omap_hwmod_for_each_by_class("gpio", omap2_gpio_dev_init, NULL);
  }
  postcore_initcall(omap2_gpio_init);