diff options
| author | Shawn Guo <shawnguo@kernel.org> | 2024-04-28 16:06:17 +0800 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2024-04-28 16:06:17 +0800 |
| commit | 8c4bf8c96748fac9e6db17ea58ecd505a2217fb7 (patch) | |
| tree | e7e6f83c1d8fceda8865c5964629933a58478e2f | |
| parent | 5aaa8d6ecc24131a4b1c8a8a26d425cc41e644c2 (diff) | |
| parent | da8fc156d76c3b4b4a49ef65cf6b5cd1767ff17e (diff) | |
| download | linux-for-next.tar.gz | |
Merge branch 'imx/defconfig' into for-nextfor-next
| -rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 7327fce87808d3..cf2480dce2853a 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -336,6 +336,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_TEST=m CONFIG_USB_EHSET_TEST_FIXTURE=m +CONFIG_USB_ONBOARD_DEV=y CONFIG_NOP_USB_XCEIV=y CONFIG_USB_MXS_PHY=y CONFIG_USB_GADGET=y diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 2c30d617e18022..c9964e5e1e7df3 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -890,6 +890,7 @@ CONFIG_DRM_ANALOGIX_ANX7625=m CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7511_AUDIO=y CONFIG_DRM_CDNS_MHDP8546=m +CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE=m CONFIG_DRM_DW_HDMI_AHB_AUDIO=m CONFIG_DRM_DW_HDMI_CEC=m CONFIG_DRM_IMX_DCSS=m |