Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 05a01ce

Browse files
committed
Merge tag 'imx-defconfig-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/defconfig
i.MX defconfig change for 6.11: - Enable a few drivers needed by TQMa7x/MBa7x and i.MX53 QSB/QSRB in imx_v6_v7_defconfig - Enable IWLWIFI driver support in arm64 defconfig * tag 'imx-defconfig-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: defconfig: Enable the IWLWIFI driver ARM: imx_v6_v7_defconfig: enable DRM_SII902X and DRM_DISPLAY_CONNECTOR ARM: imx_v6_v7_defconfig: Enable drivers for TQMa7x/MBa7x Link: https://lore.kernel.org/r/20240709012534.3106441-1-shawnguo2@yeah.net Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 4352878 + 465830a commit 05a01ce

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ CONFIG_SMSC911X=y
133133
# CONFIG_NET_VENDOR_STMICRO is not set
134134
CONFIG_MICREL_PHY=y
135135
CONFIG_AT803X_PHY=y
136+
CONFIG_DP83867_PHY=y
136137
CONFIG_CAN_FLEXCAN=y
137138
CONFIG_USB_PEGASUS=m
138139
CONFIG_USB_RTL8150=m
@@ -180,6 +181,7 @@ CONFIG_TOUCHSCREEN_SX8654=y
180181
CONFIG_TOUCHSCREEN_COLIBRI_VF50=y
181182
CONFIG_INPUT_MISC=y
182183
CONFIG_INPUT_MMA8450=y
184+
CONFIG_INPUT_GPIO_BEEPER=m
183185
CONFIG_SERIO_SERPORT=m
184186
# CONFIG_LEGACY_PTYS is not set
185187
CONFIG_SERIAL_IMX=y
@@ -211,6 +213,7 @@ CONFIG_GPIO_SIOX=m
211213
CONFIG_GPIO_VF610=y
212214
CONFIG_GPIO_MAX732X=y
213215
CONFIG_GPIO_PCA953X=y
216+
CONFIG_GPIO_PCA953X_IRQ=y
214217
CONFIG_GPIO_PCF857X=y
215218
CONFIG_GPIO_BD71815=y
216219
CONFIG_GPIO_STMPE=y
@@ -226,6 +229,7 @@ CONFIG_RN5T618_POWER=m
226229
CONFIG_SENSORS_MC13783_ADC=y
227230
CONFIG_SENSORS_GPIO_FAN=y
228231
CONFIG_SENSORS_IIO_HWMON=y
232+
CONFIG_SENSORS_LM75=m
229233
CONFIG_SENSORS_PWM_FAN=y
230234
CONFIG_SENSORS_SY7636A=y
231235
CONFIG_THERMAL_STATISTICS=y
@@ -282,6 +286,9 @@ CONFIG_DRM_PANEL_LVDS=y
282286
CONFIG_DRM_PANEL_SIMPLE=y
283287
CONFIG_DRM_PANEL_EDP=y
284288
CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
289+
CONFIG_DRM_DISPLAY_CONNECTOR=y
290+
CONFIG_DRM_LVDS_CODEC=m
291+
CONFIG_DRM_SII902X=y
285292
CONFIG_DRM_TI_TFP410=y
286293
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
287294
CONFIG_DRM_DW_HDMI_CEC=y

arch/arm64/configs/defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,9 @@ CONFIG_ATH11K_AHB=m
420420
CONFIG_ATH11K_PCI=m
421421
CONFIG_ATH12K=m
422422
CONFIG_BRCMFMAC=m
423+
CONFIG_IWLWIFI=m
424+
CONFIG_IWLDVM=m
425+
CONFIG_IWLMVM=m
423426
CONFIG_MWIFIEX=m
424427
CONFIG_MWIFIEX_SDIO=m
425428
CONFIG_MWIFIEX_PCIE=m

0 commit comments

Comments
 (0)