diff options
author | Arnd Bergmann <arnd@arndb.de> | 2022-07-12 23:06:31 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2022-07-12 23:06:31 +0200 |
commit | 01b66d2b33cc3ac176ac38694b800c859c488480 (patch) | |
tree | 3a2a245983df7ba1eb556fe46f3bcb8c2cb94f52 /arch/arm64/configs | |
parent | 8c1541b161a6926648abe44df0da6d9acc55745d (diff) | |
parent | afff3d3aef14c9775a154584a8becce1d33f9446 (diff) | |
download | lwn-01b66d2b33cc3ac176ac38694b800c859c488480.tar.gz lwn-01b66d2b33cc3ac176ac38694b800c859c488480.zip |
Merge tag 'imx-defconfig-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig
i.MX defconfig update for 5.20:
- Enable i.MX93 clock and pinctrl driver in arm64 defconfig.
- Enable gpio-fan driver in arm64 defconfig, as it's needed by
phyBOARD-Polis-i.MX8M Mini board.
* tag 'imx-defconfig-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
arm64: defconfig: Enable gpio-fan support
arm64: defconfig: enable i.MX93 clk & pinctrl
Link: https://lore.kernel.org/r/20220709082951.15123-6-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/configs')
-rw-r--r-- | arch/arm64/configs/defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 585552b3abd5..e29d38dd2c17 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -527,6 +527,7 @@ CONFIG_PINCTRL_IMX8QM=y CONFIG_PINCTRL_IMX8QXP=y CONFIG_PINCTRL_IMX8DXL=y CONFIG_PINCTRL_IMX8ULP=y +CONFIG_PINCTRL_IMX93=y CONFIG_PINCTRL_MSM=y CONFIG_PINCTRL_IPQ8074=y CONFIG_PINCTRL_IPQ6018=y @@ -577,6 +578,7 @@ CONFIG_CHARGER_BQ25890=m CONFIG_CHARGER_BQ25980=m CONFIG_SENSORS_ARM_SCMI=y CONFIG_SENSORS_ARM_SCPI=y +CONFIG_SENSORS_GPIO_FAN=m CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM90=m @@ -1033,6 +1035,7 @@ CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y CONFIG_CLK_IMX8QXP=y CONFIG_CLK_IMX8ULP=y +CONFIG_CLK_IMX93=y CONFIG_TI_SCI_CLK=y CONFIG_COMMON_CLK_QCOM=y CONFIG_QCOM_A53PLL=y |