Merge tag 'zte-soc64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...

Pull "ZTE arm64 SoC changes for 4.9" from Shawn Guo:
 - Add a Kconfig option for ZTE ZX SoC family support

* tag 'zte-soc64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: add ZTE ZX SoC family

diff --combined arch/arm64/Kconfig.platforms
index 092c31551176c7c3f05a197477947b5edb89fc08,1fe2a58c6e773eb908a4d485345d464cbb58be8a..86e520ac3136cb2d28236edf53afc8cb2685d1e1
--- 1/arch/arm64/Kconfig.platforms
--- 2/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@@ -3,14 -3,12 +3,14 @@@ menu "Platform selection
  config ARCH_SUNXI
        bool "Allwinner sunxi 64-bit SoC Family"
        select GENERIC_IRQ_CHIP
 +      select PINCTRL
 +      select PINCTRL_SUN50I_A64
        help
          This enables support for Allwinner sunxi based SoCs like the A64.
  
  config ARCH_ALPINE
        bool "Annapurna Labs Alpine platform"
 -      select ALPINE_MSI
 +      select ALPINE_MSI if PCI
        help
          This enables support for the Annapurna Labs Alpine
          Soc family.
@@@ -44,13 -42,6 +44,13 @@@ config ARCH_BERLI
        help
          This enables support for Marvell Berlin SoC Family
  
 +config ARCH_BRCMSTB
 +      bool "Broadcom Set-Top-Box SoCs"
 +      select BRCMSTB_L2_IRQ
 +      select GENERIC_IRQ_CHIP
 +      help
 +        This enables support for Broadcom's ARMv8 Set Top Box SoCs
 +
  config ARCH_EXYNOS
        bool "ARMv8 based Samsung Exynos SoC family"
        select COMMON_CLK_SAMSUNG
@@@ -75,8 -66,7 +75,8 @@@ config ARCH_LG1
  config ARCH_HISI
        bool "Hisilicon SoC Family"
        select ARM_TIMER_SP804
 -      select HISILICON_IRQ_MBIGEN
 +      select HISILICON_IRQ_MBIGEN if PCI
 +      select PINCTRL
        help
          This enables support for Hisilicon ARMv8 SoC family
  
@@@ -214,6 -204,11 +214,11 @@@ config ARCH_XGEN
        help
          This enables support for AppliedMicro X-Gene SOC Family
  
+ config ARCH_ZX
+       bool "ZTE ZX SoC Family"
+       help
+         This enables support for ZTE ZX SoC Family
+ 
  config ARCH_ZYNQMP
        bool "Xilinx ZynqMP Family"
        help