Skip to content

Commit 9b9a554

Browse files
committed
Merge tag 'imx-defconfig-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/defconfig
i.MX defconfig changes for 6.7: - Enable Samsung DSIM DRM bridge driver and USB mass storage support in arm64 defconfig * tag 'imx-defconfig-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: defconfig: Enable Samsung DSIM driver arm64: defconfig: Enable CONFIG_USB_MASS_STORAGE Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents ec91108 + f5f1783 commit 9b9a554

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,7 @@ CONFIG_PINCTRL_SC8280XP_LPASS_LPI=m
612612
CONFIG_PINCTRL_SM8550=y
613613
CONFIG_PINCTRL_SM8550_LPASS_LPI=m
614614
CONFIG_PINCTRL_LPASS_LPI=m
615+
CONFIG_GPIO_AGGREGATOR=m
615616
CONFIG_GPIO_ALTERA=m
616617
CONFIG_GPIO_DAVINCI=y
617618
CONFIG_GPIO_DWAPB=y
@@ -845,6 +846,7 @@ CONFIG_DRM_LONTIUM_LT9611UXC=m
845846
CONFIG_DRM_ITE_IT66121=m
846847
CONFIG_DRM_NWL_MIPI_DSI=m
847848
CONFIG_DRM_PARADE_PS8640=m
849+
CONFIG_DRM_SAMSUNG_DSIM=m
848850
CONFIG_DRM_SII902X=m
849851
CONFIG_DRM_SIMPLE_BRIDGE=m
850852
CONFIG_DRM_THINE_THC63LVD1024=m
@@ -1030,6 +1032,7 @@ CONFIG_USB_CONFIGFS_RNDIS=y
10301032
CONFIG_USB_CONFIGFS_EEM=y
10311033
CONFIG_USB_CONFIGFS_MASS_STORAGE=y
10321034
CONFIG_USB_CONFIGFS_F_FS=y
1035+
CONFIG_USB_MASS_STORAGE=m
10331036
CONFIG_TYPEC=m
10341037
CONFIG_TYPEC_TCPM=m
10351038
CONFIG_TYPEC_TCPCI=m

0 commit comments

Comments
 (0)