diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-02-04 22:13:25 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-02-04 22:13:25 +0100 |
| commit | 39a944cd8b6463d64ca237ffb0b3b0c9f2057d21 (patch) | |
| tree | 2abbf42174b03a4776a6eed9bf15f05f36008d23 /arch/arm | |
| parent | 7321ed736f5c4e7fd1e682c93b73db2967e10ea6 (diff) | |
| parent | d984d1a0abf87d890250dfa633c0ae3c625de9e9 (diff) | |
Merge tag 'imx-defconfig-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig
i.MX defconfig change for 5.12:
- Enable WM8962 support needed by imx8mn-beacon-kit.
- Enable PF8x00 support used by Boundary Nitrogen8M Mini SBC.
- Enable a few drivers for Librem 5 devkit support.
- Enable interconnect support for i.MX8MQ.
- Enable Broadcom BCM54140 PHY driver for Kontron K-Box A-230-LS.
- Enable RV3028 I2C RTC and PCA9532 driver support for phyBOARD-Pollux
i.MX8MP.
- Enable RN5T618 PMIC driver support in imx_v6_v7_defconfig.
* tag 'imx-defconfig-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
arm64: defconfig: Enable PF8x00 as builtin
arm64: defconfig: Enable vibra-pwm
arm64: defconfig: Enable Broadcom BCM54140 PHY
arm64: defconfig: Enable interconnect for imx8mq
arm64: defconfig: Enable PCA9532 support
arm64: defconfig: Enable rv3028 i2c rtc driver
arm64: defconfig: Enable Librem 5 devkit components
ARM: imx_v6_v7_defconfig: enable power driver of RN5T618 PMIC family
arm64: defconfig: Enable WM8962
Link: https://lore.kernel.org/r/20210204120150.26186-6-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 221f5c340c86..70928cc48939 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -222,6 +222,7 @@ CONFIG_POWER_RESET=y CONFIG_POWER_RESET_SYSCON=y CONFIG_POWER_RESET_SYSCON_POWEROFF=y CONFIG_POWER_SUPPLY=y +CONFIG_RN5T618_POWER=m CONFIG_SENSORS_MC13783_ADC=y CONFIG_SENSORS_GPIO_FAN=y CONFIG_SENSORS_IIO_HWMON=y |