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

Pull ARM SoC 64-bit updates from Arnd Bergmann:
 "Changes to platform code for 64-bit ARM platforms.

  Nearly all of these are defconfig updates to enable new drivers or old
  drivers still used on these 64-bit platforms.

  Aside from that, we gain initial support for two set-top-box
  platforms, both of which already have 32-bit support in arch/arm:

   - Broadcom adds abstract support for the bcm7xxx/brcmstb platform,
     presumably the respective dts files and more information will
     follow at a later point.

   - The ZTE ZX296718 SoC for set-top-boxes, a relative of the 32-bit
     ZX296702 SoC that we already support"

* tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arm64: add ZTE ZX SoC family
  arm64: defconfig: enable ZTE ZX related config
  arm64: defconfig: enable common modules for power management
  arm64: defconfig: enable meson I2C
  arm64: defconfig: enable meson SPI as module
  arm64: defconfig: enable meson WDT as modules
  arm64: defconfig: enable HW random as module
  arm64: defconfig: Enable SDHI and GPIO_REGULATOR
  arm64: configs: enable PCIe driver for Aardvark
  Kconfig: ARCH_HISI: Add PINCTRL to HISI platform
  arm64: defconfig: enable bluetooth supports as modules
  arm64: defconfig: enable CONFIG_INPUT_HISI_POWERKEY for HiKey
  arm64: defconfig: Enable HiSilicon kirin drm, adv7533 for HiKey
  arm64: defconfig: Enable Hisi SAS and HNS
  arm64: defconfig: Enable QDF2432 config options
  arm64: sunxi: Kconfig: add essential pinctrl driver
  arm64: defconfig: Add Renesas R-Car HSUSB driver support as module
  arm64: Add Broadcom Set Top Box Kconfig entry point
  arm64: defconfig: enable xhci-platform

diff --combined arch/arm64/Kconfig.platforms
index b6b3657,86e520a..16248af
--- 1/arch/arm64/Kconfig.platforms
--- 2/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@@ -3,6 -3,8 +3,8 @@@ 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.
  
@@@ -15,8 -17,8 +17,8 @@@ config ARCH_ALPIN
  
  config ARCH_BCM2835
        bool "Broadcom BCM2835 family"
 -      select ARCH_REQUIRE_GPIOLIB
        select CLKSRC_OF
 +      select GPIOLIB
        select PINCTRL
        select PINCTRL_BCM2835
        select ARM_AMBA
@@@ -29,19 -31,26 +31,26 @@@
  config ARCH_BCM_IPROC
        bool "Broadcom iProc SoC Family"
        select COMMON_CLK_IPROC
 +      select GPIOLIB
        select PINCTRL
 -      select ARCH_REQUIRE_GPIOLIB
        help
          This enables support for Broadcom iProc based SoCs
  
  config ARCH_BERLIN
        bool "Marvell Berlin SoC Family"
 -      select ARCH_REQUIRE_GPIOLIB
        select DW_APB_ICTL
 +      select GPIOLIB
        select PINCTRL
        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
@@@ -55,7 -64,6 +64,7 @@@
  
  config ARCH_LAYERSCAPE
        bool "ARMv8 based Freescale Layerscape SoC family"
 +      select EDAC_SUPPORT
        help
          This enables support for the Freescale Layerscape SoC family.
  
@@@ -68,6 -76,7 +77,7 @@@ config ARCH_HIS
        bool "Hisilicon SoC Family"
        select ARM_TIMER_SP804
        select HISILICON_IRQ_MBIGEN if PCI
+       select PINCTRL
        help
          This enables support for Hisilicon ARMv8 SoC family
  
@@@ -94,7 -103,6 +104,7 @@@ config ARCH_MVEB
        select ARMADA_CP110_SYSCON
        select ARMADA_37XX_CLK
        select MVEBU_ODMI
 +      select MVEBU_PIC
        help
          This enables support for Marvell EBU familly, including:
           - Armada 3700 SoC Family
@@@ -110,7 -118,7 +120,7 @@@ config ARCH_QCO
  config ARCH_ROCKCHIP
        bool "Rockchip Platforms"
        select ARCH_HAS_RESET_CONTROLLER
 -      select ARCH_REQUIRE_GPIOLIB
 +      select GPIOLIB
        select PINCTRL
        select PINCTRL_ROCKCHIP
        select ROCKCHIP_TIMER
@@@ -156,11 -164,12 +166,11 @@@ config ARCH_STRATIX1
  config ARCH_TEGRA
        bool "NVIDIA Tegra SoC Family"
        select ARCH_HAS_RESET_CONTROLLER
 -      select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
        select CLKSRC_OF
        select GENERIC_CLOCKEVENTS
 -      select HAVE_CLK
 +      select GPIOLIB
        select PINCTRL
        select RESET_CONTROLLER
        help
@@@ -184,8 -193,8 +194,8 @@@ config ARCH_UNIPHIE
  
  config ARCH_VEXPRESS
        bool "ARMv8 software model (Versatile Express)"
 -      select ARCH_REQUIRE_GPIOLIB
        select COMMON_CLK_VERSATILE
 +      select GPIOLIB
        select PM
        select PM_GENERIC_DOMAINS
        select POWER_RESET_VEXPRESS
@@@ -205,6 -214,11 +215,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