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

Pull ARM SoC platform changes from Olof Johansson:
 "This is the bulk of new SoC enablement and other platform changes for
  3.17:

   - Samsung S5PV210 has been converted to DT and multiplatform
   - Clock drivers and bindings for some of the lower-end i.MX 1/2
     platforms
   - Kirkwood, one of the popular Marvell platforms, is folded into the
     mvebu platform code, removing mach-kirkwood
   - Hwmod data for TI AM43xx and DRA7 platforms
   - More additions of Renesas shmobile platform support
   - Removal of plat-samsung contents that can be removed with S5PV210
     being multiplatform/DT-enabled and the other two old platforms
     being removed

  New platforms (most with only basic support right now):

   - Hisilicon X5HD2 settop box chipset is introduced
   - Mediatek MT6589 (mobile chipset) is introduced
   - Broadcom BCM7xxx settop box chipset is introduced

  + as usual a lot other pieces all over the platform code"

* tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (240 commits)
  ARM: hisi: remove smp from machine descriptor
  power: reset: move hisilicon reboot code
  ARM: dts: Add hix5hd2-dkb dts file.
  ARM: debug: Rename Hi3716 to HIX5HD2
  ARM: hisi: enable hix5hd2 SoC
  ARM: hisi: add ARCH_HISI
  MAINTAINERS: add entry for Broadcom ARM STB architecture
  ARM: brcmstb: select GISB arbiter and interrupt drivers
  ARM: brcmstb: add infrastructure for ARM-based Broadcom STB SoCs
  ARM: configs: enable SMP in bcm_defconfig
  ARM: add SMP support for Broadcom mobile SoCs
  Documentation: arm: misc updates to Marvell EBU SoC status
  Documentation: arm: add URLs to public datasheets for the Marvell Armada XP SoC
  ARM: mvebu: fix build without platforms selected
  ARM: mvebu: add cpuidle support for Armada 38x
  ARM: mvebu: add cpuidle support for Armada 370
  cpuidle: mvebu: add Armada 38x support
  cpuidle: mvebu: add Armada 370 support
  cpuidle: mvebu: rename the driver from armada-370-xp to mvebu-v7
  ARM: mvebu: export the SCU address
  ...

diff --cc Documentation/devicetree/bindings/phy/samsung-phy.txt
index 6099a5c94283ec14c7926773fdd90638502571ca,7dce043a6e29b2f88bbdb4d2e75a47b11e654a5a..7a6feea2a48b90a36d928cca664ac2cd893e4213
--- 1/Documentation/devicetree/bindings/phy/samsung-phy.txt
--- 2/Documentation/devicetree/bindings/phy/samsung-phy.txt
+++ b/Documentation/devicetree/bindings/phy/samsung-phy.txt
@@@ -30,6 -30,6 +30,7 @@@ Required properties
        - "samsung,exynos4210-usb2-phy"
        - "samsung,exynos4x12-usb2-phy"
        - "samsung,exynos5250-usb2-phy"
++      - "samsung,s5pv210-usb2-phy"
  - reg : a list of registers used by phy driver
        - first and obligatory is the location of phy modules registers
  - samsung,sysreg-phandle - handle to syscon used to control the system registers

diff --cc MAINTAINERS
index 28f2e65d738e8136dfbd09109ff461e49b4663c9,5d3b0ccaa90a9f53950b65b980538118d5c96797..20cd746d19335e07c06b16fcdf7fdc6f6368b33a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2004,8 -1978,16 +2012,16 @@@ F:    arch/arm/mach-bcm/bcm_5301x.
  F:    arch/arm/boot/dts/bcm5301x.dtsi
  F:    arch/arm/boot/dts/bcm470*
  
+ BROADCOM BCM7XXX ARM ARCHITECTURE
+ M:    Marc Carino <marc.ceeeee@gmail.com>
+ M:    Brian Norris <computersforpeace@gmail.com>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm/mach-bcm/*brcmstb*
+ F:    arch/arm/boot/dts/bcm7*.dts*
+ 
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
 -M:    Nithin Nayak Sujir <nsujir@broadcom.com>
 +M:    Prashant Sreedharan <prashant@broadcom.com>
  M:    Michael Chan <mchan@broadcom.com>
  L:    netdev@vger.kernel.org
  S:    Supported

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/boot/dts/hi3620.dtsi
Simple merge

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

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

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

diff --cc arch/arm/mach-exynos/pm.c
index 6ab68a068e93e5c50b559cf8fd7f5d7e4c6d3512,3e046a986e602f33def35ef5c9038ef6046ef531..18646b7e226b2ba9bdf154e6ccee188b6cb7d211
--- 1/arch/arm/mach-exynos/pm.c
--- 2/arch/arm/mach-exynos/pm.c
+++ b/arch/arm/mach-exynos/pm.c
@@@ -233,9 -236,9 +236,9 @@@ static int exynos_pm_suspend(void
        /* Setting SEQ_OPTION register */
  
        tmp = (S5P_USE_STANDBY_WFI0 | S5P_USE_STANDBY_WFE0);
-       __raw_writel(tmp, S5P_CENTRAL_SEQ_OPTION);
+       pmu_raw_writel(tmp, S5P_CENTRAL_SEQ_OPTION);
  
 -      if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
 +      if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)
                exynos_cpu_save_register();
  
        return 0;

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

diff --cc arch/arm/mach-integrator/integrator_cp.c
index e39097068cf90266c27b51f1c711847a700bd812,5236ebee249c27c997a483761529064c3ae8401d..cca02eb75eb5680674eb05e9728d1bfed9dfd97d
--- 1/arch/arm/mach-integrator/integrator_cp.c
--- 2/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@@ -18,10 -18,9 +18,10 @@@
  #include <linux/amba/bus.h>
  #include <linux/amba/kmi.h>
  #include <linux/amba/clcd.h>
 +#include <linux/platform_data/video-clcd-versatile.h>
  #include <linux/amba/mmci.h>
  #include <linux/io.h>
- #include <linux/irqchip/versatile-fpga.h>
+ #include <linux/irqchip.h>
  #include <linux/gfp.h>
  #include <linux/mtd/physmap.h>
  #include <linux/of_irq.h>

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

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

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

diff --cc arch/arm/mach-shmobile/board-koelsch.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-marzen.c
Simple merge

diff --cc arch/arm/mach-shmobile/headsmp.S
index 293007579b8ef67332ecb1c5c600f3c5565bccc1,faf82144a2629e307c64480f1a232a2035f48719..50c491567e11c2a43c6d86940f186299624e3f1a
--- 1/arch/arm/mach-shmobile/headsmp.S
--- 2/arch/arm/mach-shmobile/headsmp.S
+++ b/arch/arm/mach-shmobile/headsmp.S
@@@ -10,11 -10,12 +10,13 @@@
   * it under the terms of the GNU General Public License version 2 as
   * published by the Free Software Foundation.
   */
- #include <linux/linkage.h>
  #include <linux/init.h>
+ #include <linux/linkage.h>
+ #include <linux/threads.h>
 +#include <asm/assembler.h>
  #include <asm/memory.h>
  
+ #ifdef CONFIG_SMP
  ENTRY(shmobile_invalidate_start)
        bl      v7_invalidate_l1
        b       secondary_startup

diff --cc arch/arm/mach-shmobile/setup-r8a7779.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r8a7790.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r8a7791.c
Simple merge

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

diff --cc arch/arm/mm/Kconfig
Simple merge

diff --cc arch/arm/plat-omap/dma.c
Simple merge

diff --cc drivers/clk/samsung/Makefile
Simple merge

diff --cc drivers/cpuidle/Kconfig.arm
index a186dec8e5df5ec1b0b7d935fbea3f65d180a1e3,33fc0ff0af1c58caea20b7d266827ff143a603a6..38cff69ffe06bfeace68468f9f9cdca88a0dbaf5
--- 1/drivers/cpuidle/Kconfig.arm
--- 2/drivers/cpuidle/Kconfig.arm
+++ b/drivers/cpuidle/Kconfig.arm
@@@ -1,16 -1,9 +1,10 @@@
  #
  # ARM CPU Idle drivers
  #
- config ARM_ARMADA_370_XP_CPUIDLE
-       bool "CPU Idle Driver for Armada 370/XP family processors"
-       depends on ARCH_MVEBU
-       help
-         Select this to enable cpuidle on Armada 370/XP processors.
- 
  config ARM_BIG_LITTLE_CPUIDLE
        bool "Support for ARM big.LITTLE processors"
-       depends on ARCH_VEXPRESS_TC2_PM
+       depends on ARCH_VEXPRESS_TC2_PM || ARCH_EXYNOS
 +      depends on MCPM
        select ARM_CPU_SUSPEND
        select CPU_IDLE_MULTIPLE_DRIVERS
        help

diff --cc drivers/phy/Kconfig
index cc97c897945a8b2d033703251d769ac2f2f7673e,b0525e03782aea9e23ff4fcd78ddc02a5c56203b..d1f5fc924c93602391670129f4870c66b635fee7
--- 1/drivers/phy/Kconfig
--- 2/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@@ -149,30 -124,53 +149,40 @@@ config PHY_SUN4I_US
  config PHY_SAMSUNG_USB2
        tristate "Samsung USB 2.0 PHY driver"
        depends on HAS_IOMEM
 +      depends on USB_EHCI_EXYNOS || USB_OHCI_EXYNOS || USB_DWC2
        select GENERIC_PHY
        select MFD_SYSCON
 +      default ARCH_EXYNOS
        help
          Enable this to support the Samsung USB 2.0 PHY driver for Samsung
 -        SoCs. This driver provides the interface for USB 2.0 PHY. Support for
 -        particular SoCs has to be enabled in addition to this driver. Number
 -        and type of supported phys depends on the SoC.
 +        SoCs. This driver provides the interface for USB 2.0 PHY. Support
 +        for particular PHYs will be enabled based on the SoC type in addition
 +        to this driver.
  
+ config PHY_S5PV210_USB2
+       bool "Support for S5PV210"
+       depends on PHY_SAMSUNG_USB2
+       depends on ARCH_S5PV210
+       help
+         Enable USB PHY support for S5PV210. This option requires that Samsung
+         USB 2.0 PHY driver is enabled and means that support for this
+         particular SoC is compiled in the driver. In case of S5PV210 two phys
+         are available - device and host.
+ 
  config PHY_EXYNOS4210_USB2
 -      bool "Support for Exynos 4210"
 +      bool
        depends on PHY_SAMSUNG_USB2
 -      depends on CPU_EXYNOS4210
 -      help
 -        Enable USB PHY support for Exynos 4210. This option requires that
 -        Samsung USB 2.0 PHY driver is enabled and means that support for this
 -        particular SoC is compiled in the driver. In case of Exynos 4210 four
 -        phys are available - device, host, HSIC0 and HSIC1.
 +      default CPU_EXYNOS4210
  
  config PHY_EXYNOS4X12_USB2
 -      bool "Support for Exynos 4x12"
 +      bool
        depends on PHY_SAMSUNG_USB2
 -      depends on (SOC_EXYNOS4212 || SOC_EXYNOS4412)
 -      help
 -        Enable USB PHY support for Exynos 4x12. This option requires that
 -        Samsung USB 2.0 PHY driver is enabled and means that support for this
 -        particular SoC is compiled in the driver. In case of Exynos 4x12 four
 -        phys are available - device, host, HSIC0 and HSIC1.
 +      default SOC_EXYNOS3250 || SOC_EXYNOS4212 || SOC_EXYNOS4412
  
  config PHY_EXYNOS5250_USB2
 -      bool "Support for Exynos 5250"
 +      bool
        depends on PHY_SAMSUNG_USB2
 -      depends on SOC_EXYNOS5250
 -      help
 -        Enable USB PHY support for Exynos 5250. This option requires that
 -        Samsung USB 2.0 PHY driver is enabled and means that support for this
 -        particular SoC is compiled in the driver. In case of Exynos 5250 four
 -        phys are available - device, host, HSIC0 and HSIC.
 +      default SOC_EXYNOS5250 || SOC_EXYNOS5420
  
  config PHY_EXYNOS5_USBDRD
        tristate "Exynos5 SoC series USB DRD PHY driver"

diff --cc drivers/phy/Makefile
index 971ad0aac388b23beb7bb944e142025774e719a1,2983808e1626ea1f350efb3b082860f6c68f1e33..ec24e915349b7281d48f5671a8d4ce8651453b2d
--- 1/drivers/phy/Makefile
--- 2/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@@ -21,7 -18,6 +21,8 @@@ phy-exynos-usb2-y                     += phy-samsung-usb2
  phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4210_USB2) += phy-exynos4210-usb2.o
  phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4X12_USB2) += phy-exynos4x12-usb2.o
  phy-exynos-usb2-$(CONFIG_PHY_EXYNOS5250_USB2) += phy-exynos5250-usb2.o
+ phy-exynos-usb2-$(CONFIG_PHY_S5PV210_USB2)    += phy-s5pv210-usb2.o
  obj-$(CONFIG_PHY_EXYNOS5_USBDRD)      += phy-exynos5-usbdrd.o
  obj-$(CONFIG_PHY_XGENE)                       += phy-xgene.o
 +obj-$(CONFIG_PHY_QCOM_APQ8064_SATA)   += phy-qcom-apq8064-sata.o
 +obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA)   += phy-qcom-ipq806x-sata.o

diff --cc drivers/phy/phy-samsung-usb2.c
index ae30640a411d60091b08138a9dbe4726667c2b1d,29e4ab987645f7ca8e2bdad9387c9c76ce5af4d8..3732ca25e09fbf9f0b5eb20abfc2983f8bfe4556
--- 1/drivers/phy/phy-samsung-usb2.c
--- 2/drivers/phy/phy-samsung-usb2.c
+++ b/drivers/phy/phy-samsung-usb2.c
@@@ -110,6 -110,6 +110,12 @@@ static const struct of_device_id samsun
                .compatible = "samsung,exynos5250-usb2-phy",
                .data = &exynos5250_usb2_phy_config,
        },
++#endif
++#ifdef CONFIG_PHY_S5PV210_USB2
++      {
++              .compatible = "samsung,s5pv210-usb2-phy",
++              .data = &s5pv210_usb2_phy_config,
++      },
  #endif
        { },
  };

diff --cc drivers/phy/phy-samsung-usb2.h
index b03da0ef39ac233a1ec605e0103fd48e82e4cac2,1c55795d442959b906e4474e88c046df5fae99be..44bead9b8f34bb426440431217fa989a0f839734
--- 1/drivers/phy/phy-samsung-usb2.h
--- 2/drivers/phy/phy-samsung-usb2.h
+++ b/drivers/phy/phy-samsung-usb2.h
@@@ -67,4 -65,4 +67,5 @@@ extern const struct samsung_usb2_phy_co
  extern const struct samsung_usb2_phy_config exynos4210_usb2_phy_config;
  extern const struct samsung_usb2_phy_config exynos4x12_usb2_phy_config;
  extern const struct samsung_usb2_phy_config exynos5250_usb2_phy_config;
++extern const struct samsung_usb2_phy_config s5pv210_usb2_phy_config;
  #endif

diff --cc drivers/power/reset/Kconfig
Simple merge

diff --cc drivers/power/reset/Makefile
index 7379818ca69d097f47ba7a3f8d4790755b67f8ff,fe0f22877e58f678a61440d049a7d65188e196cc..a42e70edd0376912b88b4f4a4a3f3fc01ef17496
--- 1/drivers/power/reset/Makefile
--- 2/drivers/power/reset/Makefile
+++ b/drivers/power/reset/Makefile
@@@ -1,7 -1,7 +1,8 @@@
  obj-$(CONFIG_POWER_RESET_AS3722) += as3722-poweroff.o
  obj-$(CONFIG_POWER_RESET_AXXIA) += axxia-reset.o
 +obj-$(CONFIG_POWER_RESET_BRCMSTB) += brcmstb-reboot.o
  obj-$(CONFIG_POWER_RESET_GPIO) += gpio-poweroff.o
+ obj-$(CONFIG_POWER_RESET_HISI) += hisi-reboot.o
  obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o
  obj-$(CONFIG_POWER_RESET_QNAP) += qnap-poweroff.o
  obj-$(CONFIG_POWER_RESET_RESTART) += restart-poweroff.o

diff --cc drivers/tty/serial/samsung.c
Simple merge