Skip to contentSkip to conversation

power: add power sequence library

PATCH Superseded Peter Chen 6 participants 21 messages Aug 8, 2016 – Aug 12, 2016

Subsystems (5)

v5 of 16 Superseded Latest is v16 →

lore
Share & tools
lore

Peter Chen

author
#0 lore raw

v5 cover power: add power sequence library

Hi all,

This is a follow-up for my last power sequence framework patch set [1]. According to Rob Herring and Ulf Hansson's comments[2], I use a generic power sequence library for parsing the power sequence elements on DT, and implement generic power sequence on library. The host driver can allocate power sequence instance, and calls pwrseq APIs accordingly.

In future, if there are special power sequence requirements, the special power sequence library can be created.

This patch set is tested on i.mx6 sabresx evk using a dts change, I use two hot-plug devices to simulate this use case, the related binding change is updated at patch [1/6], The udoo board changes were tested using my last power sequence patch set.[3]

Except for hard-wired MMC and USB devices, I find the USB ULPI PHY also need to power on itself before it can be found by ULPI bus.

[1] http://www.spinics.net/lists/linux-usb/msg142755.html
[2] http://www.spinics.net/lists/linux-usb/msg143106.html
[3] http://www.spinics.net/lists/linux-usb/msg142815.html

Changes for v5:
- Delete pwrseq_register/pwrseq_unregister, which is useless currently
- Fix the linker error when the pwrseq user is compiled as module

Changes for v4:
- Create the patch on next-20160722
- Fix the of_node is not NULL after chipidea driver is unbinded [Patch 5/6]
- Using more friendly wait method for reset gpio [Patch 2/6]
- Support multiple input clocks [Patch 2/6]
- Add Rob Herring's ack for DT changes
- Add Joshua Clayton's Tested-by

Changes for v3:
- Delete "power-sequence" property at binding-doc, and change related code at both library and user code.
- Change binding-doc example node name with Rob's comments
- of_get_named_gpio_flags only gets the gpio, but without setting gpio flags, add additional code request gpio with proper gpio flags
- Add Philipp Zabel's Ack and MAINTAINER's entry

Changes for v2:
- Delete "pwrseq" prefix and clock-names for properties at dt binding
- Should use structure not but its pointer for kzalloc
- Since chipidea core has no of_node, let core's of_node equals glue layer's at core's probe

Peter Chen (6):
binding-doc: power: pwrseq-generic: add binding doc for generic power
sequence library
power: add power sequence library
binding-doc: usb: usb-device: add optional properties for power
sequence
usb: core: add power sequence handling for USB devices
usb: chipidea: let chipidea core device of_node equal's glue layer
device of_node
ARM: dts: imx6qdl-udoo.dtsi: fix onboard USB HUB property

 .../bindings/power/pwrseq/pwrseq-generic.txt       |  48 ++++++
 .../devicetree/bindings/usb/usb-device.txt         |  10 +-
 MAINTAINERS                                        |   9 ++
 arch/arm/boot/dts/imx6qdl-udoo.dtsi                |  26 ++--
 drivers/power/Kconfig                              |   1 +
 drivers/power/Makefile                             |   1 +
 drivers/power/pwrseq/Kconfig                       |  20 +++
 drivers/power/pwrseq/Makefile                      |   2 +
 drivers/power/pwrseq/core.c                        |  62 ++++++++
 drivers/power/pwrseq/pwrseq_generic.c              | 168 +++++++++++++++++++++
 drivers/usb/chipidea/core.c                        |  11 ++
 drivers/usb/core/Makefile                          |   1 +
 drivers/usb/core/hub.c                             |  12 +-
 drivers/usb/core/hub.h                             |  12 ++
 drivers/usb/core/pwrseq.c                          | 100 ++++++++++++
 include/linux/power/pwrseq.h                       |  47 ++++++
 16 files changed, 513 insertions(+), 17 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/power/pwrseq/pwrseq-generic.txt
 create mode 100644 drivers/power/pwrseq/Kconfig
 create mode 100644 drivers/power/pwrseq/Makefile
 create mode 100644 drivers/power/pwrseq/core.c
 create mode 100644 drivers/power/pwrseq/pwrseq_generic.c
 create mode 100644 drivers/usb/core/pwrseq.c
 create mode 100644 include/linux/power/pwrseq.h
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH v5 1/6 binding-doc: power: pwrseq-generic: add binding doc for generic power sequence library

Add binding doc for generic power sequence library.

---
 .../bindings/power/pwrseq/pwrseq-generic.txt       | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/power/pwrseq/pwrseq-generic.txt
Documentation/devicetree/bindings/power/pwrseq/pwrseq-generic.txt new file +48 -0
new file mode 100644
index 0000000..ebf0d47
@@ -0,0 +1,48 @@
+The generic power sequence library
+
+Some hard-wired devices (eg USB/MMC) need to do power sequence before
+the device can be enumerated on the bus, the typical power sequence
+like: enable USB PHY clock, toggle reset pin, etc. But current
+Linux device driver lacks of such code to do it, it may cause some
+hard-wired devices works abnormal or can't be recognized by
+controller at all. The power sequence will be done before this device
+can be found at the bus.
+
+The power sequence properties is under the device node.
+
+Optional properties:
+- clocks: the input clocks for device.
+- reset-gpios: Should specify the GPIO for reset.
+- reset-duration-us: the duration in microsecond for assert reset signal.
+
+Below is the example of USB power sequence properties on USB device
+nodes which have two level USB hubs.
+
+&usbotg1 {
+	vbus-supply = <&reg_usb_otg1_vbus>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usb_otg1_id>;
+	status = "okay";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+	genesys: hub at 1 {
+		compatible = "usb5e3,608";
+		reg = <1>;
+
+		clocks = <&clks IMX6SX_CLK_CKO>;
+		reset-gpios = <&gpio4 5 GPIO_ACTIVE_LOW>; /* hub reset pin */
+		reset-duration-us = <10>;
+
+		#address-cells = <1>;
+		#size-cells = <0>;
+		asix: ethernet at 1 {
+			compatible = "usbb95,1708";
+			reg = <1>;
+
+			clocks = <&clks IMX6SX_CLK_IPG>;
+			reset-gpios = <&gpio4 6 GPIO_ACTIVE_LOW>; /* ethernet_rst */
+			reset-duration-us = <15>;
+		};
+	};
+};
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH v5 2/6 power: add power sequence library

In reply to Peter Chen

We have an well-known problem that the device needs to do some power sequence before it can be recognized by related host, the typical example like hard-wired mmc devices and usb devices.

This power sequence is hard to be described at device tree and handled by related host driver, so we have created a common power sequence library to cover this requirement. The core code has supplied some common helpers for host driver, and individual power sequence libraries handle kinds of power sequence for devices.

pwrseq_generic is intended for general purpose of power sequence, which handles gpios and clocks currently, and can cover regulator and pinctrl in future. The host driver calls pwrseq_alloc_generic to create an generic pwrseq instance.

Tested-by Joshua Clayton <[email protected]>

---
 MAINTAINERS                           |   9 ++
 drivers/power/Kconfig                 |   1 +
 drivers/power/Makefile                |   1 +
 drivers/power/pwrseq/Kconfig          |  20 ++++
 drivers/power/pwrseq/Makefile         |   2 +
 drivers/power/pwrseq/core.c           |  62 +++++++++++++
 drivers/power/pwrseq/pwrseq_generic.c | 168 ++++++++++++++++++++++++++++++++++
 include/linux/power/pwrseq.h          |  47 ++++++++++
 8 files changed, 310 insertions(+)
 create mode 100644 drivers/power/pwrseq/Kconfig
 create mode 100644 drivers/power/pwrseq/Makefile
 create mode 100644 drivers/power/pwrseq/core.c
 create mode 100644 drivers/power/pwrseq/pwrseq_generic.c
 create mode 100644 include/linux/power/pwrseq.h
MAINTAINERS +9 -0
index 1ae6c84..407254b 100644
@@ -9283,6 +9283,15 @@ F:	include/linux/pm_*
 F:	include/linux/powercap.h
 F:	drivers/powercap/
 
+POWER SEQUENCE LIBRARY
+M:	Peter Chen <[email protected]>
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
+L:	linux-pm at vger.kernel.org
+S:	Maintained
+F:	Documentation/devicetree/bindings/power/pwrseq/
+F:	drivers/power/pwrseq/
+F:	include/linux/power/pwrseq.h/
+
 POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 M:	Sebastian Reichel <[email protected]>
 M:	Dmitry Eremin-Solenikov <[email protected]>
drivers/power/Kconfig +1 -0
index acd4a15..f6aa4fd 100644
@@ -515,3 +515,4 @@ endif # POWER_SUPPLY
 
 source "drivers/power/reset/Kconfig"
 source "drivers/power/avs/Kconfig"
+source "drivers/power/pwrseq/Kconfig"
drivers/power/Makefile +1 -0
index e46b75d..4ed2e12 100644
@@ -74,3 +74,4 @@ obj-$(CONFIG_CHARGER_TPS65217)	+= tps65217_charger.o
 obj-$(CONFIG_POWER_RESET)	+= reset/
 obj-$(CONFIG_AXP288_FUEL_GAUGE) += axp288_fuel_gauge.o
 obj-$(CONFIG_AXP288_CHARGER)	+= axp288_charger.o
+obj-$(CONFIG_POWER_SEQUENCE)	+= pwrseq/
drivers/power/pwrseq/Kconfig new file +20 -0
new file mode 100644
index 0000000..188729e
@@ -0,0 +1,20 @@
+#
+# Power Sequence library
+#
+
+config POWER_SEQUENCE
+	bool
+
+menu "Power Sequence Support"
+
+config PWRSEQ_GENERIC
+	bool "Generic power sequence control"
+	depends on OF
+	select POWER_SEQUENCE
+	help
+	  It is used for drivers which needs to do power sequence
+	  (eg, turn on clock, toggle reset gpio) before the related
+	  devices can be found by hardware. This generic one can be
+	  used for common power sequence control.
+
+endmenu
drivers/power/pwrseq/Makefile new file +2 -0
new file mode 100644
index 0000000..ad82389
@@ -0,0 +1,2 @@
+obj-$(CONFIG_POWER_SEQUENCE) += core.o
+obj-$(CONFIG_PWRSEQ_GENERIC) += pwrseq_generic.o
drivers/power/pwrseq/core.c new file +62 -0

62 lines not on this page · raw message

drivers/power/pwrseq/pwrseq_generic.c new file +168 -0

168 lines not on this page · raw message

include/linux/power/pwrseq.h new file +47 -0

47 lines not on this page · raw message

Signature · 1 line
1.9.1
author
#4 lore raw

PATCH v5 3/6 binding-doc: usb: usb-device: add optional properties for power sequence

In reply to Peter Chen

Add optional properties for power sequence.

---
 Documentation/devicetree/bindings/usb/usb-device.txt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/usb/usb-device.txt +9 -1
index 1c35e7b..3661dd2 100644
@@ -13,6 +13,10 @@ Required properties:
 - reg: the port number which this device is connecting to, the range
   is 1-31.
 
+Optional properties:
+power sequence properties, see
+Documentation/devicetree/bindings/power/pwrseq/pwrseq-generic.txt for detail
+
 Example:
 
 &usb1 {
@@ -21,8 +25,12 @@ Example:
 	#address-cells = <1>;
 	#size-cells = <0>;
 
-	hub: genesys at 1 {
+	genesys: hub at 1 {
 		compatible = "usb5e3,608";
 		reg = <1>;
+
+		clocks = <&clks IMX6SX_CLK_CKO>;
+		reset-gpios = <&gpio4 5 GPIO_ACTIVE_LOW>; /* hub reset pin */
+		reset-duration-us = <10>;
 	};
 }
Signature · 1 line
1.9.1
author
#5 lore raw

PATCH v5 4/6 usb: core: add power sequence handling for USB devices

In reply to Peter Chen

Some hard-wired USB devices need to do power sequence to let the device work normally, the typical power sequence like: enable USB PHY clock, toggle reset pin, etc. But current Linux USB driver lacks of such code to do it, it may cause some hard-wired USB devices works abnormal or can't be recognized by controller at all.

In this patch, it calls power sequence library APIs to finish the power sequence events. At first, it calls pwrseq_alloc_generic to create a generic power sequence instance, then it will do power on sequence at hub's probe for all devices under this hub (includes root hub).

At hub_disconnect, it will do power off sequence which is at powered on list.

Tested-by Joshua Clayton <[email protected]>

---
 drivers/usb/core/Makefile |   1 +
 drivers/usb/core/hub.c    |  12 ++++--
 drivers/usb/core/hub.h    |  12 ++++++
 drivers/usb/core/pwrseq.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 122 insertions(+), 3 deletions(-)
 create mode 100644 drivers/usb/core/pwrseq.c
drivers/usb/core/Makefile +1 -0
index 9780877..39f2149 100644
@@ -9,5 +9,6 @@ usbcore-y += port.o of.o
 
 usbcore-$(CONFIG_PCI)		+= hcd-pci.o
 usbcore-$(CONFIG_ACPI)		+= usb-acpi.o
+usbcore-$(CONFIG_PWRSEQ_GENERIC) += pwrseq.o
 
 obj-$(CONFIG_USB)		+= usbcore.o
drivers/usb/core/hub.c +9 -3
index bee1351..a346a8b 100644
@@ -1700,6 +1700,7 @@ static void hub_disconnect(struct usb_interface *intf)
 	hub->error = 0;
 	hub_quiesce(hub, HUB_DISCONNECT);
 
+	hub_pwrseq_off(hub);
 	mutex_lock(&usb_port_peer_mutex);
 
 	/* Avoid races with recursively_mark_NOTATTACHED() */
@@ -1733,6 +1734,7 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
 	struct usb_endpoint_descriptor *endpoint;
 	struct usb_device *hdev;
 	struct usb_hub *hub;
+	int ret = -ENODEV;
 
 	desc = intf->cur_altsetting;
 	hdev = interface_to_usbdev(intf);
@@ -1839,6 +1841,7 @@ descriptor_error:
 	INIT_DELAYED_WORK(&hub->leds, led_work);
 	INIT_DELAYED_WORK(&hub->init_work, NULL);
 	INIT_WORK(&hub->events, hub_event);
+	INIT_LIST_HEAD(&hub->pwrseq_on_list);
 	usb_get_intf(intf);
 	usb_get_dev(hdev);
 
@@ -1852,11 +1855,14 @@ descriptor_error:
 	if (id->driver_info & HUB_QUIRK_CHECK_PORT_AUTOSUSPEND)
 		hub->quirk_check_port_auto_suspend = 1;
 
-	if (hub_configure(hub, endpoint) >= 0)
-		return 0;
+	if (hub_configure(hub, endpoint) >= 0) {
+		ret = hub_pwrseq_on(hub);
+		if (!ret)
+			return 0;
+	}
 
 	hub_disconnect(intf);
-	return -ENODEV;
+	return ret;
 }
 
 static int
drivers/usb/core/hub.h +12 -0
index 34c1a7e..9473f6f 100644
@@ -78,6 +78,7 @@ struct usb_hub {
 	struct delayed_work	init_work;
 	struct work_struct      events;
 	struct usb_port		**ports;
+	struct list_head	pwrseq_on_list; /* powered pwrseq node list */
 };
 
 /**
@@ -166,3 +167,14 @@ static inline int hub_port_debounce_be_stable(struct usb_hub *hub,
 {
 	return hub_port_debounce(hub, port1, false);
 }
+
+#if IS_ENABLED(CONFIG_PWRSEQ_GENERIC)
+int hub_pwrseq_on(struct usb_hub *hub);
+void hub_pwrseq_off(struct usb_hub *hub);
+#else
+static inline int hub_pwrseq_on(struct usb_hub *hub)
+{
+	return 0;
+}
+static inline void hub_pwrseq_off(struct usb_hub *hub) {}
+#endif /* CONFIG_PWRSEQ_GENERIC */
drivers/usb/core/pwrseq.c new file +100 -0

100 lines not on this page · raw message

Signature · 1 line
1.9.1
author
#6 lore raw

PATCH v5 5/6 usb: chipidea: let chipidea core device of_node equal's glue layer device of_node

In reply to Peter Chen

From: Peter Chen <[email protected]>

At device tree, we have no device node for chipidea core, the glue layer's node is the parent node for host and udc device. But in related driver, the parent device is chipidea core. So, in order to let the common driver get parent's node, we let the core's device node equals glue layer device node.

Tested-by Joshua Clayton <[email protected]>

---
 drivers/usb/chipidea/core.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/usb/chipidea/core.c +11 -0
index 69426e6..b189dc7 100644
@@ -954,6 +954,15 @@ static int ci_hdrc_probe(struct platform_device *pdev)
 		dev_err(dev, "unable to init phy: %d\n", ret);
 		return ret;
 	}
+	/*
+	 * At device tree, we have no device node for chipidea core,
+	 * the glue layer's node is the parent node for host and udc
+	 * device. But in related driver, the parent device is chipidea
+	 * core. So, in order to let the common driver get parent's node,
+	 * we let the core's device node equals glue layer's node.
+	 */
+	if (dev->parent && dev->parent->of_node)
+		dev->of_node = dev->parent->of_node;
 
 	ci->hw_bank.phys = res->start;
 
@@ -1057,6 +1066,7 @@ static int ci_hdrc_probe(struct platform_device *pdev)
 stop:
 	ci_role_destroy(ci);
 deinit_phy:
+	dev->of_node = NULL;
 	ci_usb_phy_exit(ci);
 
 	return ret;
@@ -1076,6 +1086,7 @@ static int ci_hdrc_remove(struct platform_device *pdev)
 	ci_extcon_unregister(ci);
 	ci_role_destroy(ci);
 	ci_hdrc_enter_lpm(ci, true);
+	ci->dev->of_node = NULL;
 	ci_usb_phy_exit(ci);
 
 	return 0;
Signature · 1 line
1.9.1
author
#11 lore raw

PATCH v5 6/6 ARM: dts: imx6qdl-udoo.dtsi: fix onboard USB HUB property

In reply to Peter Chen

The current dts describes USB HUB's property at USB controller's entry, it is improper. The USB HUB should be the child node under USB controller, and power sequence properties are under it.

---
 arch/arm/boot/dts/imx6qdl-udoo.dtsi | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
arch/arm/boot/dts/imx6qdl-udoo.dtsi +13 -13
index 3bee2f9..f29a72c2f 100644
@@ -9,6 +9,8 @@
  *
  */
 
+#include <dt-bindings/gpio/gpio.h>
+
 / {
 	aliases {
 		backlight = &backlight;
@@ -58,17 +60,6 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		reg_usb_h1_vbus: regulator at 0 {
-			compatible = "regulator-fixed";
-			reg = <0>;
-			regulator-name = "usb_h1_vbus";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			enable-active-high;
-			startup-delay-us = <2>; /* USB2415 requires a POR of 1 us minimum */
-			gpio = <&gpio7 12 0>;
-		};
-
 		reg_panel: regulator at 1 {
 			compatible = "regulator-fixed";
 			reg = <1>;
@@ -259,9 +250,18 @@
 &usbh1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbh>;
-	vbus-supply = <&reg_usb_h1_vbus>;
-	clocks = <&clks IMX6QDL_CLK_CKO>;
 	status = "okay";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+	usb2415: hub at 1 {
+		compatible = "usb424,2514";
+		reg = <1>;
+
+		clocks = <&clks IMX6QDL_CLK_CKO>;
+		reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
+		reset-duration-us = <3000>;
+	};
 };
 
 &usdhc3 {
Signature · 1 line
1.9.1
Reviewed-by Tested-by on v5 2/6
#3 lore raw
In reply to Peter Chen

El Mon, Aug 08, 2016 at 04:52:07PM +0800 Peter Chen ha dit:

Quoted 10 lines

We have an well-known problem that the device needs to do some power sequence before it can be recognized by related host, the typical example like hard-wired mmc devices and usb devices.

This power sequence is hard to be described at device tree and handled by related host driver, so we have created a common power sequence library to cover this requirement. The core code has supplied some common helpers for host driver, and individual power sequence libraries handle kinds of power sequence for devices.

Quoted 7 lines

pwrseq_generic is intended for general purpose of power sequence, which handles gpios and clocks currently, and can cover regulator and pinctrl in future. The host driver calls pwrseq_alloc_generic to create an generic pwrseq instance.

Tested-by Joshua Clayton <[email protected]>

#12 lore raw

Re: [PATCH v5 6/6] ARM: dts: imx6qdl-udoo.dtsi: fix onboard USB HUB property

In reply to Peter Chen

Hi Peter,

Quoted 42 lines · Peter Chen

The current dts describes USB HUB's property at USB controller's entry, it is improper. The USB HUB should be the child node under USB controller, and power sequence properties are under it.

---
 arch/arm/boot/dts/imx6qdl-udoo.dtsi | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
arch/arm/boot/dts/imx6qdl-udoo.dtsi +2 -11
index 3bee2f9..f29a72c2f 100644
@@ -9,6 +9,8 @@
  *
  */
 
+#include <dt-bindings/gpio/gpio.h>
+
 / {
 	aliases {
 		backlight = &backlight;
@@ -58,17 +60,6 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		reg_usb_h1_vbus: regulator at 0 {
-			compatible = "regulator-fixed";
-			reg = <0>;
-			regulator-name = "usb_h1_vbus";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			enable-active-high;
-			startup-delay-us = <2>; /* USB2415 requires a POR of 1 us minimum */
-			gpio = <&gpio7 12 0>;
-		};
-
 		reg_panel: regulator at 1 {
 			compatible = "regulator-fixed";
 			reg = <1>;

arch/arm/boot/dts/imx6qdl-udoo.dtsi line 256

Quoted 9 lines
arch/arm/boot/dts/imx6qdl-udoo.dtsi +3 -2
@@ -259,9 +250,18 @@
 &usbh1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbh>;
-	vbus-supply = <&reg_usb_h1_vbus>;
-	clocks = <&clks IMX6QDL_CLK_CKO>;
 	status = "okay";
+
+	#address-cells = <1>;
+	#size-cells = <0>;

Assuming they are needed,
#address-cells and #size-cells should go in imx6qdl.dtsi, rather than in board dts files, shouldn't they?

arch/arm/boot/dts/imx6qdl-udoo.dtsi line 259

Quoted 3 lines
arch/arm/boot/dts/imx6qdl-udoo.dtsi +3 -0
+	usb2415: hub at 1 {
+		compatible = "usb424,2514";
+		reg = <1>;

Does <reg> have any effect?
I couldn't find any reference to it in the patches. (so apologies if it is in core code)
Does it matter? Would it be possible to connect more than one hub to the same usb phy?

Quoted 8 lines
arch/arm/boot/dts/imx6qdl-udoo.dtsi +5 -0
+
+		clocks = <&clks IMX6QDL_CLK_CKO>;
+		reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
+		reset-duration-us = <3000>;
+	};
 };
 
 &usdhc3 {
#7 lore raw

Re: [PATCH v5 5/6] usb: chipidea: let chipidea core device of_node equal's glue layer device of_node

In reply to Peter Chen

Quoting Peter Chen (2016-08-08 01:52:10)

Quoted 22 lines

From: Peter Chen <[email protected]>

At device tree, we have no device node for chipidea core, the glue layer's node is the parent node for host and udc device. But in related driver, the parent device is chipidea core. So, in order to let the common driver get parent's node, we let the core's device node equals glue layer device node.

Tested-by Joshua Clayton <[email protected]>

---
 drivers/usb/chipidea/core.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/usb/chipidea/core.c +0 -0
index 69426e6..b189dc7 100644
@@ -954,6 +954,15 @@ static int ci_hdrc_probe(struct platform_device *pdev)
                dev_err(dev, "unable to init phy: %d\n", ret);
                return ret;

drivers/usb/chipidea/core.c static int ci_hdrc_probe(struct platform_device *pdev) · line 965

Quoted 10 lines
drivers/usb/chipidea/core.c +9 -0
        }
+       /*
+        * At device tree, we have no device node for chipidea core,
+        * the glue layer's node is the parent node for host and udc
+        * device. But in related driver, the parent device is chipidea
+        * core. So, in order to let the common driver get parent's node,
+        * we let the core's device node equals glue layer's node.
+        */
+       if (dev->parent && dev->parent->of_node)
+               dev->of_node = dev->parent->of_node;

Can this be done earlier? Perhaps after hw_device_init() in this probe routine? That would allow me to remove the awkward parent searching in my ULPI DT awareness patch.

#13 lore raw

Re: [PATCH v5 6/6] ARM: dts: imx6qdl-udoo.dtsi: fix onboard USB HUB property

In reply to Joshua Clayton
Quoted 49 lines · Joshua Clayton

Hi Peter,

Quoted 46 lines · Peter Chen

The current dts describes USB HUB's property at USB controller's entry, it is improper. The USB HUB should be the child node under USB controller, and power sequence properties are under it.

---
 arch/arm/boot/dts/imx6qdl-udoo.dtsi | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
arch/arm/boot/dts/imx6qdl-udoo.dtsi +2 -12
index 3bee2f9..f29a72c2f 100644
@@ -9,6 +9,8 @@
  *
  */
 
+#include <dt-bindings/gpio/gpio.h>
+
 / {
 	aliases {
 		backlight = &backlight;
@@ -58,17 +60,6 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		reg_usb_h1_vbus: regulator at 0 {
-			compatible = "regulator-fixed";
-			reg = <0>;
-			regulator-name = "usb_h1_vbus";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			enable-active-high;
-			startup-delay-us = <2>; /* USB2415 requires a POR of 1 us minimum */
-			gpio = <&gpio7 12 0>;
-		};
-
 		reg_panel: regulator at 1 {
 			compatible = "regulator-fixed";
 			reg = <1>;
@@ -259,9 +250,18 @@
 &usbh1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbh>;
-	vbus-supply = <&reg_usb_h1_vbus>;
Quoted 8 lines

arch/arm/boot/dts/imx6qdl-udoo.dtsi line 256

Quoted 5 lines
arch/arm/boot/dts/imx6qdl-udoo.dtsi +3 -1
-	clocks = <&clks IMX6QDL_CLK_CKO>;
 	status = "okay";
+
+	#address-cells = <1>;
+	#size-cells = <0>;

Assuming they are needed,
#address-cells and #size-cells should go in imx6qdl.dtsi, rather than in board dts files, shouldn't they?

Yes, you are right. All imx USB controller has only one port.

Quoted 7 lines

arch/arm/boot/dts/imx6qdl-udoo.dtsi line 259

Quoted 3 lines
arch/arm/boot/dts/imx6qdl-udoo.dtsi +3 -0
+	usb2415: hub at 1 {
+		compatible = "usb424,2514";
+		reg = <1>;

Does <reg> have any effect?
I couldn't find any reference to it in the patches. (so apologies if it is in core code)
Does it matter?

Please see 69bec7259853 ("USB: core: let USB device know device node") for detail.

Quoted 2 lines

Would it be possible to connect
more than one hub to the same usb phy?

No possible for current imx, but possible for other SoCs.

Signature · 2 lines
Best Regards,
Peter Chen
#8 lore raw

Re: [PATCH v5 5/6] usb: chipidea: let chipidea core device of_node equal's glue layer device of_node

In reply to Stephen Boyd
Quoted 29 lines · Stephen Boyd

Quoting Peter Chen (2016-08-08 01:52:10)

Quoted 28 lines

From: Peter Chen <[email protected]>

At device tree, we have no device node for chipidea core, the glue layer's node is the parent node for host and udc device. But in related driver, the parent device is chipidea core. So, in order to let the common driver get parent's node, we let the core's device node equals glue layer device node.

Tested-by Joshua Clayton <[email protected]>

---
 drivers/usb/chipidea/core.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/usb/chipidea/core.c +5 -0
index 69426e6..b189dc7 100644
@@ -954,6 +954,15 @@ static int ci_hdrc_probe(struct platform_device *pdev)
                dev_err(dev, "unable to init phy: %d\n", ret);
                return ret;
        }
+       /*
+        * At device tree, we have no device node for chipidea core,
+        * the glue layer's node is the parent node for host and udc
+        * device. But in related driver, the parent device is chipidea
+        * core. So, in order to let the common driver get parent's node,
Quoted 8 lines

drivers/usb/chipidea/core.c static int ci_hdrc_probe(struct platform_device *pdev) · line 965

Quoted 4 lines
drivers/usb/chipidea/core.c +4 -0
+        * we let the core's device node equals glue layer's node.
+        */
+       if (dev->parent && dev->parent->of_node)
+               dev->of_node = dev->parent->of_node;

Can this be done earlier? Perhaps after hw_device_init() in this probe routine? That would allow me to remove the awkward parent searching in my ULPI DT awareness patch.

The reason why I locate it there is to avoid "goto label" for error path during PHY's get and initialization operation.

Ok, to simplify your work, I will change it at next version.

Signature · 2 lines
Best Regards,
Peter Chen
#9 lore raw

RE: [PATCH v5 5/6] usb: chipidea: let chipidea core device of_node equal's glue layer device of_node

Hi, Peter

Quoted 57 lines

-----Original Message-----
From: linux-usb-owner at vger.kernel.org [mailto:linux-usb-
owner at vger.kernel.org] On Behalf Of Peter Chen
Sent: Wednesday, August 10, 2016 11:12 AM
To: Stephen Boyd <[email protected]>
Cc: Peter Chen <[email protected]>; gregkh at linuxfoundation.org; stern at rowland.harvard.edu; ulf.hansson at linaro.org; broonie at kernel.org; sre at kernel.org; robh+dt at kernel.org; shawnguo at kernel.org; dbaryshkov at gmail.com; dwmw3 at infradead.org; k.kozlowski at samsung.com; linux- arm-kernel at lists.infradead.org; p.zabel at pengutronix.de; devicetree at vger.kernel.org; pawel.moll at arm.com; mark.rutland at arm.com; linux-usb at vger.kernel.org; arnd at arndb.de; s.hauer at pengutronix.de; mail at maciej.szmigiero.name; troy.kisky at boundarydevices.com; festevam at gmail.com; oscar at naiandei.net; linux-pm at vger.kernel.org; stillcompiling at gmail.com; linux-kernel at vger.kernel.org; mka at chromium.org; Peter Chen <[email protected]>
Subject: Re: [PATCH v5 5/6] usb: chipidea: let chipidea core device of_node equal's glue layer device of_node

Quoted 16 lines · Stephen Boyd

Quoting Peter Chen (2016-08-08 01:52:10)

Quoted 15 lines

From: Peter Chen <[email protected]>

At device tree, we have no device node for chipidea core, the glue layer's node is the parent node for host and udc device. But in related driver, the parent device is chipidea core. So, in order to let the common driver get parent's node, we let the core's device node equals glue layer device node.

Tested-by Joshua Clayton <[email protected]>

---
 drivers/usb/chipidea/core.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
Quoted 5 lines

drivers/usb/chipidea/core.c static int ci_hdrc_probe(struct platform_device

Quoted 5 lines
(quoted diff) +0 -0

b/drivers/usb/chipidea/core.c index 69426e6..b189dc7 100644

drivers/usb/chipidea/core.c +0 -0
@@ -954,6 +954,15 @@ static int ci_hdrc_probe(struct platform_device

*pdev)

Quoted 7 lines

drivers/usb/chipidea/core.c static int ci_hdrc_probe(struct platform_device *pdev)

Quoted 7 lines
drivers/usb/chipidea/core.c +4 -0
                dev_err(dev, "unable to init phy: %d\n", ret);
                return ret;
        }
+       /*
+        * At device tree, we have no device node for chipidea core,
+        * the glue layer's node is the parent node for host and udc
+        * device. But in related driver, the parent device is

chipidea

Quoted 1 line

drivers/usb/chipidea/core.c static int ci_hdrc_probe(struct platform_device · line 961

Quoted 1 line
drivers/usb/chipidea/core.c +1 -0
+        * core. So, in order to let the common driver get parent's

node,

Quoted 5 lines
Quoted 4 lines
drivers/usb/chipidea/core.c +4 -0
+        * we let the core's device node equals glue layer's node.
+        */
+       if (dev->parent && dev->parent->of_node)
+               dev->of_node = dev->parent->of_node;
Quoted 8 lines
Quoted 3 lines

Can this be done earlier? Perhaps after hw_device_init() in this probe routine? That would allow me to remove the awkward parent searching in my ULPI DT awareness patch.

The reason why I locate it there is to avoid "goto label" for error path during PHY's get and initialization operation.

Ok, to simplify your work, I will change it at next version.

As iommu need this to be done even more earlier, will you consider to put it before adding the core's platform device?

Li Jun

Quoted 9 lines

--

Best Regards,
Peter Chen
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo at vger.kernel.org More majordomo info at
http://vger.kernel.org/majordomo-info.html

#10 lore raw

Re: [PATCH v5 5/6] usb: chipidea: let chipidea core device of_node equal's glue layer device of_node

Quoted 63 lines · Jun Li

Hi, Peter

Quoted 61 lines

-----Original Message-----
From: linux-usb-owner at vger.kernel.org [mailto:linux-usb-
owner at vger.kernel.org] On Behalf Of Peter Chen
Sent: Wednesday, August 10, 2016 11:12 AM
To: Stephen Boyd <[email protected]>
Cc: Peter Chen <[email protected]>; gregkh at linuxfoundation.org; stern at rowland.harvard.edu; ulf.hansson at linaro.org; broonie at kernel.org; sre at kernel.org; robh+dt at kernel.org; shawnguo at kernel.org; dbaryshkov at gmail.com; dwmw3 at infradead.org; k.kozlowski at samsung.com; linux- arm-kernel at lists.infradead.org; p.zabel at pengutronix.de; devicetree at vger.kernel.org; pawel.moll at arm.com; mark.rutland at arm.com; linux-usb at vger.kernel.org; arnd at arndb.de; s.hauer at pengutronix.de; mail at maciej.szmigiero.name; troy.kisky at boundarydevices.com; festevam at gmail.com; oscar at naiandei.net; linux-pm at vger.kernel.org; stillcompiling at gmail.com; linux-kernel at vger.kernel.org; mka at chromium.org; Peter Chen <[email protected]>
Subject: Re: [PATCH v5 5/6] usb: chipidea: let chipidea core device of_node equal's glue layer device of_node

Quoted 16 lines · Stephen Boyd

Quoting Peter Chen (2016-08-08 01:52:10)

Quoted 15 lines

From: Peter Chen <[email protected]>

At device tree, we have no device node for chipidea core, the glue layer's node is the parent node for host and udc device. But in related driver, the parent device is chipidea core. So, in order to let the common driver get parent's node, we let the core's device node equals glue layer device node.

Tested-by Joshua Clayton <[email protected]>

---
 drivers/usb/chipidea/core.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
Quoted 5 lines

drivers/usb/chipidea/core.c static int ci_hdrc_probe(struct platform_device

Quoted 5 lines
(quoted diff) +0 -0

b/drivers/usb/chipidea/core.c index 69426e6..b189dc7 100644

drivers/usb/chipidea/core.c +0 -0
@@ -954,6 +954,15 @@ static int ci_hdrc_probe(struct platform_device

*pdev)

Quoted 7 lines

drivers/usb/chipidea/core.c static int ci_hdrc_probe(struct platform_device *pdev)

Quoted 7 lines
drivers/usb/chipidea/core.c +4 -0
                dev_err(dev, "unable to init phy: %d\n", ret);
                return ret;
        }
+       /*
+        * At device tree, we have no device node for chipidea core,
+        * the glue layer's node is the parent node for host and udc
+        * device. But in related driver, the parent device is

chipidea

Quoted 1 line

drivers/usb/chipidea/core.c static int ci_hdrc_probe(struct platform_device · line 961

Quoted 1 line
drivers/usb/chipidea/core.c +1 -0
+        * core. So, in order to let the common driver get parent's

node,

Quoted 8 lines

drivers/usb/chipidea/core.c static int ci_hdrc_probe(struct platform_device *pdev) · line 965

Quoted 4 lines
drivers/usb/chipidea/core.c +4 -0
+        * we let the core's device node equals glue layer's node.
+        */
+       if (dev->parent && dev->parent->of_node)
+               dev->of_node = dev->parent->of_node;

Can this be done earlier? Perhaps after hw_device_init() in this probe routine? That would allow me to remove the awkward parent searching in my ULPI DT awareness patch.

Quoted 8 lines
Quoted 4 lines

The reason why I locate it there is to avoid "goto label" for error path during PHY's get and initialization operation.

Ok, to simplify your work, I will change it at next version.

As iommu need this to be done even more earlier, will you consider to put it before adding the core's platform device?

I can't do it, it will introduce another issue that the pinctrl has already requested by parents. The warning is similar like below, but occurs at the probe.

http://lkml.iu.edu/hypermail/linux/kernel/1607.2/03150.html

I will see how iommu support can be added for platform devices which are created by runtime (like chipidea core device).

Signature · 2 lines
Best Regards,
Peter Chen
#14 lore raw

PATCH 1/1 ARM: dts: update udoo and evi hubs to use pwrseq

In reply to Peter Chen

Hi Peter,

Consider this my attempt to squeeze my own dts into your patch series. These patches repalce patch 6 in V5. of the usb pwrseq series
I adding a #address and #size to imx6qdl.dtsi in patch 1
and remove those lines from imx6qdl-udoo.dtsi in patch 2 (formerly patch 6) Finally I make the change in imx6q-evi.dts and hope is can be slipped into the series with the others.

Thanks, Joshua

#15 lore raw

PATCH 1/3 ARM: dts: imx6qdl: Enable usb node children with <reg>

Give usb nodes #address and #size attributes, so that a child node representing a permanently connected device such as an onboard hub may be addressed with a <reg> attribute

---
 arch/arm/boot/dts/imx6qdl.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/boot/dts/imx6qdl.dtsi +6 -0
index ed613eb..9b1ec83 100644
@@ -934,6 +934,8 @@
 
 			usbh1: usb at 02184200 {
 				compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
+				#address-cells = <1>;
+				#size-cells = <0>;
 				reg = <0x02184200 0x200>;
 				interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX6QDL_CLK_USBOH3>;
@@ -948,6 +950,8 @@
 
 			usbh2: usb at 02184400 {
 				compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
+				#address-cells = <1>;
+				#size-cells = <0>;
 				reg = <0x02184400 0x200>;
 				interrupts = <0 41 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX6QDL_CLK_USBOH3>;
@@ -961,6 +965,8 @@
 
 			usbh3: usb at 02184600 {
 				compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
+				#address-cells = <1>;
+				#size-cells = <0>;
 				reg = <0x02184600 0x200>;
 				interrupts = <0 42 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX6QDL_CLK_USBOH3>;
Signature · 1 line
2.7.4
#16 lore raw

PATCH 2/3 ARM: dts: imx6qdl-udoo.dtsi: fix onboard USB HUB property

In reply to Joshua Clayton

From: Peter Chen <[email protected]>

The current dts describes USB HUB's property at USB controller's entry, it is improper. The USB HUB should be the child node under USB controller, and power sequence properties are under it.

---
 arch/arm/boot/dts/imx6qdl-udoo.dtsi | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)
arch/arm/boot/dts/imx6qdl-udoo.dtsi +11 -13
index 3bee2f9..44b2a24 100644
@@ -9,6 +9,8 @@
  *
  */
 
+#include <dt-bindings/gpio/gpio.h>
+
 / {
 	aliases {
 		backlight = &backlight;
@@ -58,17 +60,6 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		reg_usb_h1_vbus: regulator at 0 {
-			compatible = "regulator-fixed";
-			reg = <0>;
-			regulator-name = "usb_h1_vbus";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			enable-active-high;
-			startup-delay-us = <2>; /* USB2415 requires a POR of 1 us minimum */
-			gpio = <&gpio7 12 0>;
-		};
-
 		reg_panel: regulator at 1 {
 			compatible = "regulator-fixed";
 			reg = <1>;
@@ -259,9 +250,16 @@
 &usbh1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbh>;
-	vbus-supply = <&reg_usb_h1_vbus>;
-	clocks = <&clks IMX6QDL_CLK_CKO>;
 	status = "okay";
+
+	usb2415: hub at 1 {
+		compatible = "usb424,2514";
+		reg = <1>;
+
+		clocks = <&clks IMX6QDL_CLK_CKO>;
+		reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
+		reset-duration-us = <3000>;
+	};
 };
 
 &usdhc3 {
Signature · 1 line
2.7.4
#17 lore raw

PATCH 3/3 ARM: dts: imx6q-evi: Fix onboard hub reset line

In reply to Joshua Clayton

Previously the onboard hub was made to work by treating its reset gpio as a regulator enable.
Get rid of that kludge now that pwseq has added reset gpio support Move pin muxing the hub reset pin into the usbh1 group

---
 arch/arm/boot/dts/imx6q-evi.dts | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)
arch/arm/boot/dts/imx6q-evi.dts +7 -18
index 4fa5601..49c6f61 100644
@@ -54,18 +54,6 @@
 		reg = <0x10000000 0x40000000>;
 	};
 
-	reg_usbh1_vbus: regulator-usbhubreset {
-		compatible = "regulator-fixed";
-		regulator-name = "usbh1_vbus";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		enable-active-high;
-		startup-delay-us = <2>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_usbh1_hubreset>;
-		gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>;
-	};
-
 	reg_usb_otg_vbus: regulator-usbotgvbus {
 		compatible = "regulator-fixed";
 		regulator-name = "usb_otg_vbus";
@@ -204,12 +192,18 @@
 };
 
 &usbh1 {
-	vbus-supply = <&reg_usbh1_vbus>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbh1>;
 	dr_mode = "host";
 	disable-over-current;
 	status = "okay";
+
+	usb2415host: hub at 1 {
+		compatible = "usb424,2513";
+		reg = <1>;
+		reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
+		reset-duration-us = <3000>;
+	};
 };
 
 &usbotg {
@@ -467,11 +461,6 @@
 			MX6QDL_PAD_GPIO_3__USB_H1_OC 0x1b0b0
 			/* usbh1_b OC */
 			MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0
-		>;
-	};
-
-	pinctrl_usbh1_hubreset: usbh1hubresetgrp {
-		fsl,pins = <
 			MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x1b0b0
 		>;
 	};
Signature · 1 line
2.7.4
#20 lore raw

Re: [PATCHES] ARM: dts: update udoo and evi hubs to use pwrseq

In reply to Joshua Clayton
Quoted 10 lines · Joshua Clayton

Hi Peter,

Consider this my attempt to squeeze my own dts into your patch series. These patches repalce patch 6 in V5. of the usb pwrseq series
I adding a #address and #size to imx6qdl.dtsi in patch 1
and remove those lines from imx6qdl-udoo.dtsi in patch 2 (formerly patch 6) Finally I make the change in imx6q-evi.dts and hope is can be slipped into the series with the others.

Thanks, I will send them at next revision

Signature · 2 lines
Best Regards,
Peter Chen
#18 lore raw

Re: [PATCH 3/3] ARM: dts: imx6q-evi: Fix onboard hub reset line

In reply to Joshua Clayton
Quoted 54 lines · Joshua Clayton

Previously the onboard hub was made to work by treating its reset gpio as a regulator enable.
Get rid of that kludge now that pwseq has added reset gpio support Move pin muxing the hub reset pin into the usbh1 group

---
 arch/arm/boot/dts/imx6q-evi.dts | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)
arch/arm/boot/dts/imx6q-evi.dts +7 -13
index 4fa5601..49c6f61 100644
@@ -54,18 +54,6 @@
 		reg = <0x10000000 0x40000000>;
 	};
 
-	reg_usbh1_vbus: regulator-usbhubreset {
-		compatible = "regulator-fixed";
-		regulator-name = "usbh1_vbus";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		enable-active-high;
-		startup-delay-us = <2>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_usbh1_hubreset>;
-		gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>;
-	};
-
 	reg_usb_otg_vbus: regulator-usbotgvbus {
 		compatible = "regulator-fixed";
 		regulator-name = "usb_otg_vbus";
@@ -204,12 +192,18 @@
 };
 
 &usbh1 {
-	vbus-supply = <&reg_usbh1_vbus>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbh1>;
 	dr_mode = "host";
 	disable-over-current;
 	status = "okay";
+
+	usb2415host: hub at 1 {
+		compatible = "usb424,2513";
+		reg = <1>;
+		reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
+		reset-duration-us = <3000>;
+	};
 };
 
 &usbotg {

arch/arm/boot/dts/imx6q-evi.dts line 462

Quoted 2 lines
arch/arm/boot/dts/imx6q-evi.dts +0 -0
@@ -467,11 +461,6 @@
 			MX6QDL_PAD_GPIO_3__USB_H1_OC 0x1b0b0
 			/* usbh1_b OC */

This comment should be for above pin, do you mind I change it in this patch?

arch/arm/boot/dts/imx6q-evi.dts line 466

Quoted 9 lines
arch/arm/boot/dts/imx6q-evi.dts +0 -5
 			MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0
-		>;
-	};
-
-	pinctrl_usbh1_hubreset: usbh1hubresetgrp {
-		fsl,pins = <
 			MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x1b0b0
 		>;
 	};

This changes remind me that I need to change the same thing for udoo board.

Signature · 2 lines
Best Regards,
Peter Chen
#19 lore raw

Re: [PATCH 3/3] ARM: dts: imx6q-evi: Fix onboard hub reset line

Hi Peter,

Quoted 53 lines · Peter Chen
Quoted 52 lines · Joshua Clayton

Previously the onboard hub was made to work by treating its reset gpio as a regulator enable.
Get rid of that kludge now that pwseq has added reset gpio support Move pin muxing the hub reset pin into the usbh1 group

---
 arch/arm/boot/dts/imx6q-evi.dts | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)
arch/arm/boot/dts/imx6q-evi.dts +7 -13
index 4fa5601..49c6f61 100644
@@ -54,18 +54,6 @@
 		reg = <0x10000000 0x40000000>;
 	};
 
-	reg_usbh1_vbus: regulator-usbhubreset {
-		compatible = "regulator-fixed";
-		regulator-name = "usbh1_vbus";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		enable-active-high;
-		startup-delay-us = <2>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_usbh1_hubreset>;
-		gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>;
-	};
-
 	reg_usb_otg_vbus: regulator-usbotgvbus {
 		compatible = "regulator-fixed";
 		regulator-name = "usb_otg_vbus";
@@ -204,12 +192,18 @@
 };
 
 &usbh1 {
-	vbus-supply = <&reg_usbh1_vbus>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbh1>;
 	dr_mode = "host";
 	disable-over-current;
 	status = "okay";
+
+	usb2415host: hub at 1 {
+		compatible = "usb424,2513";
+		reg = <1>;
+		reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
+		reset-duration-us = <3000>;
+	};
 };
 
Quoted 6 lines

arch/arm/boot/dts/imx6q-evi.dts line 462

Quoted 4 lines
arch/arm/boot/dts/imx6q-evi.dts +0 -0
 &usbotg {
@@ -467,11 +461,6 @@
 			MX6QDL_PAD_GPIO_3__USB_H1_OC 0x1b0b0
 			/* usbh1_b OC */

This comment should be for above pin, do you mind I change it in this patch?

Better leave it alone

I checked te schematic. GPIO_0 (below that line) is indeed connected to a second OC detect line for a second usb port... It can't possibly be working as designed, but that is how it is connected up.

I guess I need to consult with my EE colleagues

Quoted 13 lines

arch/arm/boot/dts/imx6q-evi.dts line 466

Quoted 10 lines
arch/arm/boot/dts/imx6q-evi.dts +0 -5
 			MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0
-		>;
-	};
-
-	pinctrl_usbh1_hubreset: usbh1hubresetgrp {
-		fsl,pins = <
 			MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x1b0b0
 		>;
 	};

This changes remind me that I need to change the same thing for udoo board.

Sorry I didn't think of it first.