Merge tag 'omap-dt-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...

Minor DT updates based on the dt-missed-3.4 branch

By Benoit Cousson (3) and Peter Ujfalusi (2)
via Tony Lindgren
* tag 'omap-dt-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  arm/dts: omap4-panda: Add LEDs support
  arm/dts: omap4-sdp: Add LEDs support
  arm/dts: twl4030: Add twl4030-gpio node
  OMAP4: devices: Do not create mcpdm device if the dtb has been provided
  OMAP4: devices: Do not create dmic device if the dtb has been provided

diff --combined arch/arm/mach-omap2/devices.c
index 98cab3a204b9332e86ef21118a30073af70ae89a,ddf304de473c6534263ad221209af95806ee9225..b61c3654ecf99c17b1aa250dd6326639b45627b7
--- 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) {}
@@@ -701,13 -721,14 +701,14 @@@ static int __init omap2_init_devices(vo
         * in alphabetical order so they're easier to sort through.
         */
        omap_init_audio();
-       omap_init_mcpdm();
-       omap_init_dmic();
        omap_init_camera();
        omap_init_mbox();
        /* If dtb is there, the devices will be created dynamically */
-       if (!of_have_populated_dt())
+       if (!of_have_populated_dt()) {
+               omap_init_dmic();
+               omap_init_mcpdm();
                omap_init_mcspi();
+       }
        omap_init_pmu();
        omap_hdq_init();
        omap_init_sti();