Skip to content

Commit 6e0b0f8

Browse files
committed
Merge tag 'imx-defconfig-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/defconfig
i.MX defconfig changes for 6.10: - Enable DW HDMI bridge driver for i.MX8M Plus SoC in arm64 defconfig - Enable ONBOAD_USB_DEV driver in imx_v6_v7_defconfig to support USB2514 Hub found on imx6qdl-udoo board * tag 'imx-defconfig-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v6_v7_defconfig: Update ONBOARD_USB_HUB to ONBOAD_USB_DEV ARM: imx_v6_v7_defconfig: Select CONFIG_USB_ONBOARD_HUB arm64: defconfig: Enable DRM_IMX8MP_DW_HDMI_BRIDGE as module Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 948b256 + da8fc15 commit 6e0b0f8

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
336336
CONFIG_USB_SERIAL_OPTION=m
337337
CONFIG_USB_TEST=m
338338
CONFIG_USB_EHSET_TEST_FIXTURE=m
339+
CONFIG_USB_ONBOARD_DEV=y
339340
CONFIG_NOP_USB_XCEIV=y
340341
CONFIG_USB_MXS_PHY=y
341342
CONFIG_USB_GADGET=y

arch/arm64/configs/defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -893,6 +893,7 @@ CONFIG_DRM_ANALOGIX_ANX7625=m
893893
CONFIG_DRM_I2C_ADV7511=m
894894
CONFIG_DRM_I2C_ADV7511_AUDIO=y
895895
CONFIG_DRM_CDNS_MHDP8546=m
896+
CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE=m
896897
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
897898
CONFIG_DRM_DW_HDMI_CEC=m
898899
CONFIG_DRM_IMX_DCSS=m

0 commit comments

Comments
 (0)