| Message ID | 20211116120642.v17.4.Ie0d2c1214b767bb5551dd4cad38398bd40e4466f@changeid (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | usb: misc: Add onboard_usb_hub driver | expand |
Hi, On Tue, Nov 16, 2021 at 12:07 PM Matthias Kaehlcke <mka@chromium.org> wrote: > > Add 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. > > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> > --- > > Changes in v17: > - none > > Changes in v16: > - none > > Changes in v15: > - none > > Changes in v14: > - none > > Changes in v13: > - none > > 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(-) sc7180-trogdor-pompom-r1.dts is missing? It seems to need similar fixups to the early lazor/trogdor borads. Other than that this looks good to me. -Doug
On Wed, Nov 17, 2021 at 04:03:10PM -0800, Doug Anderson wrote: > Hi, > > On Tue, Nov 16, 2021 at 12:07 PM Matthias Kaehlcke <mka@chromium.org> wrote: > > > > Add 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. > > > > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> > > --- > > > > Changes in v17: > > - none > > > > Changes in v16: > > - none > > > > Changes in v15: > > - none > > > > Changes in v14: > > - none > > > > Changes in v13: > > - none > > > > 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(-) > > sc7180-trogdor-pompom-r1.dts is missing? It seems to need similar > fixups to the early lazor/trogdor borads. ack, also needs to be done for pompom rev1, thanks for pointing that out!
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts index 30e3e769d2b4..5fb8e12af1a0 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts @@ -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>; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts index c2ef06367baf..1dae714250f5 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts @@ -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>; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts index 457c25499863..8477c82c410a 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts @@ -43,17 +43,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"; }; @@ -62,6 +51,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 { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index d4f4441179fc..cd31460b3bd6 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -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>; @@ -839,6 +838,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 {
Add 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. Signed-off-by: Matthias Kaehlcke <mka@chromium.org> --- Changes in v17: - none Changes in v16: - none Changes in v15: - none Changes in v14: - none Changes in v13: - none 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(-)