diff mbox

[U-Boot,1/3] sunxi: Add INITIAL_USB_SCAN_DELAY Kconfig option

Message ID 1459624248-13306-1-git-send-email-hdegoede@redhat.com
State Accepted
Delegated to: Hans de Goede
Headers show

Commit Message

Hans de Goede April 2, 2016, 7:10 p.m. UTC 
Some boards have on board usb devices which need longer then the USB
spec's 1 second to connect from board powerup. Add a config option which
when non 0 adds an extra delay before the first usb bus scan.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 arch/arm/mach-sunxi/usb_phy.c | 7 +++++++
 board/sunxi/Kconfig           | 9 +++++++++
 2 files changed, 16 insertions(+)

Comments

Ian Campbell April 5, 2016, 9:42 a.m. UTC | #1 
On Sat, 2016-04-02 at 21:10 +0200, Hans de Goede wrote:
> Some boards have on board usb devices which need longer then the USB
                                                          ^than

(and in the Kconfig too)

> spec's 1 second to connect from board powerup. Add a config option which
> when non 0 adds an extra delay before the first usb bus scan.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Apart from that:

Acked-by: Ian Campbell <ijc@hellion.org.uk>
diff mbox

Patch

diff --git a/arch/arm/mach-sunxi/usb_phy.c b/arch/arm/mach-sunxi/usb_phy.c
index b258ce4..f9993d2 100644
--- a/arch/arm/mach-sunxi/usb_phy.c
+++ b/arch/arm/mach-sunxi/usb_phy.c
@@ -85,6 +85,8 @@  static struct sunxi_usb_phy {
 #endif
 };
 
+static int initial_usb_scan_delay = CONFIG_INITIAL_USB_SCAN_DELAY;
+
 static int get_vbus_gpio(int index)
 {
 	switch (index) {
@@ -269,6 +271,11 @@  void sunxi_usb_phy_power_on(int index)
 {
 	struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
 
+	if (initial_usb_scan_delay) {
+		mdelay(initial_usb_scan_delay);
+		initial_usb_scan_delay = 0;
+	}
+
 	phy->power_on_count++;
 	if (phy->power_on_count != 1)
 		return;
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 464fa0f..2b0d1df 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -312,6 +312,15 @@  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 then 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 ""