diff options
| author | Luca Olivetti <luca@ventoso.org> | 2020-07-06 20:24:02 +0200 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-07-10 13:55:21 +0200 |
| commit | de75d6ecfaa50261cfffba0e0f61a5cc3cc0d001 (patch) | |
| tree | e04120fb769a56a72696e96447aa783c35051047 /target/linux/lantiq | |
| parent | 2d14da2c7d77c4dc2ea8bee3cabcdf7d04ab0620 (diff) | |
| download | upstream-de75d6ecfaa50261cfffba0e0f61a5cc3cc0d001.tar.gz upstream-de75d6ecfaa50261cfffba0e0f61a5cc3cc0d001.tar.bz2 upstream-de75d6ecfaa50261cfffba0e0f61a5cc3cc0d001.zip | |
lantiq: dts: Move the &usb_vbus nodes out of &gpio
Move the USB VBUS regulator nodes out of the GPIO controller node. This
fixes a problem where the "regulator-fixed" driver wasn't probed for
these regulators because the GPIO driver doesn't scan the child-nodes
and based on the dt-bindings documentation it's not supposed to.
This fixed the following error reported by Luca Olivetti:
...
dwc2 1e101000.usb: DWC OTG Controller
dwc2 1e101000.usb: new USB bus registered, assigned bus number 1
dwc2 1e101000.usb: irq 62, io mem 0x1e101000
dwc2 1e101000.usb: startup error -517
dwc2 1e101000.usb: USB bus 1 deregistered
dwc2 1e101000.usb: dwc2_hcd_init() FAILED, returning -517
Fixes: FS#1634
Cc: Luca Olivetti <luca@ventoso.org>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
[backported from 982468de35d499f85470b7b547d2b27cea53bae0]
Signed-off-by: Luca Olivetti <luca@ventoso.org>
Diffstat (limited to 'target/linux/lantiq')
4 files changed, 48 insertions, 48 deletions
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7510PW22.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7510PW22.dts index 92d01b4dcc..404502426f 100644 --- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7510PW22.dts +++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7510PW22.dts @@ -74,6 +74,18 @@ gpios = <&gpio 20 GPIO_ACTIVE_LOW>; }; }; + + usb_vbus: regulator-usb-vbus { + compatible = "regulator-fixed"; + + regulator-name = "USB_VBUS"; + + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + + gpio = <&gpio 8 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; }; &gpio { @@ -115,18 +127,6 @@ lantiq,output = <0>; }; }; - - usb_vbus: regulator-usb-vbus { - compatible = "regulator-fixed"; - - regulator-name = "USB_VBUS"; - - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - - gpio = <&gpio 8 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; }; &gsw { diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7518PW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7518PW.dts index 72f3a686b5..62b67d40eb 100644 --- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7518PW.dts +++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7518PW.dts @@ -106,6 +106,18 @@ gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>; }; }; + + usb_vbus: regulator-usb-vbus { + compatible = "regulator-fixed"; + + regulator-name = "USB_VBUS"; + + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + + gpio = <&gpio 14 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; }; &gpio { @@ -146,18 +158,6 @@ lantiq,open-drain = <1>; }; }; - - usb_vbus: regulator-usb-vbus { - compatible = "regulator-fixed"; - - regulator-name = "USB_VBUS"; - - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - - gpio = <&gpio 14 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; }; &gpiomm { diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts index 5f877723f6..214795025c 100644 --- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts +++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts @@ -107,6 +107,18 @@ gpios = <&gpiomm 9 GPIO_ACTIVE_LOW>; }; }; + + usb_vbus: regulator-usb-vbus { + compatible = "regulator-fixed"; + + regulator-name = "USB_VBUS"; + + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + + gpio = <&gpiomm 0 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; }; &gpio { @@ -153,18 +165,6 @@ lantiq,open-drain = <1>; }; }; - - usb_vbus: regulator-usb-vbus { - compatible = "regulator-fixed"; - - regulator-name = "USB_VBUS"; - - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - - gpio = <&gpiomm 0 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; }; &gpiomm { diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2601HNFX.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2601HNFX.dts index 5606eb6e8b..bb872ad26a 100644 --- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2601HNFX.dts +++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2601HNFX.dts @@ -97,6 +97,18 @@ gpios = <&gpio 50 GPIO_ACTIVE_HIGH>; }; }; + + usb_vbus: regulator-usb-vbus { + compatible = "regulator-fixed"; + + regulator-name = "USB_VBUS"; + + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + + gpio = <&gpio 9 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; }; &gpio { @@ -129,18 +141,6 @@ lantiq,function = "mdio"; }; }; - - usb_vbus: regulator-usb-vbus { - compatible = "regulator-fixed"; - - regulator-name = "USB_VBUS"; - - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - - gpio = <&gpio 9 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; }; &gsw { |