Skip to content

Commit f11d7cb

Browse files
committed
Merge tag 'imx-defconfig-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig
i.MX defconfig update for 5.8: - Enable RTC and ADC support of RN5T618 PMIC in imx_v6_v7_defconfig. - Enable i.MX8DXL pinctrl driver support in arm64 defconfig. * tag 'imx-defconfig-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v6_v7_defconfig: extend RN5T618 PMIC family support arm64: defconfig: Enable CONFIG_PINCTRL_IMX8DXL by default Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 8ce538e + 5b4bf80 commit f11d7cb

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ CONFIG_RTC_DRV_DA9063=y
395395
CONFIG_RTC_DRV_MC13XXX=y
396396
CONFIG_RTC_DRV_MXC=y
397397
CONFIG_RTC_DRV_MXC_V2=y
398+
CONFIG_RTC_DRV_RC5T619=y
398399
CONFIG_RTC_DRV_SNVS=y
399400
CONFIG_DMADEVICES=y
400401
CONFIG_FSL_EDMA=y
@@ -408,6 +409,7 @@ CONFIG_COMMON_CLK_PWM=y
408409
CONFIG_IIO=y
409410
CONFIG_MMA8452=y
410411
CONFIG_IMX7D_ADC=y
412+
CONFIG_RN5T618_ADC=y
411413
CONFIG_VF610_ADC=y
412414
CONFIG_SENSORS_ISL29018=y
413415
CONFIG_MAG3110=y

arch/arm64/configs/defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,7 @@ CONFIG_PINCTRL_IMX8MN=y
456456
CONFIG_PINCTRL_IMX8MP=y
457457
CONFIG_PINCTRL_IMX8MQ=y
458458
CONFIG_PINCTRL_IMX8QXP=y
459+
CONFIG_PINCTRL_IMX8DXL=y
459460
CONFIG_PINCTRL_IPQ8074=y
460461
CONFIG_PINCTRL_IPQ6018=y
461462
CONFIG_PINCTRL_MSM8916=y

0 commit comments

Comments
 (0)