diff options
author | Arnd Bergmann <arnd@arndb.de> | 2020-11-27 19:51:22 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2020-11-27 19:51:22 +0300 |
commit | 44000366eb0479753ff609fe1c36a75d91b596a6 (patch) | |
tree | f3d61e581cbc765d1e276fc712378506595effc0 /arch/arm/configs | |
parent | 8195fceca0316c36c87db25750a5c5db84ded4e7 (diff) | |
parent | eaf7697b6febe2b086503f525f070d8e3ca1ea0f (diff) | |
download | linux-44000366eb0479753ff609fe1c36a75d91b596a6.tar.xz |
Merge tag 'omap-for-v5.11/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/defconfig
Defconfig changes for omaps for v5.11 merge window
- Enable thermal support for omap3 now that the driver changes have
been merged
- Enable magnetometer and accelerometer support as loadable modules
for Motorola mapphone devices
- Enable eQEP counter for beaglebone blue as loadable modules
* tag 'omap-for-v5.11/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: omap2plus_defconfig: Enable TI eQEP counter driver
ARM: omap2plus_defconfig: add CONFIG_AK8975=m and CONFIG_KXCJK1013=m
ARM: omap2plus_defconfig: Enable OMAP3_THERMAL
Link: https://lore.kernel.org/r/pull-1606462656-588116@atomide.com-3
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 34793aabdb65..77716f500813 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -314,6 +314,7 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_CPU_THERMAL=y CONFIG_TI_THERMAL=y +CONFIG_OMAP3_THERMAL=y CONFIG_OMAP4_THERMAL=y CONFIG_OMAP5_THERMAL=y CONFIG_DRA752_THERMAL=y @@ -524,6 +525,8 @@ CONFIG_TI_AM335X_ADC=m CONFIG_TWL4030_MADC=m CONFIG_SENSORS_ISL29028=m CONFIG_BMP280=m +CONFIG_KXCJK1013=m +CONFIG_AK8975=m CONFIG_PWM=y CONFIG_PWM_OMAP_DMTIMER=m CONFIG_PWM_TIECAP=m @@ -536,6 +539,8 @@ CONFIG_PHY_DM816X_USB=m CONFIG_OMAP_USB2=m CONFIG_TI_PIPE3=y CONFIG_TWL4030_USB=m +CONFIG_COUNTER=m +CONFIG_TI_EQEP=m CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_EXT4_FS_SECURITY=y |