sunxi: Move INITIAL_USB_SCAN_DELAY to driver Kconfig

This option is used only by the phy-sun4i-usb driver, which does not
inherently depend on the ARM architecture.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>

diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index f4925aaa89541998a90813d0cf4b7970c0aabd2b..5712576184424943a549494110f27894b9362029 100644 (file)
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -679,15 +679,6 @@ config MMC_SUNXI_SLOT_EXTRA
        slot or emmc on mmc1 - mmc3. Setting this to 1, 2 or 3 will enable
        support for this.
 
-config INITIAL_USB_SCAN_DELAY
-       int "delay initial usb scan by x ms to allow builtin devices to init"
-       default 0
-       ---help---
-       Some boards have on board usb devices which need longer than the
-       USB spec's 1 second to connect from board powerup. Set this config
-       option to a non 0 value to add an extra delay before the first usb
-       bus scan.
-
 config USB0_VBUS_PIN
        string "Vbus enable pin for usb0 (otg)"
        default ""

diff --git a/drivers/phy/allwinner/Kconfig b/drivers/phy/allwinner/Kconfig
index d3ff82f73a0041feb64964b9d17c46377f4db60f..f8f1e99c4f52031f109d9874eb1ec134e4dd5642 100644 (file)
--- a/drivers/phy/allwinner/Kconfig
+++ b/drivers/phy/allwinner/Kconfig
@@ -13,6 +13,16 @@ config PHY_SUN4I_USB
          This driver controls the entire USB PHY block, both the USB OTG
          parts, as well as the 2 regular USB 2 host PHYs.
 
+config INITIAL_USB_SCAN_DELAY
+       int "Delay initial USB scan by x ms to allow builtin devices to init"
+       depends on PHY_SUN4I_USB
+       default 0
+       help
+         Some boards have on board usb devices which need longer than
+         the USB spec's 1 second to connect from board powerup. Set
+         this option to a nonzero value to add an extra delay before
+         the first USB bus scan.
+
 config PHY_SUN50I_USB3
        bool "Allwinner sun50i USB3 PHY driver"
        depends on ARCH_SUNXI