diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 22:46:29 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 22:46:29 +0200 |
| commit | 977478f9e0843a4abd8d59484ab4ca0c2a70ce1d (patch) | |
| tree | 5ecc98b9b800bb4a52d30e9cc8d71759eecc5557 /arch/arm/configs | |
| parent | a1bc4e7cee3f69955d20c1e10bb62b1803e5db6e (diff) | |
| parent | a7620b2dff23409bb5a906e19814021e8dec00e5 (diff) | |
Merge tag 'samsung-defconfig-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc
Pull "Samsung defconfig changes for v4.15" from Krzysztof Kozłowski:
1. Enable USB3503 on multi_v7 for Odroid U3.
2. Enable USB Attached SCSI for Odroid HC1.
* tag 'samsung-defconfig-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: multi_v7_defconfig: Enable UAS support for Odroid HC1 board
ARM: exynos_defconfig: Enable UAS support for Odroid HC1 board
ARM: multi_v7_defconfig: Enable USB3503 driver
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/exynos_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig index 8c2a2619971b..f1d7834990ec 100644 --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig @@ -244,7 +244,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m CONFIG_USB_STORAGE_ENE_UB6250=m -CONFIG_USB_UAS=m +CONFIG_USB_UAS=y CONFIG_USB_DWC3=y CONFIG_USB_DWC2=y CONFIG_USB_HSIC_USB3503=y diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 90f546766f38..708614d11bb4 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -689,10 +689,12 @@ CONFIG_USB_OHCI_EXYNOS=m CONFIG_USB_R8A66597_HCD=m CONFIG_USB_RENESAS_USBHS=m CONFIG_USB_STORAGE=y +CONFIG_USB_UAS=m CONFIG_USB_MUSB_HDRC=m CONFIG_USB_MUSB_SUNXI=m CONFIG_USB_DWC3=y CONFIG_USB_DWC2=y +CONFIG_USB_HSIC_USB3503=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y |