projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| ba4a4fdd GKH |
1 | From foo@baz Wed Aug 22 10:28:26 CEST 2018 |
| 2 | From: Fabio Estevam <fabio.estevam@nxp.com> | |
| 3 | Date: Mon, 25 Jun 2018 09:34:03 -0300 | |
| 4 | Subject: ARM: imx_v6_v7_defconfig: Select ULPI support | |
| 5 | ||
| 6 | From: Fabio Estevam <fabio.estevam@nxp.com> | |
| 7 | ||
| 8 | [ Upstream commit 157bcc06094c3c5800d3f4676527047b79b618e7 ] | |
| 9 | ||
| 10 | Select CONFIG_USB_CHIPIDEA_ULPI and CONFIG_USB_ULPI_BUS so that | |
| 11 | USB ULPI can be functional on some boards like imx51-babbge. | |
| 12 | ||
| 13 | This fixes a kernel hang in 4.18-rc1 on i.mx51-babbage, caused by commit | |
| 14 | 03e6275ae381 ("usb: chipidea: Fix ULPI on imx51"). | |
| 15 | ||
| 16 | Suggested-by: Andrey Smirnov <andrew.smirnov@gmail.com> | |
| 17 | Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> | |
| 18 | Signed-off-by: Shawn Guo <shawnguo@kernel.org> | |
| 19 | Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> | |
| 20 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 21 | --- | |
| 22 | arch/arm/configs/imx_v6_v7_defconfig | 2 ++ | |
| 23 | 1 file changed, 2 insertions(+) | |
| 24 | ||
| 25 | --- a/arch/arm/configs/imx_v6_v7_defconfig | |
| 26 | +++ b/arch/arm/configs/imx_v6_v7_defconfig | |
| 27 | @@ -261,6 +261,7 @@ CONFIG_USB_STORAGE=y | |
| 28 | CONFIG_USB_CHIPIDEA=y | |
| 29 | CONFIG_USB_CHIPIDEA_UDC=y | |
| 30 | CONFIG_USB_CHIPIDEA_HOST=y | |
| 31 | +CONFIG_USB_CHIPIDEA_ULPI=y | |
| 32 | CONFIG_USB_SERIAL=m | |
| 33 | CONFIG_USB_SERIAL_GENERIC=y | |
| 34 | CONFIG_USB_SERIAL_FTDI_SIO=m | |
| 35 | @@ -287,6 +288,7 @@ CONFIG_USB_G_NCM=m | |
| 36 | CONFIG_USB_GADGETFS=m | |
| 37 | CONFIG_USB_MASS_STORAGE=m | |
| 38 | CONFIG_USB_G_SERIAL=m | |
| 39 | +CONFIG_USB_ULPI_BUS=y | |
| 40 | CONFIG_MMC=y | |
| 41 | CONFIG_MMC_SDHCI=y | |
| 42 | CONFIG_MMC_SDHCI_PLTFM=y |