Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...

ARM: multi_v7_defconfig: amlogic updtes for v5.12
- enable support for the ADC thermal sensor as module

* tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: multi_v7_defconfig: Enable support for the ADC thermal sensor

Link: https://lore.kernel.org/r/7hsg6d2bxg.fsf@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --combined arch/arm/configs/multi_v7_defconfig
index ec1d9f0,0a55240..3823da6
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -6,7 -6,6 +6,7 @@@ CONFIG_BLK_DEV_INITRD=
  CONFIG_EMBEDDED=y
  CONFIG_PERF_EVENTS=y
  CONFIG_ARCH_VIRT=y
 +CONFIG_ARCH_ACTIONS=y
  CONFIG_ARCH_ALPINE=y
  CONFIG_ARCH_ARTPEC=y
  CONFIG_MACH_ARTPEC6=y
@@@ -224,6 -223,7 +224,6 @@@ CONFIG_BLK_DEV_RAM_SIZE=6553
  CONFIG_VIRTIO_BLK=y
  CONFIG_AD525X_DPOT=y
  CONFIG_AD525X_DPOT_I2C=y
 -CONFIG_ATMEL_TCLIB=y
  CONFIG_ICS932S401=y
  CONFIG_ATMEL_SSC=m
  CONFIG_QCOM_COINCELL=m
@@@ -377,8 -377,6 +377,8 @@@ CONFIG_SERIAL_ST_ASC=
  CONFIG_SERIAL_ST_ASC_CONSOLE=y
  CONFIG_SERIAL_STM32=y
  CONFIG_SERIAL_STM32_CONSOLE=y
 +CONFIG_SERIAL_OWL=y
 +CONFIG_SERIAL_OWL_CONSOLE=y
  CONFIG_SERIAL_DEV_BUS=y
  CONFIG_VIRTIO_CONSOLE=y
  CONFIG_ASPEED_KCS_IPMI_BMC=m
@@@ -403,7 -401,6 +403,7 @@@ CONFIG_I2C_EMEV2=
  CONFIG_I2C_IMX=y
  CONFIG_I2C_MESON=y
  CONFIG_I2C_MV64XXX=y
 +CONFIG_I2C_OWL=y
  CONFIG_I2C_RIIC=y
  CONFIG_I2C_RK3X=y
  CONFIG_I2C_S3C2410=y
@@@ -452,8 -449,6 +452,8 @@@ CONFIG_PINCTRL_AS3722=
  CONFIG_PINCTRL_RZA2=y
  CONFIG_PINCTRL_STMFX=y
  CONFIG_PINCTRL_PALMAS=y
 +CONFIG_PINCTRL_OWL=y
 +CONFIG_PINCTRL_S500=y
  CONFIG_PINCTRL_APQ8064=y
  CONFIG_PINCTRL_APQ8084=y
  CONFIG_PINCTRL_IPQ8064=y
@@@ -520,8 -515,8 +520,9 @@@ CONFIG_ARMADA_THERMAL=
  CONFIG_BCM2711_THERMAL=m
  CONFIG_BCM2835_THERMAL=m
  CONFIG_BRCMSTB_THERMAL=m
+ CONFIG_GENERIC_ADC_THERMAL=m
  CONFIG_ST_THERMAL_MEMMAP=y
 +CONFIG_TEGRA_SOCTHERM=m
  CONFIG_UNIPHIER_THERMAL=y
  CONFIG_DA9063_WATCHDOG=m
  CONFIG_XILINX_WATCHDOG=y
@@@ -662,7 -657,6 +663,7 @@@ CONFIG_V4L_TEST_DRIVERS=
  CONFIG_VIDEO_VIVID=m
  CONFIG_CEC_PLATFORM_DRIVERS=y
  CONFIG_CEC_SAMSUNG_S5P=m
 +CONFIG_CEC_STM32=m
  CONFIG_VIDEO_ADV7180=m
  CONFIG_VIDEO_ADV7604=m
  CONFIG_VIDEO_ADV7604_CEC=y
@@@ -885,7 -879,6 +886,7 @@@ CONFIG_MMC_SH_MMCIF=
  CONFIG_MMC_SUNXI=y
  CONFIG_MMC_BCM2835=y
  CONFIG_MMC_SDHCI_OMAP=y
 +CONFIG_MMC_OWL=y
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
  CONFIG_LEDS_CLASS_FLASH=m
@@@ -955,7 -948,6 +956,7 @@@ CONFIG_IMX_DMA=
  CONFIG_IMX_SDMA=y
  CONFIG_MV_XOR=y
  CONFIG_MXS_DMA=y
 +CONFIG_OWL_DMA=y
  CONFIG_PL330_DMA=y
  CONFIG_SIRF_DMA=y
  CONFIG_STE_DMA40=y
@@@ -986,8 -978,6 +987,8 @@@ CONFIG_COMMON_CLK_MAX77686=
  CONFIG_COMMON_CLK_RK808=m
  CONFIG_COMMON_CLK_SCMI=y
  CONFIG_COMMON_CLK_S2MPS11=m
 +CONFIG_CLK_ACTIONS=y
 +CONFIG_CLK_OWL_S500=y
  CONFIG_CLK_RASPBERRYPI=y
  CONFIG_COMMON_CLK_QCOM=y
  CONFIG_QCOM_CLK_RPM=y
@@@ -1118,7 -1108,6 +1119,7 @@@ CONFIG_ROCKCHIP_EFUSE=
  CONFIG_NVMEM_SUNXI_SID=y
  CONFIG_NVMEM_VF610_OCOTP=y
  CONFIG_MESON_MX_EFUSE=m
 +CONFIG_NVMEM_RMEM=m
  CONFIG_FSI=m
  CONFIG_FSI_MASTER_GPIO=m
  CONFIG_FSI_MASTER_HUB=m