diff options
| author | Olof Johansson <olof@lixom.net> | 2019-04-28 12:13:16 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-04-28 12:13:16 -0700 |
| commit | d04e1ac4284ad23f7bb33507d86ce568be0b54f8 (patch) | |
| tree | c2c38701c94349cc7684f4ba6df03a886016c873 /arch/arm | |
| parent | 79a3aaa7b82e3106be97842dedfd8429248896e6 (diff) | |
| parent | 029da5e5266c113c533abac6f5a7ca5ffef02bf1 (diff) | |
| download | lwn-d04e1ac4284ad23f7bb33507d86ce568be0b54f8.tar.gz lwn-d04e1ac4284ad23f7bb33507d86ce568be0b54f8.zip | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index c75051b9392c..11d0395f3f0c 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -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 |