Commit d04e1ac4 authored Apr 28, 2019 by Olof Johansson

Merge tag 'amlogic-defconfig' of...

Merge tag 'amlogic-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/defconfig

ARM: defconfig: Amlogic updates for v5.2
- multi_v7_defconfig: enable the Amlogic Meson ADC and eFuse drivers

* tag 'amlogic-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic

:
  ARM: multi_v7_defconfig: enable the Amlogic Meson ADC and eFuse drivers

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

parents 79a3aaa7 029da5e5

arch/arm/configs/multi_v7_defconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -925,6 +925,7 @@ CONFIG_AT91_SAMA5D2_ADC=m
		CONFIG_BERLIN2_ADC=m
		CONFIG_CPCAP_ADC=m
		CONFIG_EXYNOS_ADC=m
		CONFIG_MESON_SARADC=m
		CONFIG_STM32_ADC_CORE=m
		CONFIG_STM32_ADC=m
		CONFIG_STM32_DFSDM_ADC=m
		@@ -979,6 +980,7 @@ CONFIG_PHY_UNIPHIER_USB2=y
		CONFIG_OMAP_USB2=y
		CONFIG_TI_PIPE3=y
		CONFIG_TWL4030_USB=m
		CONFIG_MESON_MX_EFUSE=m
		CONFIG_NVMEM_IMX_OCOTP=y
		CONFIG_NVMEM_SUNXI_SID=y
		CONFIG_NVMEM_VF610_OCOTP=y