diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2025-09-15 16:32:04 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2025-09-15 16:32:06 +0200 |
| commit | 8193017c718201ffcc9a3cb6f379ee07182a7096 (patch) | |
| tree | 400e2f406c58aacf881806355b23d7c4c8f5fc4a | |
| parent | bb6550192575c08480dc6383fd75ead1e40966b7 (diff) | |
| parent | 8b3ce9541129c93958271cc6f6963742f1db0fe7 (diff) | |
Merge tag 'imx-defconfig-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/defconfig
i.MX defconfig changes for 6.18:
- Enable i.MX91 pinctrl driver and Marvell WiFi-Ex USB driver in arm64
defconfig
* tag 'imx-defconfig-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
arm64: defconfig: Enable Marvell WiFi-Ex USB driver
arm64: defconfig: enable i.MX91 pinctrl
Link: https://lore.kernel.org/r/20250915132535.253859-4-shawnguo2@yeah.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 3f89d15e07f2..951776a2d87c 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -442,6 +442,7 @@ CONFIG_IWLMVM=m CONFIG_MWIFIEX=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_PCIE=m +CONFIG_MWIFIEX_USB=m CONFIG_MT7921E=m CONFIG_RSI_91X=m CONFIG_WL18XX=m @@ -612,6 +613,7 @@ CONFIG_PINCTRL_IMX8QM=y CONFIG_PINCTRL_IMX8QXP=y CONFIG_PINCTRL_IMX8DXL=y CONFIG_PINCTRL_IMX8ULP=y +CONFIG_PINCTRL_IMX91=y CONFIG_PINCTRL_IMX93=y CONFIG_PINCTRL_MSM=y CONFIG_PINCTRL_IPQ5018=y |