diff options
author | Fabio Estevam <fabio.estevam@nxp.com> | 2018-07-04 10:09:58 -0300 |
---|---|---|
committer | Peter Chen <peter.chen@nxp.com> | 2018-07-05 14:22:47 +0800 |
commit | a930d8bd94d8db7715d1af74299f710b1fb22fc8 (patch) | |
tree | 9f5e905ba2d47d7fd6811189331a472e800f63fe /drivers/usb/chipidea/Makefile | |
parent | 90f26cc6bb90b35040f4da0347f480ea9df6e2fc (diff) | |
download | linux-stable-a930d8bd94d8db7715d1af74299f710b1fb22fc8.tar.gz linux-stable-a930d8bd94d8db7715d1af74299f710b1fb22fc8.tar.bz2 linux-stable-a930d8bd94d8db7715d1af74299f710b1fb22fc8.zip |
usb: chipidea: Always build ULPI code
Commit 03e6275ae381 ("usb: chipidea: Fix ULPI on imx51") causes a kernel
hang on imx51 systems that use the ULPI interface and do not select the
CONFIG_USB_CHIPIDEA_ULPI option.
In order to avoid such potential misuse, let's always build the
chipidea ULPI code into the final ci_hdrc object.
Tested on a imx51-babbage board.
Fixes: 03e6275ae381 ("usb: chipidea: Fix ULPI on imx51")
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Diffstat (limited to 'drivers/usb/chipidea/Makefile')
-rw-r--r-- | drivers/usb/chipidea/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile index e3d5e728fa53..12df94f78f72 100644 --- a/drivers/usb/chipidea/Makefile +++ b/drivers/usb/chipidea/Makefile @@ -1,11 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc.o -ci_hdrc-y := core.o otg.o debug.o +ci_hdrc-y := core.o otg.o debug.o ulpi.o ci_hdrc-$(CONFIG_USB_CHIPIDEA_UDC) += udc.o ci_hdrc-$(CONFIG_USB_CHIPIDEA_HOST) += host.o ci_hdrc-$(CONFIG_USB_OTG_FSM) += otg_fsm.o -ci_hdrc-$(CONFIG_USB_CHIPIDEA_ULPI) += ulpi.o # Glue/Bridge layers go here |