Merge tag 'imx-defconfig-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawng...

i.MX defconfig changes for 5.3:
 * imx_v6_v7_defconfig:
   - PCF857X GPIO expander
   - SIOX bus driver
   - thermal statistics
   - TPM PWM driver
   - OV2680 camera driver
   - SNVS LPGPR NVMEM driver
   - i.MX DT based cpufreq driver
 * arm64 defconfig built-in:
   - i.MX8MM pinctrl and clock
   - i.MX LPI2C driver
   - ROHM_BD718XX PMIC
   - OCOTP NVMEM support
   - i.MX SCU based SoC bus driver
 * arm64 defconfig modules:
   - i.MX SPI driver
   - i.MX system controller watchdog
   - SNVS RTC driver
   - ISL29018 light and proximity sensor driver
   - MPL3115 pressure sensor driver
   - i.MX8 DT based cpufreq support
   - QorIQ Thermal Monitoring Unit driver
   - SNVS power key driver

* tag 'imx-defconfig-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: defconfig: Enable CONFIG_KEYBOARD_SNVS_PWRKEY as module
  ARM: imx_v6_v7_defconfig: Enable CONFIG_ARM_IMX_CPUFREQ_DT
  defconfig: arm64: enable i.MX8 SCU octop driver
  arm64: defconfig: Add i.MX SCU SoC info driver
  arm64: defconfig: Enable CONFIG_QORIQ_THERMAL
  ARM: imx_v6_v7_defconfig: Select CONFIG_NVMEM_SNVS_LPGPR
  arm64: defconfig: ARM_IMX_CPUFREQ_DT=m
  ARM: imx_v6_v7_defconfig: Add TPM PWM support by default
  ARM: imx_v6_v7_defconfig: Enable the OV2680 camera driver
  ARM: imx_v6_v7_defconfig: Enable CONFIG_THERMAL_STATISTICS
  arm64: defconfig: NVMEM_IMX_OCOTP=y for imx8m
  arm64: defconfig: Enable ROHM_BD718XX PMIC for imx8mm-evk
  arm64: defconfig: Enable lpi2c for imx8qxp and sensors
  arm64: defconfig: Enable imx8mm clk/pinctrl
  arm64: defconfig: Enable RTC_DRV_SNVS
  arm64: defconfig: add support for i.MX system controller watchdog
  ARM: imx_v6_v7_defconfig: Enable SIOX bus
  ARM: imx_v6_v7_defconfig: Add GPIO_PCF857X
  arm64: defconfig: Enable CONFIG_SPI_IMX

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm64/configs/defconfig
index 6d5cd78,d80f068..1469523
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -82,6 -82,7 +82,7 @@@ CONFIG_CPUFREQ_DT=
  CONFIG_ACPI_CPPC_CPUFREQ=m
  CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
  CONFIG_ARM_SCPI_CPUFREQ=y
+ CONFIG_ARM_IMX_CPUFREQ_DT=m
  CONFIG_ARM_TEGRA186_CPUFREQ=y
  CONFIG_ARM_SCPI_PROTOCOL=y
  CONFIG_RASPBERRYPI_FIRMWARE=y
@@@ -191,7 -192,7 +192,7 @@@ CONFIG_PCIE_QCOM=
  CONFIG_PCIE_ARMADA_8K=y
  CONFIG_PCIE_KIRIN=y
  CONFIG_PCIE_HISI_STB=y
 -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 +CONFIG_PCIE_TEGRA194=m
  CONFIG_DEVTMPFS=y
  CONFIG_DEVTMPFS_MOUNT=y
  CONFIG_HISILICON_LPC=y
@@@ -215,7 -216,6 +216,7 @@@ CONFIG_BLK_DEV_SD=
  CONFIG_SCSI_SAS_ATA=y
  CONFIG_SCSI_HISI_SAS=y
  CONFIG_SCSI_HISI_SAS_PCI=y
 +CONFIG_SCSI_MPT3SAS=m
  CONFIG_SCSI_UFSHCD=y
  CONFIG_SCSI_UFSHCD_PLATFORM=y
  CONFIG_SCSI_UFS_QCOM=m
@@@ -231,11 -231,6 +232,11 @@@ CONFIG_SATA_SIL24=
  CONFIG_SATA_RCAR=y
  CONFIG_PATA_PLATFORM=y
  CONFIG_PATA_OF_PLATFORM=y
 +CONFIG_MD=y
 +CONFIG_BLK_DEV_MD=m
 +CONFIG_BLK_DEV_DM=m
 +CONFIG_DM_MIRROR=m
 +CONFIG_DM_ZERO=m
  CONFIG_NETDEVICES=y
  CONFIG_MACVLAN=m
  CONFIG_MACVTAP=m
@@@ -245,7 -240,6 +246,7 @@@ CONFIG_VIRTIO_NET=
  CONFIG_AMD_XGBE=y
  CONFIG_NET_XGENE=y
  CONFIG_ATL1C=m
 +CONFIG_BNX2X=m
  CONFIG_MACB=y
  CONFIG_THUNDER_NIC_PF=y
  CONFIG_FEC=y
@@@ -258,15 -252,6 +259,15 @@@ CONFIG_HNS3_ENET=
  CONFIG_E1000E=y
  CONFIG_IGB=y
  CONFIG_IGBVF=y
 +CONFIG_MLX4_EN=m
 +CONFIG_MLX4_CORE=m
 +CONFIG_MLX4_DEBUG=y
 +CONFIG_MLX4_CORE_GEN2=y
 +CONFIG_MLX5_CORE=m
 +CONFIG_MLX5_CORE_EN=y
 +CONFIG_MLX5_EN_ARFS=y
 +CONFIG_MLX5_EN_RXNFC=y
 +CONFIG_MLX5_MPFS=y
  CONFIG_MVNETA=y
  CONFIG_MVPP2=y
  CONFIG_SKY2=y
@@@ -306,6 -291,7 +307,7 @@@ CONFIG_WLCORE_SDIO=
  CONFIG_INPUT_EVDEV=y
  CONFIG_KEYBOARD_ADC=m
  CONFIG_KEYBOARD_GPIO=y
+ CONFIG_KEYBOARD_SNVS_PWRKEY=m
  CONFIG_KEYBOARD_CROS_EC=y
  CONFIG_INPUT_TOUCHSCREEN=y
  CONFIG_TOUCHSCREEN_ATMEL_MXT=m
@@@ -359,6 -345,7 +361,7 @@@ CONFIG_I2C_BCM2835=
  CONFIG_I2C_DESIGNWARE_PLATFORM=y
  CONFIG_I2C_GPIO=m
  CONFIG_I2C_IMX=y
+ CONFIG_I2C_IMX_LPI2C=y
  CONFIG_I2C_MESON=y
  CONFIG_I2C_MV64XXX=y
  CONFIG_I2C_PXA=y
@@@ -374,6 -361,7 +377,7 @@@ CONFIG_SPI_ARMADA_3700=
  CONFIG_SPI_BCM2835=m
  CONFIG_SPI_BCM2835AUX=m
  CONFIG_SPI_NXP_FLEXSPI=y
+ CONFIG_SPI_IMX=m
  CONFIG_SPI_MESON_SPICC=m
  CONFIG_SPI_MESON_SPIFC=m
  CONFIG_SPI_ORION=y
@@@ -386,6 -374,7 +390,7 @@@ CONFIG_SPI_SUN6I=
  CONFIG_SPMI=y
  CONFIG_PINCTRL_SINGLE=y
  CONFIG_PINCTRL_MAX77620=y
+ CONFIG_PINCTRL_IMX8MM=y
  CONFIG_PINCTRL_IMX8MQ=y
  CONFIG_PINCTRL_IMX8QXP=y
  CONFIG_PINCTRL_IPQ8074=y
@@@ -404,6 -393,7 +409,7 @@@ CONFIG_GPIO_RCAR=
  CONFIG_GPIO_UNIPHIER=y
  CONFIG_GPIO_XGENE=y
  CONFIG_GPIO_XGENE_SB=y
+ CONFIG_GPIO_MAX732X=y
  CONFIG_GPIO_PCA953X=y
  CONFIG_GPIO_PCA953X_IRQ=y
  CONFIG_GPIO_MAX77620=y
@@@ -420,10 -410,10 +426,11 @@@ CONFIG_SENSORS_LM90=
  CONFIG_SENSORS_PWM_FAN=m
  CONFIG_SENSORS_RASPBERRYPI_HWMON=m
  CONFIG_SENSORS_INA2XX=m
 +CONFIG_SENSORS_INA3221=m
  CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
  CONFIG_CPU_THERMAL=y
  CONFIG_THERMAL_EMULATION=y
+ CONFIG_QORIQ_THERMAL=m
  CONFIG_ROCKCHIP_THERMAL=m
  CONFIG_RCAR_THERMAL=y
  CONFIG_RCAR_GEN3_THERMAL=y
@@@ -437,8 -427,8 +444,9 @@@ CONFIG_UNIPHIER_THERMAL=
  CONFIG_WATCHDOG=y
  CONFIG_ARM_SP805_WATCHDOG=y
  CONFIG_S3C2410_WATCHDOG=y
 +CONFIG_SUNXI_WATCHDOG=m
  CONFIG_IMX2_WDT=y
+ CONFIG_IMX_SC_WDT=m
  CONFIG_MESON_GXBB_WATCHDOG=m
  CONFIG_MESON_WATCHDOG=m
  CONFIG_RENESAS_WDT=y
@@@ -457,8 -447,10 +465,10 @@@ CONFIG_MFD_MAX77620=
  CONFIG_MFD_SPMI_PMIC=y
  CONFIG_MFD_RK808=y
  CONFIG_MFD_SEC_CORE=y
+ CONFIG_MFD_ROHM_BD718XX=y
  CONFIG_REGULATOR_FIXED_VOLTAGE=y
  CONFIG_REGULATOR_AXP20X=y
+ CONFIG_REGULATOR_BD718XX=y
  CONFIG_REGULATOR_BD9571MWV=y
  CONFIG_REGULATOR_FAN53555=y
  CONFIG_REGULATOR_GPIO=y
@@@ -496,7 -488,6 +506,7 @@@ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=
  CONFIG_VIDEO_RENESAS_FCP=m
  CONFIG_VIDEO_RENESAS_VSP1=m
  CONFIG_DRM=m
 +CONFIG_DRM_I2C_NXP_TDA998X=m
  CONFIG_DRM_NOUVEAU=m
  CONFIG_DRM_EXYNOS=m
  CONFIG_DRM_EXYNOS5433_DECON=y
@@@ -524,8 -515,6 +534,8 @@@ CONFIG_DRM_HISI_HIBMC=
  CONFIG_DRM_HISI_KIRIN=m
  CONFIG_DRM_MESON=m
  CONFIG_DRM_PL111=m
 +CONFIG_DRM_LIMA=m
 +CONFIG_DRM_PANFROST=m
  CONFIG_FB=y
  CONFIG_FB_MODE_HELPERS=y
  CONFIG_BACKLIGHT_GENERIC=m
@@@ -581,8 -570,6 +591,8 @@@ CONFIG_USB_ULPI=
  CONFIG_USB_GADGET=y
  CONFIG_USB_RENESAS_USBHS_UDC=m
  CONFIG_USB_RENESAS_USB3=m
 +CONFIG_TYPEC=m
 +CONFIG_TYPEC_HD3SS3220=m
  CONFIG_MMC=y
  CONFIG_MMC_BLOCK_MINORS=32
  CONFIG_MMC_ARMMMCI=y
@@@ -633,11 -620,11 +643,12 @@@ CONFIG_RTC_DRV_PL031=
  CONFIG_RTC_DRV_SUN6I=y
  CONFIG_RTC_DRV_ARMADA38X=y
  CONFIG_RTC_DRV_TEGRA=y
+ CONFIG_RTC_DRV_SNVS=m
  CONFIG_RTC_DRV_IMX_SC=m
  CONFIG_RTC_DRV_XGENE=y
  CONFIG_DMADEVICES=y
  CONFIG_DMA_BCM2835=m
 +CONFIG_DMA_SUN6I=m
  CONFIG_K3_DMA=y
  CONFIG_MV_XOR=y
  CONFIG_MV_XOR_V2=y
@@@ -663,6 -650,7 +674,7 @@@ CONFIG_COMMON_CLK_CS2000_CP=
  CONFIG_COMMON_CLK_S2MPS11=y
  CONFIG_CLK_QORIQ=y
  CONFIG_COMMON_CLK_PWM=y
+ CONFIG_CLK_IMX8MM=y
  CONFIG_CLK_IMX8MQ=y
  CONFIG_CLK_IMX8QXP=y
  CONFIG_TI_SCI_CLK=y
@@@ -697,6 -685,7 +709,7 @@@ CONFIG_RPMSG_QCOM_GLINK_RPM=
  CONFIG_RPMSG_QCOM_GLINK_SMEM=m
  CONFIG_RPMSG_QCOM_SMD=y
  CONFIG_RASPBERRYPI_POWER=y
+ CONFIG_IMX_SCU_SOC=y
  CONFIG_QCOM_COMMAND_DB=y
  CONFIG_QCOM_GENI_SE=y
  CONFIG_QCOM_GLINK_SSR=m
@@@ -732,7 -721,9 +745,9 @@@ CONFIG_ROCKCHIP_SARADC=
  CONFIG_IIO_CROS_EC_SENSORS_CORE=m
  CONFIG_IIO_CROS_EC_SENSORS=m
  CONFIG_IIO_CROS_EC_LIGHT_PROX=m
+ CONFIG_SENSORS_ISL29018=m
  CONFIG_IIO_CROS_EC_BARO=m
+ CONFIG_MPL3115=m
  CONFIG_PWM=y
  CONFIG_PWM_BCM2835=m
  CONFIG_PWM_CROS_EC=m
@@@ -765,7 -756,8 +780,9 @@@ CONFIG_PHY_TEGRA_XUSB=
  CONFIG_HISI_PMU=y
  CONFIG_QCOM_L2_PMU=y
  CONFIG_QCOM_L3_PMU=y
 +CONFIG_NVMEM_SUNXI_SID=y
+ CONFIG_NVMEM_IMX_OCOTP=y
+ CONFIG_NVMEM_IMX_OCOTP_SCU=y
  CONFIG_QCOM_QFPROM=y
  CONFIG_ROCKCHIP_EFUSE=y
  CONFIG_UNIPHIER_EFUSE=y