Commit 20cf932a authored by Arnd Bergmann's avatar Arnd Bergmann

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

Merge tag 'imx-defconfig-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/defconfig

i.MX defconfig change for 6.6:

- Enable i.MX93 device drivers in arm64 defconfig.
- Enable Redpine 91X WLAN and NXP UART Bluetooth driver.
- Enable DRM_IMX_LCDIF, IMX_REMOTEPROC and RPMSG_VIRTIO drivers.
- Enable SL28VPD NVMEM layout support.

* tag 'imx-defconfig-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: defconfig: Enable Redpine 91X wlan driver
  arm64: defconfig: Enable CONFIG_DRM_IMX_LCDIF
  arm64: defconfig: enable driver for bluetooth nxp uart
  arm64: defconfig: Enable i.MX93 devices
  arm64: defconfig: select IMX_REMOTEPROC and RPMSG_VIRTIO
  arm64: defconfig: enable SL28VPD NVMEM layout

Link: https://lore.kernel.org/r/20230813133354.847010-6-shawnguo@kernel.orgSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 42cfcf62 95afa02c
...@@ -195,6 +195,7 @@ CONFIG_BT_HCIUART_MRVL=y ...@@ -195,6 +195,7 @@ CONFIG_BT_HCIUART_MRVL=y
CONFIG_BT_MRVL=m CONFIG_BT_MRVL=m
CONFIG_BT_MRVL_SDIO=m CONFIG_BT_MRVL_SDIO=m
CONFIG_BT_QCOMSMD=m CONFIG_BT_QCOMSMD=m
CONFIG_BT_NXPUART=m
CONFIG_CFG80211=m CONFIG_CFG80211=m
CONFIG_MAC80211=m CONFIG_MAC80211=m
CONFIG_MAC80211_LEDS=y CONFIG_MAC80211_LEDS=y
...@@ -408,6 +409,7 @@ CONFIG_MWIFIEX=m ...@@ -408,6 +409,7 @@ CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_PCIE=m
CONFIG_MT7921E=m CONFIG_MT7921E=m
CONFIG_RSI_91X=m
CONFIG_WL18XX=m CONFIG_WL18XX=m
CONFIG_WLCORE_SDIO=m CONFIG_WLCORE_SDIO=m
CONFIG_WWAN=m CONFIG_WWAN=m
...@@ -427,6 +429,7 @@ CONFIG_TOUCHSCREEN_GOODIX=m ...@@ -427,6 +429,7 @@ CONFIG_TOUCHSCREEN_GOODIX=m
CONFIG_TOUCHSCREEN_ELAN=m CONFIG_TOUCHSCREEN_ELAN=m
CONFIG_TOUCHSCREEN_EDT_FT5X06=m CONFIG_TOUCHSCREEN_EDT_FT5X06=m
CONFIG_INPUT_MISC=y CONFIG_INPUT_MISC=y
CONFIG_INPUT_BBNSM_PWRKEY=m
CONFIG_INPUT_PM8941_PWRKEY=y CONFIG_INPUT_PM8941_PWRKEY=y
CONFIG_INPUT_PM8XXX_VIBRATOR=m CONFIG_INPUT_PM8XXX_VIBRATOR=m
CONFIG_INPUT_TPS65219_PWRBUTTON=m CONFIG_INPUT_TPS65219_PWRBUTTON=m
...@@ -677,6 +680,7 @@ CONFIG_SUNXI_WATCHDOG=m ...@@ -677,6 +680,7 @@ CONFIG_SUNXI_WATCHDOG=m
CONFIG_NPCM7XX_WATCHDOG=y CONFIG_NPCM7XX_WATCHDOG=y
CONFIG_IMX2_WDT=y CONFIG_IMX2_WDT=y
CONFIG_IMX_SC_WDT=m CONFIG_IMX_SC_WDT=m
CONFIG_IMX7ULP_WDT=m
CONFIG_QCOM_WDT=m CONFIG_QCOM_WDT=m
CONFIG_MESON_GXBB_WATCHDOG=m CONFIG_MESON_GXBB_WATCHDOG=m
CONFIG_MESON_WATCHDOG=m CONFIG_MESON_WATCHDOG=m
...@@ -848,6 +852,7 @@ CONFIG_DRM_MEDIATEK=m ...@@ -848,6 +852,7 @@ CONFIG_DRM_MEDIATEK=m
CONFIG_DRM_MEDIATEK_HDMI=m CONFIG_DRM_MEDIATEK_HDMI=m
CONFIG_DRM_MXSFB=m CONFIG_DRM_MXSFB=m
CONFIG_DRM_MESON=m CONFIG_DRM_MESON=m
CONFIG_DRM_IMX_LCDIF=m
CONFIG_DRM_PL111=m CONFIG_DRM_PL111=m
CONFIG_DRM_LIMA=m CONFIG_DRM_LIMA=m
CONFIG_DRM_PANFROST=m CONFIG_DRM_PANFROST=m
...@@ -1097,6 +1102,7 @@ CONFIG_RTC_DRV_ARMADA38X=y ...@@ -1097,6 +1102,7 @@ CONFIG_RTC_DRV_ARMADA38X=y
CONFIG_RTC_DRV_PM8XXX=m CONFIG_RTC_DRV_PM8XXX=m
CONFIG_RTC_DRV_TEGRA=y CONFIG_RTC_DRV_TEGRA=y
CONFIG_RTC_DRV_SNVS=m CONFIG_RTC_DRV_SNVS=m
CONFIG_RTC_DRV_BBNSM=m
CONFIG_RTC_DRV_IMX_SC=m CONFIG_RTC_DRV_IMX_SC=m
CONFIG_RTC_DRV_MT6397=m CONFIG_RTC_DRV_MT6397=m
CONFIG_RTC_DRV_XGENE=y CONFIG_RTC_DRV_XGENE=y
...@@ -1239,6 +1245,7 @@ CONFIG_ARM_SMMU_V3=y ...@@ -1239,6 +1245,7 @@ CONFIG_ARM_SMMU_V3=y
CONFIG_MTK_IOMMU=y CONFIG_MTK_IOMMU=y
CONFIG_QCOM_IOMMU=y CONFIG_QCOM_IOMMU=y
CONFIG_REMOTEPROC=y CONFIG_REMOTEPROC=y
CONFIG_IMX_REMOTEPROC=y
CONFIG_MTK_SCP=m CONFIG_MTK_SCP=m
CONFIG_QCOM_Q6V5_ADSP=m CONFIG_QCOM_Q6V5_ADSP=m
CONFIG_QCOM_Q6V5_MSS=m CONFIG_QCOM_Q6V5_MSS=m
...@@ -1250,6 +1257,7 @@ CONFIG_RPMSG_CTRL=m ...@@ -1250,6 +1257,7 @@ CONFIG_RPMSG_CTRL=m
CONFIG_RPMSG_QCOM_GLINK_RPM=y CONFIG_RPMSG_QCOM_GLINK_RPM=y
CONFIG_RPMSG_QCOM_GLINK_SMEM=m CONFIG_RPMSG_QCOM_GLINK_SMEM=m
CONFIG_RPMSG_QCOM_SMD=y CONFIG_RPMSG_QCOM_SMD=y
CONFIG_RPMSG_VIRTIO=y
CONFIG_SOUNDWIRE=m CONFIG_SOUNDWIRE=m
CONFIG_SOUNDWIRE_QCOM=m CONFIG_SOUNDWIRE_QCOM=m
CONFIG_OWL_PM_DOMAINS=y CONFIG_OWL_PM_DOMAINS=y
...@@ -1412,7 +1420,9 @@ CONFIG_QCOM_L3_PMU=y ...@@ -1412,7 +1420,9 @@ CONFIG_QCOM_L3_PMU=y
CONFIG_ARM_SPE_PMU=m CONFIG_ARM_SPE_PMU=m
CONFIG_ARM_DMC620_PMU=m CONFIG_ARM_DMC620_PMU=m
CONFIG_HISI_PMU=y CONFIG_HISI_PMU=y
CONFIG_NVMEM_LAYOUT_SL28_VPD=m
CONFIG_NVMEM_IMX_OCOTP=y CONFIG_NVMEM_IMX_OCOTP=y
CONFIG_NVMEM_IMX_OCOTP_ELE=m
CONFIG_NVMEM_IMX_OCOTP_SCU=y CONFIG_NVMEM_IMX_OCOTP_SCU=y
CONFIG_NVMEM_LAYERSCAPE_SFP=m CONFIG_NVMEM_LAYERSCAPE_SFP=m
CONFIG_NVMEM_MESON_EFUSE=m CONFIG_NVMEM_MESON_EFUSE=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