Commit 05a01ce7 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'imx-defconfig-6.11' of...

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.netSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 43528789 465830ad
...@@ -133,6 +133,7 @@ CONFIG_SMSC911X=y ...@@ -133,6 +133,7 @@ CONFIG_SMSC911X=y
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
CONFIG_MICREL_PHY=y CONFIG_MICREL_PHY=y
CONFIG_AT803X_PHY=y CONFIG_AT803X_PHY=y
CONFIG_DP83867_PHY=y
CONFIG_CAN_FLEXCAN=y CONFIG_CAN_FLEXCAN=y
CONFIG_USB_PEGASUS=m CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m CONFIG_USB_RTL8150=m
...@@ -180,6 +181,7 @@ CONFIG_TOUCHSCREEN_SX8654=y ...@@ -180,6 +181,7 @@ CONFIG_TOUCHSCREEN_SX8654=y
CONFIG_TOUCHSCREEN_COLIBRI_VF50=y CONFIG_TOUCHSCREEN_COLIBRI_VF50=y
CONFIG_INPUT_MISC=y CONFIG_INPUT_MISC=y
CONFIG_INPUT_MMA8450=y CONFIG_INPUT_MMA8450=y
CONFIG_INPUT_GPIO_BEEPER=m
CONFIG_SERIO_SERPORT=m CONFIG_SERIO_SERPORT=m
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX=y
...@@ -211,6 +213,7 @@ CONFIG_GPIO_SIOX=m ...@@ -211,6 +213,7 @@ CONFIG_GPIO_SIOX=m
CONFIG_GPIO_VF610=y CONFIG_GPIO_VF610=y
CONFIG_GPIO_MAX732X=y CONFIG_GPIO_MAX732X=y
CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X=y
CONFIG_GPIO_PCA953X_IRQ=y
CONFIG_GPIO_PCF857X=y CONFIG_GPIO_PCF857X=y
CONFIG_GPIO_BD71815=y CONFIG_GPIO_BD71815=y
CONFIG_GPIO_STMPE=y CONFIG_GPIO_STMPE=y
...@@ -226,6 +229,7 @@ CONFIG_RN5T618_POWER=m ...@@ -226,6 +229,7 @@ CONFIG_RN5T618_POWER=m
CONFIG_SENSORS_MC13783_ADC=y CONFIG_SENSORS_MC13783_ADC=y
CONFIG_SENSORS_GPIO_FAN=y CONFIG_SENSORS_GPIO_FAN=y
CONFIG_SENSORS_IIO_HWMON=y CONFIG_SENSORS_IIO_HWMON=y
CONFIG_SENSORS_LM75=m
CONFIG_SENSORS_PWM_FAN=y CONFIG_SENSORS_PWM_FAN=y
CONFIG_SENSORS_SY7636A=y CONFIG_SENSORS_SY7636A=y
CONFIG_THERMAL_STATISTICS=y CONFIG_THERMAL_STATISTICS=y
...@@ -282,6 +286,9 @@ CONFIG_DRM_PANEL_LVDS=y ...@@ -282,6 +286,9 @@ CONFIG_DRM_PANEL_LVDS=y
CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_SIMPLE=y
CONFIG_DRM_PANEL_EDP=y CONFIG_DRM_PANEL_EDP=y
CONFIG_DRM_PANEL_SEIKO_43WVF1G=y CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
CONFIG_DRM_DISPLAY_CONNECTOR=y
CONFIG_DRM_LVDS_CODEC=m
CONFIG_DRM_SII902X=y
CONFIG_DRM_TI_TFP410=y CONFIG_DRM_TI_TFP410=y
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
CONFIG_DRM_DW_HDMI_CEC=y CONFIG_DRM_DW_HDMI_CEC=y
......
...@@ -420,6 +420,9 @@ CONFIG_ATH11K_AHB=m ...@@ -420,6 +420,9 @@ CONFIG_ATH11K_AHB=m
CONFIG_ATH11K_PCI=m CONFIG_ATH11K_PCI=m
CONFIG_ATH12K=m CONFIG_ATH12K=m
CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC=m
CONFIG_IWLWIFI=m
CONFIG_IWLDVM=m
CONFIG_IWLMVM=m
CONFIG_MWIFIEX=m CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_PCIE=m
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment