Skip to content

Commit e333d60

Browse files
committed
Merge tag 'imx-defconfig-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/defconfig
i.MX defconfig for 6.9: - Enable VF610 GPIO driver for both arm64 and i.MX ARM defconfig. - Enable i.MX8MP LDB bridge and i.MX8QXP support drivers in arm64 defconfig. * tag 'imx-defconfig-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: defconfig: enable i.MX8MP ldb bridge arm64: defconfig: enable the vf610 gpio driver ARM: imx_v6_v7_defconfig: enable the vf610 gpio driver arm64: defconfig: Enable i.MX8QXP device drivers Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 70881a7 + f1a9ff9 commit e333d60

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ CONFIG_PINCTRL_IMX8MQ=y
208208
CONFIG_GPIO_SYSFS=y
209209
CONFIG_GPIO_MXC=y
210210
CONFIG_GPIO_SIOX=m
211+
CONFIG_GPIO_VF610=y
211212
CONFIG_GPIO_MAX732X=y
212213
CONFIG_GPIO_PCA953X=y
213214
CONFIG_GPIO_PCF857X=y

arch/arm64/configs/defconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,7 @@ CONFIG_GPIO_SYSCON=y
634634
CONFIG_GPIO_UNIPHIER=y
635635
CONFIG_GPIO_VISCONTI=y
636636
CONFIG_GPIO_WCD934X=m
637+
CONFIG_GPIO_VF610=y
637638
CONFIG_GPIO_XGENE=y
638639
CONFIG_GPIO_XGENE_SB=y
639640
CONFIG_GPIO_MAX732X=y
@@ -795,13 +796,15 @@ CONFIG_USB_VIDEO_CLASS=m
795796
CONFIG_V4L_PLATFORM_DRIVERS=y
796797
CONFIG_SDR_PLATFORM_DRIVERS=y
797798
CONFIG_V4L_MEM2MEM_DRIVERS=y
799+
CONFIG_VIDEO_AMPHION_VPU=m
798800
CONFIG_VIDEO_CADENCE_CSI2RX=m
799801
CONFIG_VIDEO_MEDIATEK_JPEG=m
800802
CONFIG_VIDEO_MEDIATEK_VCODEC=m
801803
CONFIG_VIDEO_IMX7_CSI=m
802804
CONFIG_VIDEO_IMX_MIPI_CSIS=m
803805
CONFIG_VIDEO_IMX8_ISI=m
804806
CONFIG_VIDEO_IMX8_ISI_M2M=y
807+
CONFIG_VIDEO_IMX8_JPEG=m
805808
CONFIG_VIDEO_QCOM_CAMSS=m
806809
CONFIG_VIDEO_QCOM_VENUS=m
807810
CONFIG_VIDEO_RCAR_ISP=m
@@ -864,6 +867,7 @@ CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
864867
CONFIG_DRM_PANEL_SITRONIX_ST7703=m
865868
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
866869
CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
870+
CONFIG_DRM_FSL_LDB=m
867871
CONFIG_DRM_LONTIUM_LT8912B=m
868872
CONFIG_DRM_LONTIUM_LT9611=m
869873
CONFIG_DRM_LONTIUM_LT9611UXC=m
@@ -1037,6 +1041,7 @@ CONFIG_USB_CDNS_SUPPORT=m
10371041
CONFIG_USB_CDNS3=m
10381042
CONFIG_USB_CDNS3_GADGET=y
10391043
CONFIG_USB_CDNS3_HOST=y
1044+
CONFIG_USB_CDNS3_IMX=m
10401045
CONFIG_USB_MTU3=y
10411046
CONFIG_USB_MUSB_HDRC=y
10421047
CONFIG_USB_MUSB_SUNXI=y
@@ -1054,6 +1059,7 @@ CONFIG_USB_QCOM_EUD=m
10541059
CONFIG_USB_HSIC_USB3503=y
10551060
CONFIG_USB_ONBOARD_HUB=m
10561061
CONFIG_NOP_USB_XCEIV=y
1062+
CONFIG_USB_MXS_PHY=m
10571063
CONFIG_USB_GADGET=y
10581064
CONFIG_USB_RENESAS_USBHS_UDC=m
10591065
CONFIG_USB_RZV2M_USB3DRD=y
@@ -1423,6 +1429,7 @@ CONFIG_EXTCON_USBC_CROS_EC=y
14231429
CONFIG_RENESAS_RPCIF=m
14241430
CONFIG_IIO=y
14251431
CONFIG_EXYNOS_ADC=y
1432+
CONFIG_IMX8QXP_ADC=m
14261433
CONFIG_IMX93_ADC=m
14271434
CONFIG_MAX9611=m
14281435
CONFIG_MEDIATEK_MT6577_AUXADC=m
@@ -1474,6 +1481,7 @@ CONFIG_PHY_SUN4I_USB=y
14741481
CONFIG_PHY_CADENCE_TORRENT=m
14751482
CONFIG_PHY_CADENCE_DPHY_RX=m
14761483
CONFIG_PHY_CADENCE_SIERRA=m
1484+
CONFIG_PHY_CADENCE_SALVO=m
14771485
CONFIG_PHY_MIXEL_MIPI_DPHY=m
14781486
CONFIG_PHY_FSL_IMX8M_PCIE=y
14791487
CONFIG_PHY_HI6220_USB=y

0 commit comments

Comments
 (0)