提交 352d318c 编写于 作者: S Shawn Guo

ARM: dts: imx: use generic node name for fixed regulator

The device tree specification recommends that generic name should be
used for nodes.  So instead of naming those fixed regulator nodes
arbitrarily, let's use the generic name 'regulator@num' for those nodes.
Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
上级 a4a2aa9b
...@@ -127,17 +127,21 @@ ...@@ -127,17 +127,21 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_vddio_sd0: vddio-sd0 { reg_vddio_sd0: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "vddio-sd0"; regulator-name = "vddio-sd0";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
gpio = <&gpio1 29 0>; gpio = <&gpio1 29 0>;
}; };
reg_lcd_3v3: lcd-3v3 { reg_lcd_3v3: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>;
regulator-name = "lcd-3v3"; regulator-name = "lcd-3v3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
......
...@@ -100,9 +100,12 @@ ...@@ -100,9 +100,12 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_usb0_vbus: usb0_vbus { reg_usb0_vbus: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "usb0_vbus"; regulator-name = "usb0_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
......
...@@ -66,9 +66,12 @@ ...@@ -66,9 +66,12 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_vddio_sd0: vddio-sd0 { reg_vddio_sd0: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "vddio-sd0"; regulator-name = "vddio-sd0";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
......
...@@ -37,9 +37,12 @@ ...@@ -37,9 +37,12 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_3v3: 3v3 { reg_3v3: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "3V3"; regulator-name = "3V3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
......
...@@ -150,9 +150,12 @@ ...@@ -150,9 +150,12 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_usb0_vbus: usb0_vbus { reg_usb0_vbus: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "usb0_vbus"; regulator-name = "usb0_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
......
...@@ -193,9 +193,12 @@ ...@@ -193,9 +193,12 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_3p3v: 3p3v { reg_3p3v: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "3P3V"; regulator-name = "3P3V";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
......
...@@ -72,9 +72,12 @@ ...@@ -72,9 +72,12 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_usb1_vbus: usb1_vbus { reg_usb1_vbus: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb_pins_cfa10037>; pinctrl-0 = <&usb_pins_cfa10037>;
regulator-name = "usb1_vbus"; regulator-name = "usb1_vbus";
......
...@@ -282,9 +282,12 @@ ...@@ -282,9 +282,12 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_usb1_vbus: usb1_vbus { reg_usb1_vbus: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb_pins_cfa10049>; pinctrl-0 = <&usb_pins_cfa10049>;
regulator-name = "usb1_vbus"; regulator-name = "usb1_vbus";
......
...@@ -142,9 +142,12 @@ ...@@ -142,9 +142,12 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_usb1_vbus: usb1_vbus { reg_usb1_vbus: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb_pins_cfa10057>; pinctrl-0 = <&usb_pins_cfa10057>;
regulator-name = "usb1_vbus"; regulator-name = "usb1_vbus";
......
...@@ -109,11 +109,14 @@ ...@@ -109,11 +109,14 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_usb1_vbus: usb1_vbus { reg_usb1_vbus: regulator@0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb_pins_cfa10058>; pinctrl-0 = <&usb_pins_cfa10058>;
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "usb1_vbus"; regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
......
...@@ -278,33 +278,39 @@ ...@@ -278,33 +278,39 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_3p3v: 3p3v { reg_3p3v: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "3P3V"; regulator-name = "3P3V";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-always-on; regulator-always-on;
}; };
reg_vddio_sd0: vddio-sd0 { reg_vddio_sd0: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>;
regulator-name = "vddio-sd0"; regulator-name = "vddio-sd0";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
gpio = <&gpio3 28 0>; gpio = <&gpio3 28 0>;
}; };
reg_fec_3v3: fec-3v3 { reg_fec_3v3: regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>;
regulator-name = "fec-3v3"; regulator-name = "fec-3v3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
gpio = <&gpio2 15 0>; gpio = <&gpio2 15 0>;
}; };
reg_usb0_vbus: usb0_vbus { reg_usb0_vbus: regulator@3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>;
regulator-name = "usb0_vbus"; regulator-name = "usb0_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
...@@ -312,8 +318,9 @@ ...@@ -312,8 +318,9 @@
enable-active-high; enable-active-high;
}; };
reg_usb1_vbus: usb1_vbus { reg_usb1_vbus: regulator@4 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <4>;
regulator-name = "usb1_vbus"; regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
...@@ -321,8 +328,9 @@ ...@@ -321,8 +328,9 @@
enable-active-high; enable-active-high;
}; };
reg_lcd_3v3: lcd-3v3 { reg_lcd_3v3: regulator@5 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <5>;
regulator-name = "lcd-3v3"; regulator-name = "lcd-3v3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -330,8 +338,9 @@ ...@@ -330,8 +338,9 @@
enable-active-high; enable-active-high;
}; };
reg_can_3v3: can-3v3 { reg_can_3v3: regulator@6 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <6>;
regulator-name = "can-3v3"; regulator-name = "can-3v3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
......
...@@ -229,33 +229,39 @@ ...@@ -229,33 +229,39 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_3p3v: 3p3v { reg_3p3v: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "3P3V"; regulator-name = "3P3V";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-always-on; regulator-always-on;
}; };
reg_vddio_sd0: vddio-sd0 { reg_vddio_sd0: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>;
regulator-name = "vddio-sd0"; regulator-name = "vddio-sd0";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
gpio = <&gpio3 29 0>; gpio = <&gpio3 29 0>;
}; };
reg_vddio_sd1: vddio-sd1 { reg_vddio_sd1: regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>;
regulator-name = "vddio-sd1"; regulator-name = "vddio-sd1";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
gpio = <&gpio2 19 0>; gpio = <&gpio2 19 0>;
}; };
reg_usb1_vbus: usb1_vbus { reg_usb1_vbus: regulator@3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>;
regulator-name = "usb1_vbus"; regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
......
...@@ -285,33 +285,39 @@ ...@@ -285,33 +285,39 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_3p3v: 3p3v { reg_3p3v: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "3P3V"; regulator-name = "3P3V";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-always-on; regulator-always-on;
}; };
reg_vddio_sd0: vddio-sd0 { reg_vddio_sd0: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>;
regulator-name = "vddio-sd0"; regulator-name = "vddio-sd0";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
gpio = <&gpio3 28 0>; gpio = <&gpio3 28 0>;
}; };
reg_usb0_vbus: usb0_vbus { reg_usb0_vbus: regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>;
regulator-name = "usb0_vbus"; regulator-name = "usb0_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gpio3 12 0>; gpio = <&gpio3 12 0>;
}; };
reg_usb1_vbus: usb1_vbus { reg_usb1_vbus: regulator@3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>;
regulator-name = "usb1_vbus"; regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
......
...@@ -127,9 +127,12 @@ ...@@ -127,9 +127,12 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_usb0_vbus: usb0_vbus { reg_usb0_vbus: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "usb0_vbus"; regulator-name = "usb0_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
......
...@@ -43,9 +43,12 @@ ...@@ -43,9 +43,12 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_usb0_vbus: usb0_vbus { reg_usb0_vbus: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "usb0_vbus"; regulator-name = "usb0_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
...@@ -53,8 +56,9 @@ ...@@ -53,8 +56,9 @@
enable-active-high; enable-active-high;
}; };
reg_usb1_vbus: usb1_vbus { reg_usb1_vbus: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>;
regulator-name = "usb1_vbus"; regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
...@@ -62,24 +66,27 @@ ...@@ -62,24 +66,27 @@
enable-active-high; enable-active-high;
}; };
reg_2p5v: 2p5v { reg_2p5v: regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>;
regulator-name = "2P5V"; regulator-name = "2P5V";
regulator-min-microvolt = <2500000>; regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>; regulator-max-microvolt = <2500000>;
regulator-always-on; regulator-always-on;
}; };
reg_3p3v: 3p3v { reg_3p3v: regulator@3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>;
regulator-name = "3P3V"; regulator-name = "3P3V";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-always-on; regulator-always-on;
}; };
reg_can_xcvr: can-xcvr { reg_can_xcvr: regulator@4 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <4>;
regulator-name = "CAN XCVR"; regulator-name = "CAN XCVR";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -89,8 +96,9 @@ ...@@ -89,8 +96,9 @@
pinctrl-0 = <&tx28_flexcan_xcvr_pins>; pinctrl-0 = <&tx28_flexcan_xcvr_pins>;
}; };
reg_lcd: lcd-power { reg_lcd: regulator@5 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <5>;
regulator-name = "LCD POWER"; regulator-name = "LCD POWER";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -98,8 +106,9 @@ ...@@ -98,8 +106,9 @@
enable-active-high; enable-active-high;
}; };
reg_lcd_reset: lcd-reset { reg_lcd_reset: regulator@6 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <6>;
regulator-name = "LCD RESET"; regulator-name = "LCD RESET";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
......
...@@ -49,9 +49,12 @@ ...@@ -49,9 +49,12 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_3p3v: 3p3v { reg_3p3v: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "3P3V"; regulator-name = "3P3V";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
......
...@@ -73,9 +73,12 @@ ...@@ -73,9 +73,12 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_3p2v: 3p2v { reg_3p2v: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "3P2V"; regulator-name = "3P2V";
regulator-min-microvolt = <3200000>; regulator-min-microvolt = <3200000>;
regulator-max-microvolt = <3200000>; regulator-max-microvolt = <3200000>;
......
...@@ -37,17 +37,21 @@ ...@@ -37,17 +37,21 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_backlight: fixed@0 { reg_backlight: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "lcd-supply"; regulator-name = "lcd-supply";
gpio = <&gpio2 5 0>; gpio = <&gpio2 5 0>;
startup-delay-us = <5000>; startup-delay-us = <5000>;
enable-active-low; enable-active-low;
}; };
reg_3p2v: 3p2v { reg_3p2v: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>;
regulator-name = "3P2V"; regulator-name = "3P2V";
regulator-min-microvolt = <3200000>; regulator-min-microvolt = <3200000>;
regulator-max-microvolt = <3200000>; regulator-max-microvolt = <3200000>;
......
...@@ -86,17 +86,21 @@ ...@@ -86,17 +86,21 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_3p2v: 3p2v { reg_3p2v: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "3P2V"; regulator-name = "3P2V";
regulator-min-microvolt = <3200000>; regulator-min-microvolt = <3200000>;
regulator-max-microvolt = <3200000>; regulator-max-microvolt = <3200000>;
regulator-always-on; regulator-always-on;
}; };
reg_usb_vbus: usb_vbus { reg_usb_vbus: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>;
regulator-name = "usb_vbus"; regulator-name = "usb_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
......
...@@ -22,9 +22,12 @@ ...@@ -22,9 +22,12 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_3p3v: 3p3v { reg_3p3v: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "3P3V"; regulator-name = "3P3V";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
......
...@@ -21,9 +21,12 @@ ...@@ -21,9 +21,12 @@
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_3p3v: 3p3v { reg_3p3v: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "3P3V"; regulator-name = "3P3V";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册