USB: misc: Add onboard_usb_hub driver
Subsystems (7)
v12 cover USB: misc: Add onboard_usb_hub driver
This series adds:
- the onboard_usb_hub_driver
- glue in the xhci-plat driver to create and destroy the onboard_usb_hub platform devices if needed
- a device tree binding for the Realtek RTS5411 USB hub controller
- device tree changes that add RTS5411 entries for the QCA SC7180 based boards trogdor and lazor
- a couple of stubs for platform device functions to avoid unresolved symbols with certain kernel configs
The main issue the driver addresses is that a USB hub needs to be powered before it can be discovered. For discrete onboard hubs (an example for such a hub is the Realtek RTS5411) this is often solved by supplying the hub with an 'always-on' regulator, which is kind of a hack. Some onboard hubs may require further initialization steps, like changing the state of a GPIO or enabling a clock, which requires even more hacks. This driver creates a platform device representing the hub which performs the necessary initialization. Currently it only supports switching on a single regulator, support for multiple regulators or other actions can be added as needed. Different initialization sequences can be supported based on the compatible string.
Besides performing the initialization the driver can be configured to power the hub off during system suspend. This can help to extend battery life on battery powered devices which have no requirements to keep the hub powered during suspend. The driver can also be configured to leave the hub powered when a wakeup capable USB device is connected when suspending, and power it off otherwise.
Changes in v12:
- onboard_hub driver: use IS_ENABLED(CONFIG_USB_ONBOARD_HUB_MODULE) in onboard_hub.h to also check for the driver built as module
- onboard_hub_driver: include onboard_hub.h again to make sure there are prototype declarations for the public functions
Changes in v11:
- support multiple onboard hubs connected to the same parent
- don't include ‘onboard_hub.h’ from the onboard hub driver
Changes in v10:
- always use of_is_onboard_usb_hub() stub unless ONBOARD_USB_HUB=y/m
- keep 'regulator-boot-on' property for pp3300_hub
Changes in v9:
- added dependency on ONBOARD_USB_HUB (or !!ONBOARD_USB_HUB) to USB_PLATFORM_XHCI
Changes in v7:
- updated DT binding
- series rebased on qcom/arm64-for-5.13
Changes in v6:
- updated summary
Changes in v5:
- cover letter added
Matthias Kaehlcke (5):
dt-bindings: usb: Add binding for Realtek RTS5411 hub controller
USB: misc: Add onboard_usb_hub driver
of/platform: Add stubs for of_platform_device_create/destroy()
usb: host: xhci-plat: Create platform device for onboard hubs in
probe()
arm64: dts: qcom: sc7180-trogdor: Add nodes for onboard USB hub
.../sysfs-bus-platform-onboard-usb-hub | 8 + .../bindings/usb/realtek,rts5411.yaml | 62 +++ MAINTAINERS | 7 + .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 19 +- .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 12 +- .../arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 19 +- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 19 +- drivers/usb/host/Kconfig | 1 + drivers/usb/host/xhci-plat.c | 6 + drivers/usb/host/xhci.h | 2 + drivers/usb/misc/Kconfig | 17 + drivers/usb/misc/Makefile | 1 + drivers/usb/misc/onboard_usb_hub.c | 497 ++++++++++++++++++ include/linux/of_platform.h | 22 +- include/linux/usb/onboard_hub.h | 18 + 15 files changed, 676 insertions(+), 34 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-platform-onboard-usb-hub create mode 100644 Documentation/devicetree/bindings/usb/realtek,rts5411.yaml create mode 100644 drivers/usb/misc/onboard_usb_hub.c create mode 100644 include/linux/usb/onboard_hub.h
Signature · 1 line
2.32.0.rc1.229.g3e70b5a671-goog
PATCH v12 1/5 dt-bindings: usb: Add binding for Realtek RTS5411 hub controller
The Realtek RTS5411 is a USB 3.0 hub controller with 4 ports.
This initial version of the binding only describes USB related aspects of the RTS5411, it does not cover the option of connecting the controller as an i2c slave.
---
Changes in v12:
- none
Changes in v11:
- none
Changes in v10:
- none
Changes in v9:
- added Rob's 'Reviewed-by' tag
Changes in v8:
- added entry for 'reg'
- marked 'companion-hub' as required
- changed node name of USB controller to 'usb'
Changes in v7:
- added type ref for 'companion-hub' property
Changes in v6:
- Realtek binding instead of generic onboard_usb_hub
- added 'companion-hub' property
- added reference to 'usb-device.yaml'
- 'fixed' indentation of compatible entries to keep yamllint happy
- added 'additionalProperties' entry
- updated commit message
Changes in v5:
- updated 'title'
- only use standard USB compatible strings
- deleted 'usb_hub' node
- renamed 'usb_controller' node to 'usb-controller'
- removed labels from USB nodes
- added 'vdd-supply' to USB nodes
Changes in v4:
- none
Changes in v3:
- updated commit message
- removed recursive reference to $self
- adjusted 'compatible' definition to support multiple entries
- changed USB controller phandle to be a node
Changes in v2:
- removed 'wakeup-source' and 'power-off-in-suspend' properties
- consistently use spaces for indentation in example
.../bindings/usb/realtek,rts5411.yaml | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 Documentation/devicetree/bindings/usb/realtek,rts5411.yaml
Documentation/devicetree/bindings/usb/realtek,rts5411.yaml new file +62 -0
@@ -0,0 +1,62 @@ +# SPDX-License-Identifier: GPL-2.0-only or BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/usb/realtek,rts5411.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Binding for the Realtek RTS5411 USB 3.0 hub controller + +maintainers: + - Matthias Kaehlcke <[email protected]> + +allOf: + - $ref: usb-device.yaml# + +properties: + compatible: + items: + - enum: + - usbbda,5411 + - usbbda,411 + + reg: true + + vdd-supply: + description: + phandle to the regulator that provides power to the hub. + + companion-hub: + $ref: '/schemas/types.yaml#/definitions/phandle' + description: + phandle to the companion hub on the controller. + +required: + - companion-hub + - compatible + - reg + +additionalProperties: false + +examples: + - | + usb { + dr_mode = "host"; + #address-cells = <1>; + #size-cells = <0>; + + /* 2.0 hub on port 1 */ + hub_2_0: hub@1 { + compatible = "usbbda,5411"; + reg = <1>; + vdd-supply = <&pp3300_hub>; + companion-hub = <&hub_3_0>; + }; + + /* 3.0 hub on port 2 */ + hub_3_0: hub@2 { + compatible = "usbbda,411"; + reg = <2>; + vdd-supply = <&pp3300_hub>; + companion-hub = <&hub_2_0>; + }; + };
Signature · 1 line
2.32.0.rc1.229.g3e70b5a671-goog
PATCH v12 2/5 USB: misc: Add onboard_usb_hub driver
In reply to Matthias KaehlckeThe main issue this driver addresses is that a USB hub needs to be powered before it can be discovered. For discrete onboard hubs (an example for such a hub is the Realtek RTS5411) this is often solved by supplying the hub with an 'always-on' regulator, which is kind of a hack. Some onboard hubs may require further initialization steps, like changing the state of a GPIO or enabling a clock, which requires even more hacks. This driver creates a platform device representing the hub which performs the necessary initialization. Currently it only supports switching on a single regulator, support for multiple regulators or other actions can be added as needed. Different initialization sequences can be supported based on the compatible string.
Besides performing the initialization the driver can be configured to power the hub off during system suspend. This can help to extend battery life on battery powered devices which have no requirements to keep the hub powered during suspend. The driver can also be configured to leave the hub powered when a wakeup capable USB device is connected when suspending, and power it off otherwise.
Technically the driver consists of two drivers, the platform driver described above and a very thin USB driver that subclasses the generic driver. The purpose of this driver is to provide the platform driver with the USB devices corresponding to the hub(s) (a hub controller may provide multiple 'logical' hubs, e.g. one to support USB 2.0 and another for USB 3.x).
Note: the current series only supports hubs connected directly to a root hub (through xhci-plat), support for other configurations could be added if needed.
---
Changes in v12:
- use IS_ENABLED(CONFIG_USB_ONBOARD_HUB_MODULE) in onboard_hub.h to also check for the driver built as module
- include onboard_hub.h again from the driver to make sure there are prototype declarations for the public functions
- remove indentation from label in onboard_hub_create_pdevs()
Changes in v11:
- added onboard_hub_create/destroy_pdevs() helpers, to support multiple onboard hubs connected to the same parent hub
- don't include ‘onboard_hub.h’ from the onboard hub driver
- updated commit message
- added ‘Acked-by' from Alan
Changes in v10:
- always use of_is_onboard_usb_hub() stub unless ONBOARD_USB_HUB=y/m
Changes in v9:
- none
Changes in v8:
- none
Changes in v7:
- don't declare stub for of_is_onboard_usb_hub() when CONFIG_COMPILE_TEST is defined
Changes in v6:
- use 'companion-hub' to locate the platform device, instead of scanning through the nodes of the parent
- added ABI documentation for 'always_powered_in_suspend'
- sysfs_emit() instead of sprintf() in always_powered_in_suspend_show()
- register sysfs attribute through driver.dev_groups
- evaluate return value of driver_attach() in _probe()
- use dev_warn() instead of WARN_ON() in _probe()
- include 'onboard_hub.h'
Changes in v5:
- the platform device is now instantiated from the same DT node as the 'primary' USB hub device
- use the USB compatible strings for the platform device
- refactored _find_onboard_hub() to search the parents child nodes for a platform device with a matching compatible string
- added exported function of_is_onboard_usb_hub() to allow other drivers (like xhci_plat) to check if one of their child DT nodes is a supported hub
- use late suspend to make sure info about wakeup enabled descendants is updated
- call driver_attach() for the USB driver in onboard_hub_probe() to make sure the driver is re-attached after the device_release_driver() calls in onboard_hub_remove()
- renamed sysfs attribute 'power_off_in_suspend' to 'always_powered_in_suspend'
- added sysfs symlinks between platform device and USB devices
- marked 'onboard_hub_pm_ops' as __maybe_unused
- removed 'realtek' compatible string which is not needed at this point
- fix log for regulator_disable() failure
Changes in v4:
- updated Kconfig documentation
- changed the loop in onboard_hub_remove() to release the hub lock before unbinding the USB device and make self deadlock prevention less clunky
- fixed return value in onboard_hub_usbdev_probe()
- added entry to MAINTAINERS file
Changes in v3:
- updated the commit message
- updated description in Kconfig
- remove include of 'core/usb.h'
- use 'is_powered_on' flag instead of 'has_wakeup_capable_descendants'
- added 'going_away' flag to struct onboard_hub
- don't allow adding new USB devices when the platform device is going away
- don't bother with deleting the list item in onboard_hub_remove_usbdev() when the platform device is going away
- don't assume in onboard_hub_suspend() that all USB hub devices are connected to the same controller
- removed unnecessary devm_kfree() from onboard_hub_remove_usbdev()
- fixed error handling in onboard_hub_remove_usbdev()
- use kstrtobool() instead of strtobool() in power_off_in_suspend_store()
- unbind USB devices in onboard_hub_remove() to avoid dangling references to the platform device
- moved put_device() for platform device to _find_onboard_hub()
- changed return value of onboard_hub_remove_usbdev() to void
- evaluate return value of onboard_hub_add_usbdev()
- register 'power_off_in_suspend' as managed device attribute
- use USB_DEVICE macro instead manual initialization
- add unwinding to onboard_hub_init()
- updated MODULE_DESCRIPTION
- use module_init() instead of device_initcall()
Changes in v2:
- check wakeup enabled state of the USB controller instead of using 'wakeup-source' property
- use sysfs attribute instead of DT property to determine if the hub should be powered off at all during system suspend
- added missing brace in onboard_hub_suspend()
- updated commit message
- use pm_ptr for pm_ops as suggested by Alan
Changes in v1:
- renamed the driver to 'onboard_usb_hub'
- single file for platform and USB driver
- USB hub devices register with the platform device
- the DT includes a phandle of the platform device
- the platform device now controls when power is turned off
- the USB driver became a very thin subclass of the generic USB driver
- enabled autosuspend support
.../sysfs-bus-platform-onboard-usb-hub | 8 + MAINTAINERS | 7 + drivers/usb/misc/Kconfig | 17 + drivers/usb/misc/Makefile | 1 + drivers/usb/misc/onboard_usb_hub.c | 497 ++++++++++++++++++ include/linux/usb/onboard_hub.h | 18 + 6 files changed, 548 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-bus-platform-onboard-usb-hub create mode 100644 drivers/usb/misc/onboard_usb_hub.c create mode 100644 include/linux/usb/onboard_hub.h
Documentation/ABI/testing/sysfs-bus-platform-onboard-usb-hub new file +8 -0
@@ -0,0 +1,8 @@ +What: /sys/bus/platform/devices/<dev>/always_powered_in_suspend +Date: March 2021 +KernelVersion: 5.13 +Contact: Matthias Kaehlcke <[email protected]> + [email protected] +Description: + (RW) Controls whether the USB hub remains always powered + during system suspend or not.
MAINTAINERS +7 -0
@@ -13613,6 +13613,13 @@ S: Maintained T: git git://linuxtv.org/media_tree.git F: drivers/media/i2c/ov9734.c +ONBOARD USB HUB DRIVER +M: Matthias Kaehlcke <[email protected]> +L: [email protected] +S: Maintained +F: Documentation/devicetree/bindings/usb/onboard_usb_hub.yaml +F: drivers/usb/misc/onboard_usb_hub.c + ONENAND FLASH DRIVER M: Kyungmin Park <[email protected]> L: [email protected]
drivers/usb/misc/Kconfig +17 -0
@@ -284,3 +284,20 @@ config BRCM_USB_PINMAP This option enables support for remapping some USB external signals, which are typically on dedicated pins on the chip, to any gpio. + +config USB_ONBOARD_HUB + tristate "Onboard USB hub support" + depends on OF || COMPILE_TEST + help + Say Y here if you want to support discrete onboard USB hubs that + don't require an additional control bus for initialization, but + need some nontrivial form of initialization, such as enabling a + power regulator. An example for such a hub is the Realtek + RTS5411. + + The driver can be configured to turn off the power of the hub + during system suspend. This may reduce power consumption while + the system is suspended. + + To compile this driver as a module, choose M here: the + module will be called onboard_usb_hub.
drivers/usb/misc/Makefile +1 -0
@@ -32,3 +32,4 @@ obj-$(CONFIG_USB_CHAOSKEY) += chaoskey.o obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga/ obj-$(CONFIG_USB_LINK_LAYER_TEST) += lvstest.o obj-$(CONFIG_BRCM_USB_PINMAP) += brcmstb-usb-pinmap.o +obj-$(CONFIG_USB_ONBOARD_HUB) += onboard_usb_hub.o
drivers/usb/misc/onboard_usb_hub.c new file +497 -0
497 lines not on this page · raw message
include/linux/usb/onboard_hub.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __LINUX_USB_ONBOARD_HUB_H +#define __LINUX_USB_ONBOARD_HUB_H + +struct usb_device ; +struct list_head ; + +#if IS_ENABLED (CONFIG_USB_ONBOARD_HUB ) +void onboard_hub_create_pdevs (struct usb_device *parent_hub,struct list_head *pdev_list); +void onboard_hub_destroy_pdevs (struct list_head *pdev_list); +#else +static inline void onboard_hub_create_pdevs (struct usb_device *parent_hub, +struct list_head *pdev_list) {} +static inline void onboard_hub_destroy_pdevs (struct list_head *pdev_list) {} +#endif + +#endif /* __LINUX_USB_ONBOARD_HUB_H */
Signature · 1 line
2.32.0.rc1.229.g3e70b5a671-goog
PATCH v12 3/5 of/platform: Add stubs for of_platform_device_create/destroy()
In reply to Matthias KaehlckeCode for platform_device_create() and of_platform_device_destroy() is only generated if CONFIG_OF_ADDRESS=y. Add stubs to avoid unresolved symbols when CONFIG_OF_ADDRESS is not set.
---
Changes in v12:
- none
Changes in v11:
- none
Changes in v10:
- none
Changes in v9:
- added Rob's 'Acked-by' tag
Changes in v8:
- fixed C&P error in commit message
Changes in v7:
- none
Changes in v6:
- patch added to the series
include/linux/of_platform.h | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
include/linux/of_platform.h +18 -4
@@ -61,16 +61,18 @@ static inline struct platform_device *of_find_device_by_node(struct device_node }#endif +extern int of_platform_bus_probe (struct device_node *root, +const struct of_device_id *matches, +struct device *parent); + +#ifdef CONFIG_OF_ADDRESS /* Platform devices and busses creation */ extern struct platform_device *of_platform_device_create (struct device_node *np,const char *bus_id,struct device *parent);extern int of_platform_device_destroy (struct device *dev,void *data); -extern int of_platform_bus_probe (struct device_node *root, -const struct of_device_id *matches, -struct device *parent); -#ifdef CONFIG_OF_ADDRESS + extern int of_platform_populate(struct device_node *root, const struct of_device_id *matches, const struct of_dev_auxdata *lookup,
@@ -84,6 +86,18 @@ extern int devm_of_platform_populate(struct device *dev);extern void devm_of_platform_depopulate (struct device *dev);#else +/* Platform devices and busses creation */ +static inline struct platform_device *of_platform_device_create (struct device_node *np, +const char *bus_id, +struct device *parent) +{ +return NULL ; +} +static inline int of_platform_device_destroy (struct device *dev,void *data) +{ +return -ENODEV ; +} + static inline int of_platform_populate(struct device_node *root, const struct of_device_id *matches, const struct of_dev_auxdata *lookup,
Signature · 1 line
2.32.0.rc1.229.g3e70b5a671-goog
PATCH v12 4/5 usb: host: xhci-plat: Create platform device for onboard hubs in probe()
In reply to Matthias KaehlckeCall onboard_hub_create/destroy_pdevs() from _probe()/_remove() to create/destroy platform devices for onboard USB hubs that may be connected to the root hub of the controller. These functions are a NOP unless CONFIG_USB_ONBOARD_HUB=y/m.
Also add a field to struct xhci_hcd to keep track of the onboard hub platform devices that are owned by the xHCI.
---
Changes in v12:
- none
Changes in v11:
- use onboard_hub_create/destroy_pdevs() to support multiple onboard hubs that are connected to the same root hub
- moved field/list to keep track of platform devices from struct usb_hcd to struct xhci_hcd
- updated commit message
Changes in v10:
- none
Changes in v9:
- added dependency on USB_ONBOARD_HUB (or !!USB_ONBOARD_HUB) to USB_XHCI_PLATFORM
Changes in v8:
- none
Changes in v7:
- none
Changes in v6:
- none
Changes in v5:
- patch added to the series
drivers/usb/host/Kconfig | 1 + drivers/usb/host/xhci-plat.c | 6 ++++++ drivers/usb/host/xhci.h | 2 ++ 3 files changed, 9 insertions(+)
drivers/usb/host/Kconfig +1 -0
@@ -54,6 +54,7 @@ config USB_XHCI_PCI_RENESAS config USB_XHCI_PLATFORM tristate "Generic xHCI driver for a platform device" select USB_XHCI_RCAR if ARCH_RENESAS + depends on USB_ONBOARD_HUB || !USB_ONBOARD_HUB help Adds an xHCI host driver for a generic platform device, which provides a memory space and an irq.
drivers/usb/host/xhci-plat.c +6 -0
@@ -15,6 +15,7 @@#include <linux/of.h> #include <linux/of_device.h> #include <linux/platform_device.h> +#include <linux/usb/onboard_hub.h> #include <linux/usb/phy.h> #include <linux/slab.h> #include <linux/acpi.h>
@@ -374,6 +375,9 @@ static int xhci_plat_probe(struct platform_device *pdev)*/ pm_runtime_forbid (&pdev->dev); +INIT_LIST_HEAD (&xhci->onboard_hub_devs); +onboard_hub_create_pdevs (hcd->self.root_hub, &xhci->onboard_hub_devs); +return 0 ;
@@ -420,6 +424,8 @@ static int xhci_plat_remove(struct platform_device *dev)usb_remove_hcd (hcd);usb_put_hcd (shared_hcd); +onboard_hub_destroy_pdevs (&xhci->onboard_hub_devs); +clk_disable_unprepare (clk);clk_disable_unprepare (reg_clk);usb_put_hcd (hcd);
drivers/usb/host/xhci.h +2 -0
@@ -1919,6 +1919,8 @@ struct xhci_hcd {struct dentry *debugfs_slots;struct list_head regset_list; +struct list_head onboard_hub_devs; +void *dbc;/* platform-specific data -- must come last */ unsigned long priv[]__aligned(sizeof(s64)) ;
Signature · 1 line
2.32.0.rc1.229.g3e70b5a671-goog
PATCH v12 5/5 arm64: dts: qcom: sc7180-trogdor: Add nodes for onboard USB hub
In reply to Matthias KaehlckeAdd nodes for the onboard USB hub on trogdor devices. Remove the 'always-on' property from the hub regulator, since the regulator is now managed by the onboard_usb_hub driver.
---
Changes in v12:
- none
Changes in v11:
- rebased on qcom/arm64-for-5.14 (with the rest of the series)
Changes in v10:
- keep 'regulator-boot-on' property
- updated commit message
Changes in v9:
- none
Changes in v8:
- none
Changes in v7:
- rebased on qcom/arm64-for-5.13 (with the rest of the series)
Changes in v6:
- added 'companion-hub' entry to both USB devices
- added 'vdd-supply' also to hub@2
Changes in v5:
- patch added to the series
.../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 19 ++++++++----------- .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 12 +++++------- .../arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 19 ++++++++----------- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 19 ++++++++++++++++++- 4 files changed, 39 insertions(+), 30 deletions(-)
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts +8 -11
@@ -14,17 +14,6 @@ / { compatible = "google,lazor-rev0", "qcom,sc7180"; }; -&pp3300_hub { - /* pp3300_l7c is used to power the USB hub */ - /delete-property/regulator-always-on; - /delete-property/regulator-boot-on; -}; - -&pp3300_l7c { - regulator-always-on; - regulator-boot-on; -}; - &sn65dsi86_out { /* * Lane 0 was incorrectly mapped on the cable, but we've now decided
@@ -33,3 +22,11 @@ &sn65dsi86_out { */ lane-polarities = <1 0>; }; + +&usb_hub_2_0 { + vdd-supply = <&pp3300_l7c>; +}; + +&usb_hub_3_0 { + vdd-supply = <&pp3300_l7c>; +};
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts +5 -7
@@ -14,13 +14,11 @@ / { compatible = "google,lazor-rev1", "google,lazor-rev2", "qcom,sc7180"; }; -&pp3300_hub { - /* pp3300_l7c is used to power the USB hub */ - /delete-property/regulator-always-on; - /delete-property/regulator-boot-on; + +&usb_hub_2_0 { + vdd-supply = <&pp3300_l7c>; }; -&pp3300_l7c { - regulator-always-on; - regulator-boot-on; +&usb_hub_3_0 { + vdd-supply = <&pp3300_l7c>; };
arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts +8 -11
@@ -42,17 +42,6 @@ &panel { compatible = "auo,b116xa01"; }; -&pp3300_hub { - /* pp3300_l7c is used to power the USB hub */ - /delete-property/regulator-always-on; - /delete-property/regulator-boot-on; -}; - -&pp3300_l7c { - regulator-always-on; - regulator-boot-on; -}; - &sdhc_2 { status = "okay"; };
@@ -61,6 +50,14 @@ &trackpad { interrupts = <58 IRQ_TYPE_EDGE_FALLING>; }; +&usb_hub_2_0 { + vdd-supply = <&pp3300_l7c>; +}; + +&usb_hub_3_0 { + vdd-supply = <&pp3300_l7c>; +}; + /* PINCTRL - modifications to sc7180-trogdor.dtsi */ &trackpad_int_1v8_odl {
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +18 -1
@@ -202,7 +202,6 @@ pp3300_hub: pp3300-hub { pinctrl-names = "default"; pinctrl-0 = <&en_pp3300_hub>; - regulator-always-on; regulator-boot-on; vin-supply = <&pp3300_a>;
@@ -903,6 +902,24 @@ &usb_1 { &usb_1_dwc3 { dr_mode = "host"; + #address-cells = <1>; + #size-cells = <0>; + + /* 2.0 hub on port 1 */ + usb_hub_2_0: hub@1 { + compatible = "usbbda,5411"; + reg = <1>; + vdd-supply = <&pp3300_hub>; + companion-hub = <&usb_hub_3_0>; + }; + + /* 3.0 hub on port 2 */ + usb_hub_3_0: hub@2 { + compatible = "usbbda,411"; + reg = <2>; + vdd-supply = <&pp3300_hub>; + companion-hub = <&usb_hub_2_0>; + }; }; &usb_1_hsphy {
Signature · 1 line
2.32.0.rc1.229.g3e70b5a671-goog