Skip to content

Commit 20cf932

Browse files
committed
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.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 42cfcf6 + 95afa02 commit 20cf932

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ CONFIG_BT_HCIUART_MRVL=y
195195
CONFIG_BT_MRVL=m
196196
CONFIG_BT_MRVL_SDIO=m
197197
CONFIG_BT_QCOMSMD=m
198+
CONFIG_BT_NXPUART=m
198199
CONFIG_CFG80211=m
199200
CONFIG_MAC80211=m
200201
CONFIG_MAC80211_LEDS=y
@@ -408,6 +409,7 @@ CONFIG_MWIFIEX=m
408409
CONFIG_MWIFIEX_SDIO=m
409410
CONFIG_MWIFIEX_PCIE=m
410411
CONFIG_MT7921E=m
412+
CONFIG_RSI_91X=m
411413
CONFIG_WL18XX=m
412414
CONFIG_WLCORE_SDIO=m
413415
CONFIG_WWAN=m
@@ -427,6 +429,7 @@ CONFIG_TOUCHSCREEN_GOODIX=m
427429
CONFIG_TOUCHSCREEN_ELAN=m
428430
CONFIG_TOUCHSCREEN_EDT_FT5X06=m
429431
CONFIG_INPUT_MISC=y
432+
CONFIG_INPUT_BBNSM_PWRKEY=m
430433
CONFIG_INPUT_PM8941_PWRKEY=y
431434
CONFIG_INPUT_PM8XXX_VIBRATOR=m
432435
CONFIG_INPUT_TPS65219_PWRBUTTON=m
@@ -677,6 +680,7 @@ CONFIG_SUNXI_WATCHDOG=m
677680
CONFIG_NPCM7XX_WATCHDOG=y
678681
CONFIG_IMX2_WDT=y
679682
CONFIG_IMX_SC_WDT=m
683+
CONFIG_IMX7ULP_WDT=m
680684
CONFIG_QCOM_WDT=m
681685
CONFIG_MESON_GXBB_WATCHDOG=m
682686
CONFIG_MESON_WATCHDOG=m
@@ -848,6 +852,7 @@ CONFIG_DRM_MEDIATEK=m
848852
CONFIG_DRM_MEDIATEK_HDMI=m
849853
CONFIG_DRM_MXSFB=m
850854
CONFIG_DRM_MESON=m
855+
CONFIG_DRM_IMX_LCDIF=m
851856
CONFIG_DRM_PL111=m
852857
CONFIG_DRM_LIMA=m
853858
CONFIG_DRM_PANFROST=m
@@ -1097,6 +1102,7 @@ CONFIG_RTC_DRV_ARMADA38X=y
10971102
CONFIG_RTC_DRV_PM8XXX=m
10981103
CONFIG_RTC_DRV_TEGRA=y
10991104
CONFIG_RTC_DRV_SNVS=m
1105+
CONFIG_RTC_DRV_BBNSM=m
11001106
CONFIG_RTC_DRV_IMX_SC=m
11011107
CONFIG_RTC_DRV_MT6397=m
11021108
CONFIG_RTC_DRV_XGENE=y
@@ -1239,6 +1245,7 @@ CONFIG_ARM_SMMU_V3=y
12391245
CONFIG_MTK_IOMMU=y
12401246
CONFIG_QCOM_IOMMU=y
12411247
CONFIG_REMOTEPROC=y
1248+
CONFIG_IMX_REMOTEPROC=y
12421249
CONFIG_MTK_SCP=m
12431250
CONFIG_QCOM_Q6V5_ADSP=m
12441251
CONFIG_QCOM_Q6V5_MSS=m
@@ -1250,6 +1257,7 @@ CONFIG_RPMSG_CTRL=m
12501257
CONFIG_RPMSG_QCOM_GLINK_RPM=y
12511258
CONFIG_RPMSG_QCOM_GLINK_SMEM=m
12521259
CONFIG_RPMSG_QCOM_SMD=y
1260+
CONFIG_RPMSG_VIRTIO=y
12531261
CONFIG_SOUNDWIRE=m
12541262
CONFIG_SOUNDWIRE_QCOM=m
12551263
CONFIG_OWL_PM_DOMAINS=y
@@ -1412,7 +1420,9 @@ CONFIG_QCOM_L3_PMU=y
14121420
CONFIG_ARM_SPE_PMU=m
14131421
CONFIG_ARM_DMC620_PMU=m
14141422
CONFIG_HISI_PMU=y
1423+
CONFIG_NVMEM_LAYOUT_SL28_VPD=m
14151424
CONFIG_NVMEM_IMX_OCOTP=y
1425+
CONFIG_NVMEM_IMX_OCOTP_ELE=m
14161426
CONFIG_NVMEM_IMX_OCOTP_SCU=y
14171427
CONFIG_NVMEM_LAYERSCAPE_SFP=m
14181428
CONFIG_NVMEM_MESON_EFUSE=m

0 commit comments

Comments
 (0)