This converts the following to Kconfig: CONFIG_USB_ULPI_TIMEOUT
Signed-off-by: Adam Ford aford173@gmail.com
diff --git a/drivers/usb/ulpi/Kconfig b/drivers/usb/ulpi/Kconfig index 001564d40c..d0eff66e1c 100644 --- a/drivers/usb/ulpi/Kconfig +++ b/drivers/usb/ulpi/Kconfig @@ -30,3 +30,9 @@ config USB_ULPI PHY Transreceiver for USB controllers.
This driver uses ULPI viewports that are specific for each SoC. + +config USB_ULPI_TIMEOUT + int "ULPI Timeout (us)" + default 1000 if USB_ULPI + help + Select the UPLI timeout in microseconds diff --git a/include/usb/ulpi.h b/include/usb/ulpi.h index 71642d257b..00cc60190b 100644 --- a/include/usb/ulpi.h +++ b/include/usb/ulpi.h @@ -20,10 +20,6 @@
#define ULPI_ERROR (1 << 8) /* overflow from any register value */
-#ifndef CONFIG_USB_ULPI_TIMEOUT -#define CONFIG_USB_ULPI_TIMEOUT 1000 /* timeout in us */ -#endif - /* * ulpi view port address and * Port_number that can be passed. diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7ced4099f2..8f6a1e3f7f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4666,7 +4666,6 @@ CONFIG_USB_SS_BASE CONFIG_USB_TI_CPPI_DMA CONFIG_USB_TTY CONFIG_USB_TUSB_OMAP_DMA -CONFIG_USB_ULPI_TIMEOUT CONFIG_USB_XHCI_EXYNOS CONFIG_USB_XHCI_KEYSTONE CONFIG_USB_XHCI_OMAP