Merge tag 'sunxi-config64-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel...

Allwinner arm64 defconfig for 4.21

A bunch of patches to improve the coverage of Allwinner drivers in the
arm64 defconfig, mostly targeted at adding display drivers support.

* tag 'sunxi-config64-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: defconfig: Enable PWM_SUN4I
  arm64: defconfig: Enable DRM_SUN8I_DW_HDMI
  arm64: defconfig: Enable DRM_SUN8I_MIXER
  arm64: defconfig: Enable MFD_AXP20X_I2C

Signed-off-by: Olof Johansson <[email protected]>

diff --combined arch/arm64/configs/defconfig
index f7876df02f15a1cfeddc21bef43b3e63b7fae44d,aca6ebc2813847d7bbec2d54bd99716d8d743cd9..8d175cbb3586a1330c405768e202c3543a1fea5f
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -303,8 -303,6 +303,8 @@@ CONFIG_SERIAL_TEGRA=
  CONFIG_SERIAL_SH_SCI=y
  CONFIG_SERIAL_MSM=y
  CONFIG_SERIAL_MSM_CONSOLE=y
 +CONFIG_SERIAL_QCOM_GENI=y
 +CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
  CONFIG_SERIAL_XILINX_PS_UART=y
  CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
  CONFIG_SERIAL_MVEBU_UART=y
@@@ -350,11 -348,8 +350,11 @@@ CONFIG_PINCTRL_IPQ8074=
  CONFIG_PINCTRL_MSM8916=y
  CONFIG_PINCTRL_MSM8994=y
  CONFIG_PINCTRL_MSM8996=y
 +CONFIG_PINCTRL_MSM8998=y
 +CONFIG_PINCTRL_QCS404=y
  CONFIG_PINCTRL_QDF2XXX=y
  CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 +CONFIG_PINCTRL_SDM845=y
  CONFIG_PINCTRL_MT7622=y
  CONFIG_GPIO_DWAPB=y
  CONFIG_GPIO_MB86S7X=y
@@@ -397,6 -392,7 +397,7 @@@ CONFIG_MESON_WATCHDOG=
  CONFIG_RENESAS_WDT=y
  CONFIG_UNIPHIER_WATCHDOG=y
  CONFIG_BCM2835_WDT=y
+ CONFIG_MFD_AXP20X_I2C=y
  CONFIG_MFD_BD9571MWV=y
  CONFIG_MFD_AXP20X_RSB=y
  CONFIG_MFD_CROS_EC=y
@@@ -419,7 -415,6 +420,7 @@@ CONFIG_REGULATOR_HI6421V530=
  CONFIG_REGULATOR_HI655X=y
  CONFIG_REGULATOR_MAX77620=y
  CONFIG_REGULATOR_PWM=y
 +CONFIG_REGULATOR_QCOM_RPMH=y
  CONFIG_REGULATOR_QCOM_SMD_RPM=y
  CONFIG_REGULATOR_QCOM_SPMI=y
  CONFIG_REGULATOR_RK808=y
@@@ -455,6 -450,8 +456,8 @@@ CONFIG_DRM_EXYNOS_HDMI=
  CONFIG_DRM_EXYNOS_MIC=y
  CONFIG_DRM_ROCKCHIP=m
  CONFIG_DRM_SUN4I=m
+ CONFIG_DRM_SUN8I_MIXER=m
+ CONFIG_DRM_SUN8I_DW_HDMI=m
  CONFIG_ROCKCHIP_ANALOGIX_DP=y
  CONFIG_ROCKCHIP_CDN_DP=y
  CONFIG_ROCKCHIP_DW_HDMI=y
@@@ -602,14 -599,10 +605,14 @@@ CONFIG_COMMON_CLK_PWM=
  CONFIG_TI_SCI_CLK=y
  CONFIG_COMMON_CLK_QCOM=y
  CONFIG_QCOM_CLK_SMD_RPM=y
 +CONFIG_QCOM_CLK_RPMH=y
  CONFIG_IPQ_GCC_8074=y
  CONFIG_MSM_GCC_8916=y
  CONFIG_MSM_GCC_8994=y
  CONFIG_MSM_MMCC_8996=y
 +CONFIG_MSM_GCC_8998=y
 +CONFIG_QCS_GCC_404=y
 +CONFIG_SDM_GCC_845=y
  CONFIG_HWSPINLOCK=y
  CONFIG_HWSPINLOCK_QCOM=y
  CONFIG_ARM_MHU=y
@@@ -622,18 -615,9 +625,18 @@@ CONFIG_TEGRA_IOMMU_SMMU=
  CONFIG_ARM_SMMU=y
  CONFIG_ARM_SMMU_V3=y
  CONFIG_QCOM_IOMMU=y
 +CONFIG_REMOTEPROC=m
 +CONFIG_QCOM_Q6V5_MSS=m
 +CONFIG_QCOM_Q6V5_PAS=m
 +CONFIG_QCOM_SYSMON=m
  CONFIG_RPMSG_QCOM_GLINK_RPM=y
 +CONFIG_RPMSG_QCOM_GLINK_SMEM=m
  CONFIG_RPMSG_QCOM_SMD=y
  CONFIG_RASPBERRYPI_POWER=y
 +CONFIG_QCOM_GLINK_SSR=m
 +CONFIG_QCOM_COMMAND_DB=y
 +CONFIG_QCOM_GENI_SE=y
 +CONFIG_QCOM_RPMH=y
  CONFIG_QCOM_SMEM=y
  CONFIG_QCOM_SMD_RPM=y
  CONFIG_QCOM_SMP2P=y
@@@ -664,6 -648,7 +667,7 @@@ CONFIG_PWM_MESON=
  CONFIG_PWM_RCAR=m
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_PWM_SAMSUNG=y
+ CONFIG_PWM_SUN4I=m
  CONFIG_PWM_TEGRA=m
  CONFIG_RESET_TI_SCI=y
  CONFIG_PHY_XGENE=y