Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull arm-soc board specific changes from Olof Johansson:
 "While we generally attempt to get rid of board specific files and
  replace them with device tree based descriptions, a lot of platforms
  have not come that far:

  In shmobile, we add two new board files because their recently started
  effort to add DT support has not proceeded enough to use it for all of
  the important hardware.

  In Kirkwood, we are adding support for new boards with a combination
  of DT and board file contents in multiple cases.

  pxa/mmp and imx are extending support for existing board files but not
  adding new ones."

Fix up trivial conflicts in arch/arm/mach-{mmp/ttc_dkb.c,shmobile/{Kconfig,Makefile}}

* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
  ARM: shmobile: fix smp build
  ARM: kirkwood: Add support for RaidSonic IB-NAS6210/6220 using devicetree
  kirkwood: Add iconnect support
  orion/kirkwood: create a generic function for gpio led blinking
  kirkwood/orion: fix orion_gpio_set_blink
  ARM: kirkwood: Define DNS-320/DNS-325 NAND in fdt
  kirkwood: Allow nand to be configured via. devicetree
  mtd: Add orion_nand devicetree bindings
  ARM: kirkwood: Basic support for DNS-320 and DNS-325
  ARM: mach-shmobile: Use DT_MACHINE for armadillo 800 eva
  ARM: mach-shmobile: Use DT_MACHINE for KZM9G
  ARM: pxa: hx4700: Add Synaptics NavPoint touchpad
  ARM: pxa: Use REGULATOR_SUPPLY macro
  ARM: mach-shmobile: kzm9g: enable SMP boot
  ARM: mach-shmobile: kzm9g: defconfig update
  ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key
  ARM: mach-shmobile: kzm9g: add SDHI support
  ARM: mach-shmobile: kzm9g: add MMCIF support
  ARM: mach-shmobile: kzm9g: correct screen direction
  ARM: mach-shmobile: sh73a0.h: add GPIO_NR
  ...

diff --cc arch/arm/mach-exynos/mach-nuri.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-origen.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-smdk4x12.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-smdkv310.c
index ea39f614f2dbf0a5e6ce12853ebf0d7c7957749b,afe7554d4ef5d6579819eb711d302bed113d542e..5af96064ca5109ddec70a66a444a74ff0720168c
--- 1/arch/arm/mach-exynos/mach-smdkv310.c
--- 2/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@@ -177,11 -202,19 +198,12 @@@ static struct s3c_fb_platdata smdkv310_
        .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
        .setup_gpio     = exynos4_fimd0_gpio_setup_24bpp,
  };
+ #endif
  
  static struct resource smdkv310_smsc911x_resources[] = {
 -      [0] = {
 -              .start  = EXYNOS4_PA_SROM_BANK(1),
 -              .end    = EXYNOS4_PA_SROM_BANK(1) + SZ_64K - 1,
 -              .flags  = IORESOURCE_MEM,
 -      },
 -      [1] = {
 -              .start  = IRQ_EINT(5),
 -              .end    = IRQ_EINT(5),
 -              .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
 -      },
 +      [0] = DEFINE_RES_MEM(EXYNOS4_PA_SROM_BANK(1), SZ_64K),
 +      [1] = DEFINE_RES_NAMED(IRQ_EINT(5), 1, NULL, IORESOURCE_IRQ \
 +                                              | IRQF_TRIGGER_LOW),
  };
  
  static struct smsc911x_platform_config smsc9215_config = {

diff --cc arch/arm/mach-exynos/mach-universal_c210.c
Simple merge

diff --cc arch/arm/mach-imx/Kconfig
Simple merge

diff --cc arch/arm/mach-imx/mach-mx35_3ds.c
Simple merge

diff --cc arch/arm/mach-mmp/Kconfig
Simple merge

diff --cc arch/arm/mach-mmp/ttc_dkb.c
index e8cf5ea1526309760a91ef3b23f4a7722d6b6b02,266215393f44c9d3a84335d34804074211c5f74a..7a7de2b12a622d06abe13daa7efad655772f0fb4
--- 1/arch/arm/mach-mmp/ttc_dkb.c
--- 2/arch/arm/mach-mmp/ttc_dkb.c
+++ b/arch/arm/mach-mmp/ttc_dkb.c
@@@ -17,7 -17,7 +17,8 @@@
  #include <linux/interrupt.h>
  #include <linux/i2c/pca953x.h>
  #include <linux/gpio.h>
 +#include <linux/mfd/88pm860x.h>
+ #include <linux/platform_data/mv_usb.h>
  
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>

diff --cc arch/arm/mach-omap2/board-4430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-cm-t35.c
Simple merge

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

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

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

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

diff --cc arch/arm/mach-omap2/devices.c
index 84fa55b4c8b9295e8818bcac2d120f01af30c559,17dacefaa7ef6695a0c26b06401bfbb55bf3d890..ae62ece04ef979b56ad559849fff57987ae75d08
--- 1/arch/arm/mach-omap2/devices.c
--- 2/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -700,14 -731,12 +730,15 @@@ 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_hdmi_audio();
        omap_init_mbox();
 -      omap_init_mcspi();
 +      /* If dtb is there, the devices will be created dynamically */
 +      if (!of_have_populated_dt()) {
 +              omap_init_dmic();
 +              omap_init_mcpdm();
 +              omap_init_mcspi();
 +      }
        omap_init_pmu();
        omap_hdq_init();
        omap_init_sti();

diff --cc arch/arm/mach-orion5x/dns323-setup.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
Simple merge

diff --cc arch/arm/mach-shmobile/Kconfig
index 7dcf08ee979deb3ed263f9ab8a07005ee8abfa26,8e3602adabefb9bd506bd61e0d04005e2b3cc800..98327b7a503cf97432b75a56d11be751c6910168
--- 1/arch/arm/mach-shmobile/Kconfig
--- 2/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -104,11 -104,12 +110,17 @@@ config MACH_MARZE
        depends on ARCH_R8A7779
        select ARCH_REQUIRE_GPIOLIB
  
 +config MACH_KZM9D
 +      bool "KZM9D board"
 +      depends on ARCH_EMEV2
 +      select USE_OF
 +
+ config MACH_KZM9G
+       bool "KZM-A9-GT board"
+       depends on ARCH_SH73A0
+       select ARCH_REQUIRE_GPIOLIB
+       select USE_OF
+ 
  comment "SH-Mobile System Configuration"
  
  config CPU_HAS_INTEVT

diff --cc arch/arm/mach-shmobile/Makefile
index c795335931c971f075b43cc899b2ab2566a9b613,4ac8c12c72bad6ce7dee6e3eb7b17595810f9c6c..e6b177bc94107683808ac734ebe132a7c951f863
--- 1/arch/arm/mach-shmobile/Makefile
--- 2/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@@ -51,7 -49,8 +51,9 @@@ obj-$(CONFIG_MACH_MACKEREL)   += board-ma
  obj-$(CONFIG_MACH_KOTA2)      += board-kota2.o
  obj-$(CONFIG_MACH_BONITO)     += board-bonito.o
  obj-$(CONFIG_MACH_MARZEN)     += board-marzen.o
+ obj-$(CONFIG_MACH_ARMADILLO800EVA)    += board-armadillo800eva.o
 +obj-$(CONFIG_MACH_KZM9D)      += board-kzm9d.o
+ obj-$(CONFIG_MACH_KZM9G)      += board-kzm9g.o
  
  # Framework support
  obj-$(CONFIG_SMP)             += $(smp-y)

diff --cc arch/arm/mach-shmobile/include/mach/sh73a0.h
Simple merge

diff --cc arch/arm/mach-shmobile/platsmp.c
index 7006cdc8b8cad1b0708c89a2cb268023f118a32f,5a2b69cf5ba6d662851bb18e84a5b26670947dda..bacdd667e3b192f908ef352f87d321c371a7d9a7
--- 1/arch/arm/mach-shmobile/platsmp.c
--- 2/arch/arm/mach-shmobile/platsmp.c
+++ b/arch/arm/mach-shmobile/platsmp.c
@@@ -20,11 -20,10 +20,12 @@@
  #include <asm/hardware/gic.h>
  #include <asm/mach-types.h>
  #include <mach/common.h>
 +#include <mach/emev2.h>
  
- #define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2())
+ #define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2() || \
+                       of_machine_is_compatible("renesas,sh73a0"))
  #define is_r8a7779() machine_is_marzen()
 +#define is_emev2() of_machine_is_compatible("renesas,emev2")
  
  static unsigned int __init shmobile_smp_get_core_count(void)
  {