diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 22:52:24 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 22:52:24 +0200 |
| commit | f4b5c3bdc387fb16f0f3320cb436e7c2bf0143e1 (patch) | |
| tree | bb8eb1b3667e9382e3df7c60f45315c2ff1a61ff | |
| parent | 29ce2f3424f54ea02a487af4200aabb4c82d0b50 (diff) | |
| parent | b8eb03a7cf1b767c339771201f9cb974cea1145a (diff) | |
Merge tag 'qcom-arm64-defconfig-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/soc
Pull "Qualcomm ARM64 Based defconfig Updates for v4.15" from Andy Gross:
* Enable QCOM IOMMU
* Enable Qualcomm USB options
* tag 'qcom-arm64-defconfig-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
arm64: defconfig: re-enable Qualcomm DB410c USB
arm64: defconfig: Enable QCOM_IOMMU
| -rw-r--r-- | arch/arm64/configs/defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index f137a48ea443..94b14ee48c6d 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -430,6 +430,7 @@ CONFIG_USB_DWC2=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_CHIPIDEA_ULPI=y CONFIG_USB_ISP1760=y CONFIG_USB_HSIC_USB3503=y CONFIG_NOP_USB_XCEIV=y @@ -438,6 +439,7 @@ CONFIG_USB_QCOM_8X16_PHY=y CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_USB_RENESAS_USBHS_UDC=m +CONFIG_USB_ULPI_BUS=y CONFIG_MMC=y CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_ARMMMCI=y @@ -541,6 +543,7 @@ CONFIG_PWM_SAMSUNG=y CONFIG_PWM_TEGRA=m CONFIG_PHY_RCAR_GEN3_USB2=y CONFIG_PHY_HI6220_USB=y +CONFIG_PHY_QCOM_USB_HS=y CONFIG_PHY_SUN4I_USB=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_EMMC=y |