Skip to content

Commit e17142e

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents a2e8bbe + d66aea1 commit e17142e

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

arch/arm/mach-mediatek/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ config MACH_MT7623
3030
config MACH_MT7629
3131
bool "MediaTek MT7629 SoCs support"
3232
default ARCH_MEDIATEK
33+
select HAVE_ARM_ARCH_TIMER
3334

3435
config MACH_MT8127
3536
bool "MediaTek MT8127 SoCs support"

arch/arm64/configs/defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@ CONFIG_SYSCON_REBOOT_MODE=y
572572
CONFIG_BATTERY_SBS=m
573573
CONFIG_BATTERY_BQ27XXX=y
574574
CONFIG_BATTERY_MAX17042=m
575+
CONFIG_CHARGER_MT6360=m
575576
CONFIG_CHARGER_BQ25890=m
576577
CONFIG_CHARGER_BQ25980=m
577578
CONFIG_SENSORS_ARM_SCMI=y
@@ -634,6 +635,7 @@ CONFIG_MFD_EXYNOS_LPASS=m
634635
CONFIG_MFD_HI6421_PMIC=y
635636
CONFIG_MFD_HI655X_PMIC=y
636637
CONFIG_MFD_MAX77620=y
638+
CONFIG_MFD_MT6360=y
637639
CONFIG_MFD_MT6397=y
638640
CONFIG_MFD_SPMI_PMIC=y
639641
CONFIG_MFD_RK808=y
@@ -653,6 +655,8 @@ CONFIG_REGULATOR_MAX77620=y
653655
CONFIG_REGULATOR_MAX8973=y
654656
CONFIG_REGULATOR_MP8859=y
655657
CONFIG_REGULATOR_MT6358=y
658+
CONFIG_REGULATOR_MT6359=y
659+
CONFIG_REGULATOR_MT6360=y
656660
CONFIG_REGULATOR_MT6397=y
657661
CONFIG_REGULATOR_PCA9450=y
658662
CONFIG_REGULATOR_PF8X00=y

0 commit comments

Comments
 (0)