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

Pull 64-bit ARM SoC updates from Olof Johansson:
 "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.

  Added platforms for this release are:

   - Broadcom BCM2837
   - Renesas R8A7796"

* tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (22 commits)
  arm64: remove duplicate PWM entry in defconfig
  arm64: Update default configuration
  arm64: defconfig: Enable more IP blocks for Exynos7 and Exynos5433
  arm64: amlogic: select gxbb clk driver
  arm64: defconfig: Enable S2MPS11 clock and S3C RTC driver
  arm64: marvell: enable Armada 3700 clock drivers
  arm64: defconfig: enable msm8996 pinctrl support
  arm64: defconfig: Enable qcom msm8996 clk drivers
  arm: defconfig: Enable PM8941 pwr key
  arm64: defconfig: enable stmmac and realtek PHY as modules
  arm64: Kconfig: select PM{,_GENERIC_DOMAINS} for ARCH_VEXPRESS
  arm64: defconfig: enable SENSORS_ARM_SCPI
  arm64: defconfig: enable Generic on-chip SRAM driver
  arm64: configs: enable PCIe driver for Armada 7K/8K
  arm64: Add platform selection for BCM2835.
  arm64: defconfig: disable plain NEON implementation of AES
  arm64: Allow for different DMA and CPU bus offsets
  arm64: defconfig: enable Renesas R8A7796 SoC
  arm64: defconfig: Enable Cadence MACB/GEM support
  ARM64: Kconfig: Select the Amlogic Meson pin controller driver
  ...

diff --combined arch/arm64/configs/defconfig
index 4ed4756dfa971b0fca6191e9ac690f43a4b82502,d3aa857f2dac103da62dc27ad3847106e778d21a..0555b7caaf2c2960a1e4f02eca120ddd5d3d01b1
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -45,6 -45,7 +45,7 @@@ CONFIG_ARCH_ROCKCHIP=
  CONFIG_ARCH_SEATTLE=y
  CONFIG_ARCH_RENESAS=y
  CONFIG_ARCH_R8A7795=y
+ CONFIG_ARCH_R8A7796=y
  CONFIG_ARCH_STRATIX10=y
  CONFIG_ARCH_TEGRA=y
  CONFIG_ARCH_SPRD=y
@@@ -63,6 -64,7 +64,7 @@@ CONFIG_PCI_XGENE=
  CONFIG_PCI_LAYERSCAPE=y
  CONFIG_PCI_HISI=y
  CONFIG_PCIE_QCOM=y
+ CONFIG_PCIE_ARMADA_8K=y
  CONFIG_ARM64_VA_BITS_48=y
  CONFIG_SCHED_MC=y
  CONFIG_PREEMPT=y
@@@ -70,7 -72,6 +72,7 @@@ CONFIG_KSM=
  CONFIG_TRANSPARENT_HUGEPAGE=y
  CONFIG_CMA=y
  CONFIG_XEN=y
 +CONFIG_KEXEC=y
  # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
  CONFIG_COMPAT=y
  CONFIG_CPU_IDLE=y
@@@ -102,6 -103,7 +104,7 @@@ CONFIG_MTD_M25P80=
  CONFIG_MTD_SPI_NOR=y
  CONFIG_BLK_DEV_LOOP=y
  CONFIG_VIRTIO_BLK=y
+ CONFIG_SRAM=y
  # CONFIG_SCSI_PROC_FS is not set
  CONFIG_BLK_DEV_SD=y
  # CONFIG_SCSI_LOWLEVEL is not set
@@@ -121,6 -123,7 +124,7 @@@ CONFIG_TUN=
  CONFIG_VIRTIO_NET=y
  CONFIG_AMD_XGBE=y
  CONFIG_NET_XGENE=y
+ CONFIG_MACB=y
  CONFIG_E1000E=y
  CONFIG_IGB=y
  CONFIG_IGBVF=y
@@@ -128,6 -131,8 +132,8 @@@ CONFIG_SKY2=
  CONFIG_RAVB=y
  CONFIG_SMC91X=y
  CONFIG_SMSC911X=y
+ CONFIG_STMMAC_ETH=m
+ CONFIG_REALTEK_PHY=m
  CONFIG_MICREL_PHY=y
  CONFIG_USB_PEGASUS=m
  CONFIG_USB_RTL8150=m
@@@ -143,6 -148,8 +149,8 @@@ CONFIG_WL18XX=
  CONFIG_WLCORE_SDIO=m
  CONFIG_INPUT_EVDEV=y
  CONFIG_KEYBOARD_GPIO=y
+ CONFIG_INPUT_MISC=y
+ CONFIG_INPUT_PM8941_PWRKEY=y
  # CONFIG_SERIO_SERPORT is not set
  CONFIG_SERIO_AMBAKMI=y
  CONFIG_LEGACY_PTY_COUNT=16
@@@ -179,41 -186,62 +187,62 @@@ CONFIG_I2C_QUP=
  CONFIG_I2C_TEGRA=y
  CONFIG_I2C_UNIPHIER_F=y
  CONFIG_I2C_RCAR=y
+ CONFIG_I2C_CROS_EC_TUNNEL=y
  CONFIG_SPI=y
  CONFIG_SPI_ORION=y
  CONFIG_SPI_PL022=y
  CONFIG_SPI_QUP=y
  CONFIG_SPI_SPIDEV=m
+ CONFIG_SPI_S3C64XX=y
  CONFIG_SPMI=y
  CONFIG_PINCTRL_SINGLE=y
+ CONFIG_PINCTRL_MAX77620=y
  CONFIG_PINCTRL_MSM8916=y
+ CONFIG_PINCTRL_MSM8996=y
  CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
  CONFIG_GPIO_SYSFS=y
  CONFIG_GPIO_DWAPB=y
  CONFIG_GPIO_PL061=y
  CONFIG_GPIO_RCAR=y
  CONFIG_GPIO_XGENE=y
+ CONFIG_GPIO_PCA953X=y
+ CONFIG_GPIO_PCA953X_IRQ=y
+ CONFIG_GPIO_MAX77620=y
  CONFIG_POWER_RESET_MSM=y
+ CONFIG_BATTERY_BQ27XXX=y
  CONFIG_POWER_RESET_XGENE=y
  CONFIG_POWER_RESET_SYSCON=y
  CONFIG_SENSORS_LM90=m
  CONFIG_SENSORS_INA2XX=m
+ CONFIG_SENSORS_ARM_SCPI=y
  CONFIG_THERMAL=y
  CONFIG_THERMAL_EMULATION=y
  CONFIG_EXYNOS_THERMAL=y
  CONFIG_WATCHDOG=y
  CONFIG_RENESAS_WDT=y
+ CONFIG_S3C2410_WATCHDOG=y
+ CONFIG_MFD_MAX77620=y
  CONFIG_MFD_SPMI_PMIC=y
  CONFIG_MFD_SEC_CORE=y
  CONFIG_MFD_HI655X_PMIC=y
  CONFIG_REGULATOR=y
+ CONFIG_MFD_CROS_EC=y
+ CONFIG_MFD_CROS_EC_I2C=y
  CONFIG_REGULATOR_FIXED_VOLTAGE=y
  CONFIG_REGULATOR_HI655X=y
+ CONFIG_REGULATOR_MAX77620=y
+ CONFIG_REGULATOR_PWM=y
  CONFIG_REGULATOR_QCOM_SMD_RPM=y
  CONFIG_REGULATOR_QCOM_SPMI=y
  CONFIG_REGULATOR_S2MPS11=y
+ CONFIG_DRM=m
+ CONFIG_DRM_NOUVEAU=m
+ CONFIG_DRM_TEGRA=m
+ CONFIG_DRM_PANEL_SIMPLE=m
  CONFIG_FB=y
  CONFIG_FB_ARMCLCD=y
+ CONFIG_BACKLIGHT_GENERIC=m
+ CONFIG_BACKLIGHT_LP855X=m
  CONFIG_FRAMEBUFFER_CONSOLE=y
  CONFIG_LOGO=y
  # CONFIG_LOGO_LINUX_MONO is not set
@@@ -222,18 -250,23 +251,23 @@@ CONFIG_SOUND=
  CONFIG_SND=y
  CONFIG_SND_SOC=y
  CONFIG_SND_SOC_RCAR=y
+ CONFIG_SND_SOC_SAMSUNG=y
  CONFIG_SND_SOC_AK4613=y
  CONFIG_USB=y
  CONFIG_USB_OTG=y
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_RCAR=y
+ CONFIG_USB_EHCI_EXYNOS=y
+ CONFIG_USB_XHCI_TEGRA=y
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_EHCI_MSM=y
  CONFIG_USB_EHCI_HCD_PLATFORM=y
+ CONFIG_USB_OHCI_EXYNOS=y
  CONFIG_USB_OHCI_HCD=y
  CONFIG_USB_OHCI_HCD_PLATFORM=y
  CONFIG_USB_STORAGE=y
  CONFIG_USB_DWC2=y
+ CONFIG_USB_DWC3=y
  CONFIG_USB_CHIPIDEA=y
  CONFIG_USB_CHIPIDEA_UDC=y
  CONFIG_USB_CHIPIDEA_HOST=y
@@@ -263,12 -296,15 +297,15 @@@ CONFIG_LEDS_TRIGGERS=
  CONFIG_LEDS_TRIGGER_HEARTBEAT=y
  CONFIG_LEDS_TRIGGER_CPU=y
  CONFIG_RTC_CLASS=y
+ CONFIG_RTC_DRV_MAX77686=y
  CONFIG_RTC_DRV_S5M=y
  CONFIG_RTC_DRV_DS3232=y
  CONFIG_RTC_DRV_EFI=y
  CONFIG_RTC_DRV_PL031=y
  CONFIG_RTC_DRV_SUN6I=y
+ CONFIG_RTC_DRV_TEGRA=y
  CONFIG_RTC_DRV_XGENE=y
+ CONFIG_RTC_DRV_S3C=y
  CONFIG_DMADEVICES=y
  CONFIG_PL330_DMA=y
  CONFIG_TEGRA20_APB_DMA=y
@@@ -283,9 -319,11 +320,11 @@@ CONFIG_XEN_GNTDEV=
  CONFIG_XEN_GRANT_DEV_ALLOC=y
  CONFIG_COMMON_CLK_SCPI=y
  CONFIG_COMMON_CLK_CS2000_CP=y
+ CONFIG_COMMON_CLK_S2MPS11=y
  CONFIG_CLK_QORIQ=y
  CONFIG_COMMON_CLK_QCOM=y
  CONFIG_MSM_GCC_8916=y
+ CONFIG_MSM_MMCC_8996=y
  CONFIG_HWSPINLOCK_QCOM=y
  CONFIG_MAILBOX=y
  CONFIG_ARM_MHU=y
@@@ -297,12 -335,18 +336,18 @@@ CONFIG_QCOM_SMD_RPM=
  CONFIG_ARCH_TEGRA_132_SOC=y
  CONFIG_ARCH_TEGRA_210_SOC=y
  CONFIG_EXTCON_USB_GPIO=y
+ CONFIG_PWM=y
+ CONFIG_PWM_TEGRA=m
  CONFIG_COMMON_RESET_HI6220=y
  CONFIG_PHY_RCAR_GEN3_USB2=y
  CONFIG_PHY_HI6220_USB=y
  CONFIG_PHY_XGENE=y
+ CONFIG_PHY_TEGRA_XUSB=y
  CONFIG_ARM_SCPI_PROTOCOL=y
  CONFIG_ACPI=y
+ CONFIG_IIO=y
+ CONFIG_EXYNOS_ADC=y
+ CONFIG_PWM_SAMSUNG=y
  CONFIG_EXT2_FS=y
  CONFIG_EXT3_FS=y
  CONFIG_FANOTIFY=y
@@@ -319,6 -363,8 +364,8 @@@ CONFIG_EFIVAR_FS=
  CONFIG_SQUASHFS=y
  CONFIG_NFS_FS=y
  CONFIG_NFS_V4=y
+ CONFIG_NFS_V4_1=y
+ CONFIG_NFS_V4_2=y
  CONFIG_ROOT_NFS=y
  CONFIG_9P_FS=y
  CONFIG_NLS_CODEPAGE_437=y
@@@ -344,5 -390,5 +391,5 @@@ CONFIG_CRYPTO_SHA2_ARM64_CE=
  CONFIG_CRYPTO_GHASH_ARM64_CE=y
  CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
  CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
- CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+ # CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
  CONFIG_CRYPTO_CRC32_ARM64=y