diff options
| -rw-r--r-- | target/linux/ramips/dts/DIR-645.dts | 19 | ||||
| -rw-r--r-- | target/linux/ramips/dts/FREESTATION5.dts | 15 | ||||
| -rw-r--r-- | target/linux/ramips/dts/MPRA2.dts | 34 | ||||
| -rw-r--r-- | target/linux/ramips/dts/OMNI-EMB-HPM.dts | 37 | ||||
| -rw-r--r-- | target/linux/ramips/dts/WR6202.dts | 16 | ||||
| -rw-r--r-- | target/linux/ramips/dts/rt3883.dtsi | 4 |
6 files changed, 52 insertions, 73 deletions
diff --git a/target/linux/ramips/dts/DIR-645.dts b/target/linux/ramips/dts/DIR-645.dts index 960d2cb352..e5ccb40ec6 100644 --- a/target/linux/ramips/dts/DIR-645.dts +++ b/target/linux/ramips/dts/DIR-645.dts @@ -128,16 +128,13 @@ }; }; - usb0: gpio-regulator { - compatible = "regulator-gpio"; - - regulator-type = "voltage"; - regulator-name = "usb-power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-boot-on; - - enable-active-high; - enable-gpio = <&gpio1 6 0>; + gpio_export { + compatible = "gpio-export"; + #size-cells = <0>; + usb { + gpio-export,name = "usb"; + gpio-export,output = <1>; + gpios = <&gpio1 6 0>; + }; }; }; diff --git a/target/linux/ramips/dts/FREESTATION5.dts b/target/linux/ramips/dts/FREESTATION5.dts index 442cd268dd..a3cc8fc97d 100644 --- a/target/linux/ramips/dts/FREESTATION5.dts +++ b/target/linux/ramips/dts/FREESTATION5.dts @@ -72,16 +72,15 @@ status = "okay"; }; - poe: gpio-regulator { + gpio-export { + compatible = "gpio-export"; // Used to enable power-over-ethernet passthrough from port0 to port1. // Disable passthrough by default to prevent accidental equipment damage. - compatible = "regulator-gpio"; - - regulator-name = "poe-power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - - enable-gpio = <&gpio0 12 0>; + poe { + gpio-export,name = "poe-passthrough"; + gpio-export,output = <1>; // OUT_INIT_HIGH + gpios = <&gpio0 11 1>; // GPIO 11, ACTIVE_LOW + }; }; gpio-leds { diff --git a/target/linux/ramips/dts/MPRA2.dts b/target/linux/ramips/dts/MPRA2.dts index 9f8edb6296..8fb226b748 100644 --- a/target/linux/ramips/dts/MPRA2.dts +++ b/target/linux/ramips/dts/MPRA2.dts @@ -103,27 +103,19 @@ }; }; - usb0: gpio-regulator { - compatible = "regulator-gpio"; - - regulator-name = "usb0-power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-boot-on; - - enable-active-high; - enable-gpio = <&gpio0 7 0>; - }; - - hub0: gpio-regulator { - compatible = "regulator-gpio"; - - regulator-name = "hub0-power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-boot-on; + gpio_export { + compatible = "gpio-export"; + #size-cells = <0>; - enable-active-high; - enable-gpio = <&gpio0 12 0>; + usb { + gpio-export,name = "usb"; + gpio-export,output = <1>; + gpios = <&gpio0 7 0>; + }; + root_hub { + gpio-export,name = "root_hub"; + gpio-export,output = <1>; + gpios = <&gpio0 12 0>; + }; }; }; diff --git a/target/linux/ramips/dts/OMNI-EMB-HPM.dts b/target/linux/ramips/dts/OMNI-EMB-HPM.dts index 875df14c66..8148294893 100644 --- a/target/linux/ramips/dts/OMNI-EMB-HPM.dts +++ b/target/linux/ramips/dts/OMNI-EMB-HPM.dts @@ -131,28 +131,19 @@ }; }; - /* gpio 12 and 13 handle the OC input */ - usb0: gpio-regulator { - compatible = "regulator-gpio"; - - regulator-name = "usb0-power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-boot-on; - - enable-active-high; - enable-gpio = <&gpio0 2 0>; - }; - - usb1: gpio-regulator { - compatible = "regulator-gpio"; - - regulator-name = "usb1-power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-boot-on; - - enable-active-high; - enable-gpio = <&gpio0 1 0>; + gpio_export { + compatible = "gpio-export"; + #size-cells = <0>; + /* gpio 12 and 13 handle the OC input */ + usb0 { + gpio-export,name = "usb0"; + gpio-export,output = <1>; + gpios = <&gpio0 2 0>; + }; + usb1 { + gpio-export,name = "usb1"; + gpio-export,output = <1>; + gpios = <&gpio0 1 0>; + }; }; }; diff --git a/target/linux/ramips/dts/WR6202.dts b/target/linux/ramips/dts/WR6202.dts index 1e41756d5a..a970849e31 100644 --- a/target/linux/ramips/dts/WR6202.dts +++ b/target/linux/ramips/dts/WR6202.dts @@ -102,14 +102,14 @@ status = "okay"; }; - usb0: gpio-regulator { - compatible = "regulator-gpio"; - - regulator-name = "usb0-power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-boot-on; + gpio_export { + compatible = "gpio-export"; + #size-cells = <0>; - enable-gpio = <&gpio0 11 0>; + usb { + gpio-export,name = "usb"; + gpio-export,output = <0>; + gpios = <&gpio0 11 0>; + }; }; }; diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi index 046c9e9a92..4d0d37d49a 100644 --- a/target/linux/ramips/dts/rt3883.dtsi +++ b/target/linux/ramips/dts/rt3883.dtsi @@ -325,7 +325,7 @@ }; ehci@101c0000 { - compatible = "ralink,rt3883-ehci", "ehci-platform"; + compatible = "ralink,rt3xxx-ehci", "ehci-platform"; reg = <0x101c0000 0x1000>; interrupt-parent = <&intc>; @@ -335,7 +335,7 @@ }; ohci@101c1000 { - compatible = "ralink,rt3883-ohci", "ohci-platform"; + compatible = "ralink,rt3xxx-ohci", "ohci-platform"; reg = <0x101c1000 0x1000>; interrupt-parent = <&intc>; |