Merge branches 'fixes' and 'next/soc2' into for-next

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/dts/Makefile
index ba4c394d7a39ce10702adb61b957b8b8cb5d3544,377b7c3640337ed994107814836d16909ddbd447,7ec6ec076417523c1977cd6ebc9e2004e68f9949..3899d590ca45e89529af7069e938f0c191129cb6
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
--- 3/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@@ -306,7 -297,9 -301,8 +307,7 @@@@ dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660
   dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
   dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
        s3c6410-smdk6410.dtb
 - dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
 -      r7s72100-genmai.dtb \
 -      r7s72100-genmai-reference.dtb \
 + dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \
  -     r7s72100-genmai-reference.dtb \
        r8a7740-armadillo800eva.dtb \
        r8a7778-bockw.dtb \
        r8a7778-bockw-reference.dtb \

diff --cc drivers/of/platform.c
index e8376d646d98ff66594cd838a11918ff6486b7f5,bd47fbc53dc96258fba942d073ee320f25e5627f,4e91583a390883a387e7e2934a0c489b3b7821ed..6d60d052228c8553b50e0f6b2d64e4d773dce51b
--- 1/drivers/of/platform.c
--- 2/drivers/of/platform.c
--- 3/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@@@ -212,14 -211,14 -269,9 +270,9 @@@@ static struct platform_device *of_platf
   
        dev = of_device_alloc(np, bus_id, parent);
        if (!dev)
 --             return NULL;
 ++             goto err_clear_flag;
   
-- #if defined(CONFIG_MICROBLAZE)
--      dev->archdata.dma_mask = 0xffffffffUL;
-- #endif
--      dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
--      if (!dev->dev.dma_mask)
--              dev->dev.dma_mask = &dev->dev.coherent_dma_mask;
++      of_dma_configure(dev);
        dev->dev.bus = &platform_bus_type;
        dev->dev.platform_data = platform_data;