ramips: revert gpio regulator dts update

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 37021
owl
John Crispin 2013-06-24 11:09:50 +00:00
parent eecce5abad
commit dca18caa79
6 changed files with 52 additions and 73 deletions

View File

@ -128,16 +128,13 @@
}; };
}; };
usb0: gpio-regulator { gpio_export {
compatible = "regulator-gpio"; compatible = "gpio-export";
#size-cells = <0>;
regulator-type = "voltage"; usb {
regulator-name = "usb-power"; gpio-export,name = "usb";
regulator-min-microvolt = <5000000>; gpio-export,output = <1>;
regulator-max-microvolt = <5000000>; gpios = <&gpio1 6 0>;
regulator-boot-on; };
enable-active-high;
enable-gpio = <&gpio1 6 0>;
}; };
}; };

View File

@ -72,16 +72,15 @@
status = "okay"; status = "okay";
}; };
poe: gpio-regulator { gpio-export {
compatible = "gpio-export";
// Used to enable power-over-ethernet passthrough from port0 to port1. // Used to enable power-over-ethernet passthrough from port0 to port1.
// Disable passthrough by default to prevent accidental equipment damage. // Disable passthrough by default to prevent accidental equipment damage.
compatible = "regulator-gpio"; poe {
gpio-export,name = "poe-passthrough";
regulator-name = "poe-power"; gpio-export,output = <1>; // OUT_INIT_HIGH
regulator-min-microvolt = <5000000>; gpios = <&gpio0 11 1>; // GPIO 11, ACTIVE_LOW
regulator-max-microvolt = <5000000>; };
enable-gpio = <&gpio0 12 0>;
}; };
gpio-leds { gpio-leds {

View File

@ -103,27 +103,19 @@
}; };
}; };
usb0: gpio-regulator { gpio_export {
compatible = "regulator-gpio"; compatible = "gpio-export";
#size-cells = <0>;
regulator-name = "usb0-power"; usb {
regulator-min-microvolt = <5000000>; gpio-export,name = "usb";
regulator-max-microvolt = <5000000>; gpio-export,output = <1>;
regulator-boot-on; gpios = <&gpio0 7 0>;
};
enable-active-high; root_hub {
enable-gpio = <&gpio0 7 0>; gpio-export,name = "root_hub";
}; gpio-export,output = <1>;
gpios = <&gpio0 12 0>;
hub0: gpio-regulator { };
compatible = "regulator-gpio";
regulator-name = "hub0-power";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-boot-on;
enable-active-high;
enable-gpio = <&gpio0 12 0>;
}; };
}; };

View File

@ -131,28 +131,19 @@
}; };
}; };
/* gpio 12 and 13 handle the OC input */ gpio_export {
usb0: gpio-regulator { compatible = "gpio-export";
compatible = "regulator-gpio"; #size-cells = <0>;
/* gpio 12 and 13 handle the OC input */
regulator-name = "usb0-power"; usb0 {
regulator-min-microvolt = <5000000>; gpio-export,name = "usb0";
regulator-max-microvolt = <5000000>; gpio-export,output = <1>;
regulator-boot-on; gpios = <&gpio0 2 0>;
};
enable-active-high; usb1 {
enable-gpio = <&gpio0 2 0>; gpio-export,name = "usb1";
}; gpio-export,output = <1>;
gpios = <&gpio0 1 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>;
}; };
}; };

View File

@ -102,14 +102,14 @@
status = "okay"; status = "okay";
}; };
usb0: gpio-regulator { gpio_export {
compatible = "regulator-gpio"; compatible = "gpio-export";
#size-cells = <0>;
regulator-name = "usb0-power"; usb {
regulator-min-microvolt = <5000000>; gpio-export,name = "usb";
regulator-max-microvolt = <5000000>; gpio-export,output = <0>;
regulator-boot-on; gpios = <&gpio0 11 0>;
};
enable-gpio = <&gpio0 11 0>;
}; };
}; };

View File

@ -325,7 +325,7 @@
}; };
ehci@101c0000 { ehci@101c0000 {
compatible = "ralink,rt3883-ehci", "ehci-platform"; compatible = "ralink,rt3xxx-ehci", "ehci-platform";
reg = <0x101c0000 0x1000>; reg = <0x101c0000 0x1000>;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
@ -335,7 +335,7 @@
}; };
ohci@101c1000 { ohci@101c1000 {
compatible = "ralink,rt3883-ohci", "ohci-platform"; compatible = "ralink,rt3xxx-ohci", "ohci-platform";
reg = <0x101c1000 0x1000>; reg = <0x101c1000 0x1000>;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;