From: Olof Johansson <olof@lixom.net>
Date: Thu, 27 Jun 2019 02:11:32 +0000 (-0700)
Subject: Merge tag 'imx-defconfig-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawng... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=01453179b8c1b85b473ecb9ecc2fba3e92d0f8b5;p=linux.git

Merge tag 'imx-defconfig-5.3' of git://git./linux/kernel/git/shawnguo/linux into arm/defconfig

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>
---

01453179b8c1b85b473ecb9ecc2fba3e92d0f8b5
diff --cc arch/arm64/configs/defconfig
index 6d5cd7834481f,d80f06836de94..1469523dfa59e
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -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
@@@ -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