Merge branch 'next/boards' into for-next

* next/boards:
  ARM: OMAP2+: display: Create omap_vout device inside omap_display_init
  ARM: OMAP2+: display: Create omapvrfb and omapfb devices inside omap_display_init
  ARM: OMAP2+: display: Create omapdrm device inside omap_display_init
  ARM: OMAP2+: drm: Don't build device for DMM
  RX-51: Add support for OMAP3 ROM Random Number Generator
  ARM: OMAP3: RX-51: ARM errata 430973 workaround
  ARM: OMAP3: Add secure function omap_smc3() which calling instruction smc #1

Signed-off-by: Kevin Hilman <khilman@linaro.org>

diff --cc arch/arm/arm-soc-for-next-contents.txt
index b3c01275eca0b3c98aa979e0483cdba9e6ca0b8f,0000000000000000000000000000000000000000..c2ed874ca78c7ac4d2a667bfd711070edcc92048
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,79 -1,0 +1,81 @@@
 +
 +
 +next/cleanup
 +      shark/removal
 +                git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/del-shark-for-v3.13
 +      cleanup/dt-clock
 +              https://github.com/shesselba/linux-dove.git clk-of-init-v2_for-3.13
 +      patch
 +              ARM: drop explicit selection of HAVE_CLK and CLKDEV_LOOKUP
 +      reneasas/initdata-cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes5-for-v3.12
 +      renesas/cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup-for-v3.13
 +      patch
 +              clk: nomadik: fix missing __init on nomadik_src_init
 +      renesas/cleanup2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup2-for-v3.13
 +      patch
 +              ARM: clps711x: Use linux/sched_clock.h
 +              ARM: Remove temporary sched_clock.h header
 +
 +next/soc
 +      samsung/s3c64xx-clk
 +              http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-clk-s3c64xx
 +      patch
 +              ARM: davinci: remove deprecated IRQF_DISABLED
 +      renesas/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.13
 +      renesas/smp
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-smp-for-v3.13
 +      renesas/soc2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.13
 +      keystone/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/keystone-soc-for-arm-soc
 +      patch
 +              ARM: keystone: fix PM domain initcall to be keystone only
 +      omap/hwmod
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/hwmod-signed
 +      omap/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/soc-take2
 +
 +next/drivers
 +      davinci/gpio
 +              git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.13/gpio
 +      mvebu/drivers
 +              git://git.infradead.org/linux-mvebu.git tags/drivers-3.13
 +      arm/drivers
 +              git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git tags/arm-perf-3.13
 +
 +next/boards
 +      renesas/boards
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-boards-for-v3.13
 +      renesas/defconfig
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.13
 +      renesas/boards2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards2-for-v3.13
++      omap/boards
++              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/board-signed
 +
 +next/dt
 +      samsung/s3c64xx-dt
 +                http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dt-s3c64xx
 +      ux500/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dt-for-v3.13-2
 +              patch "ARM: ux500: enable appended dtb in u8500_defconfig"
 +      ux500/dt2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-devicetree-2
 +      renesas/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v3.13
 +      mvebu/dt
 +              git://git.infradead.org/linux-mvebu.git tags/dt-3.13
 +      mvebu/dt2
 +              git://git.infradead.org/linux-mvebu.git tags/dt-3.13-2
 +      renesas/dt2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.13
 +      socfpga/dt
 +              git://git.rocketboards.org/linux-socfpga-next.git tags/socfpga-dts-updates-for-v3.13
 +      omap/pdata-quirks               
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/quirk-signed
 +      omap/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/dt-signed

diff --cc arch/arm/mach-omap2/Makefile
index f8d4a1b83864e3488980957e24e2822acf7b6d32,e59bec01dd25696ed15705061f9869eac1a3d41b..0e95f48f1c052618e1cc75b3e42c40fa0f6f7193
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -228,12 -228,8 +228,8 @@@ endi
  # OMAP2420 MSDI controller integration support ("MMC")
  obj-$(CONFIG_SOC_OMAP2420)            += msdi.o
  
- ifneq ($(CONFIG_DRM_OMAP),)
- obj-y                                 += drm.o
- endif
- 
  # Specific board support
 -obj-$(CONFIG_MACH_OMAP_GENERIC)               += board-generic.o
 +obj-$(CONFIG_MACH_OMAP_GENERIC)               += board-generic.o pdata-quirks.o
  obj-$(CONFIG_MACH_OMAP_H4)            += board-h4.o
  obj-$(CONFIG_MACH_OMAP_2430SDP)               += board-2430sdp.o
  obj-$(CONFIG_MACH_OMAP3_BEAGLE)               += board-omap3beagle.o

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
Simple merge

diff --cc arch/arm/mach-omap2/devices.c
index 5336c75926cdc8ff23c100c134bb44a0fa4f25df,89a8698cd6ed2aa9b4c99c17d826b9350522ea5a..0dd6398bade4787510c4d5c62210b7a61cfb7595
--- 1/arch/arm/mach-omap2/devices.c
--- 2/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -465,15 -467,49 +466,15 @@@ static struct platform_device omap_vout
        .resource       = &omap_vout_resource[0],
        .id             = -1,
  };
- static void omap_init_vout(void)
+ 
+ int __init omap_init_vout(void)
  {
-       if (platform_device_register(&omap_vout_device) < 0)
-               printk(KERN_ERR "Unable to register OMAP-VOUT device\n");
+       return platform_device_register(&omap_vout_device);
  }
  #else
- static inline void omap_init_vout(void) {}
+ int __init omap_init_vout(void) { return 0; }
  #endif
  
 -#if IS_ENABLED(CONFIG_WL12XX)
 -
 -static struct wl12xx_platform_data wl12xx __initdata;
 -
 -void __init omap_init_wl12xx_of(void)
 -{
 -      int ret;
 -
 -      if (!of_have_populated_dt())
 -              return;
 -
 -      if (of_machine_is_compatible("ti,omap4-sdp")) {
 -              wl12xx.board_ref_clock = WL12XX_REFCLOCK_26;
 -              wl12xx.board_tcxo_clock = WL12XX_TCXOCLOCK_26;
 -              wl12xx.irq = gpio_to_irq(53);
 -      } else if (of_machine_is_compatible("ti,omap4-panda")) {
 -              wl12xx.board_ref_clock = WL12XX_REFCLOCK_38;
 -              wl12xx.irq = gpio_to_irq(53);
 -      } else {
 -              return;
 -      }
 -
 -      ret = wl12xx_set_platform_data(&wl12xx);
 -      if (ret) {
 -              pr_err("error setting wl12xx data: %d\n", ret);
 -              return;
 -      }
 -}
 -#else
 -static inline void omap_init_wl12xx_of(void)
 -{
 -}
 -#endif
 -
  /*-------------------------------------------------------------------------*/
  
  static int __init omap2_init_devices(void)
@@@ -496,9 -532,11 +497,8 @@@
                omap_init_sham();
                omap_init_aes();
                omap_init_rng();
 -      } else {
 -              /* These can be removed when bindings are done */
 -              omap_init_wl12xx_of();
        }
        omap_init_sti();
-       omap_init_vout();
  
        return 0;
  }

diff --cc arch/arm/mach-omap2/omap-secure.h
Simple merge