Commit e17142e0 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'v5.18-next-defconfig' of...

Merge tag 'v5.18-next-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/defconfig

- Enable essential PMIC and regulatro drivers for MT8195.
- Enable Arm arch timer for MT7629.

* tag 'v5.18-next-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  arm: mediatek: select arch timer for mt7629
  arm64: defconfig: enable some mt6360 PMIC drivers
  arm64: defconfig: enable MT6359 regulator driver

Link: https://lore.kernel.org/r/3a6e5606-7b89-2ad8-7b45-21d3a4e9e706@gmail.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a2e8bbe0 d66aea19
...@@ -30,6 +30,7 @@ config MACH_MT7623 ...@@ -30,6 +30,7 @@ config MACH_MT7623
config MACH_MT7629 config MACH_MT7629
bool "MediaTek MT7629 SoCs support" bool "MediaTek MT7629 SoCs support"
default ARCH_MEDIATEK default ARCH_MEDIATEK
select HAVE_ARM_ARCH_TIMER
config MACH_MT8127 config MACH_MT8127
bool "MediaTek MT8127 SoCs support" bool "MediaTek MT8127 SoCs support"
......
...@@ -572,6 +572,7 @@ CONFIG_SYSCON_REBOOT_MODE=y ...@@ -572,6 +572,7 @@ CONFIG_SYSCON_REBOOT_MODE=y
CONFIG_BATTERY_SBS=m CONFIG_BATTERY_SBS=m
CONFIG_BATTERY_BQ27XXX=y CONFIG_BATTERY_BQ27XXX=y
CONFIG_BATTERY_MAX17042=m CONFIG_BATTERY_MAX17042=m
CONFIG_CHARGER_MT6360=m
CONFIG_CHARGER_BQ25890=m CONFIG_CHARGER_BQ25890=m
CONFIG_CHARGER_BQ25980=m CONFIG_CHARGER_BQ25980=m
CONFIG_SENSORS_ARM_SCMI=y CONFIG_SENSORS_ARM_SCMI=y
...@@ -634,6 +635,7 @@ CONFIG_MFD_EXYNOS_LPASS=m ...@@ -634,6 +635,7 @@ CONFIG_MFD_EXYNOS_LPASS=m
CONFIG_MFD_HI6421_PMIC=y CONFIG_MFD_HI6421_PMIC=y
CONFIG_MFD_HI655X_PMIC=y CONFIG_MFD_HI655X_PMIC=y
CONFIG_MFD_MAX77620=y CONFIG_MFD_MAX77620=y
CONFIG_MFD_MT6360=y
CONFIG_MFD_MT6397=y CONFIG_MFD_MT6397=y
CONFIG_MFD_SPMI_PMIC=y CONFIG_MFD_SPMI_PMIC=y
CONFIG_MFD_RK808=y CONFIG_MFD_RK808=y
...@@ -653,6 +655,8 @@ CONFIG_REGULATOR_MAX77620=y ...@@ -653,6 +655,8 @@ CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX8973=y CONFIG_REGULATOR_MAX8973=y
CONFIG_REGULATOR_MP8859=y CONFIG_REGULATOR_MP8859=y
CONFIG_REGULATOR_MT6358=y CONFIG_REGULATOR_MT6358=y
CONFIG_REGULATOR_MT6359=y
CONFIG_REGULATOR_MT6360=y
CONFIG_REGULATOR_MT6397=y CONFIG_REGULATOR_MT6397=y
CONFIG_REGULATOR_PCA9450=y CONFIG_REGULATOR_PCA9450=y
CONFIG_REGULATOR_PF8X00=y CONFIG_REGULATOR_PF8X00=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment