Commit 56160e33 authored by Shawn Guo's avatar Shawn Guo

ARM: dts: imx6: 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: default avatarShawn Guo <shawn.guo@linaro.org>
parent fffaa65d
...@@ -23,17 +23,21 @@ memory { ...@@ -23,17 +23,21 @@ memory {
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_usb_otg_vbus: usb_otg_vbus { reg_usb_otg_vbus: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>;
regulator-name = "usb_otg_vbus"; regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
......
...@@ -23,25 +23,30 @@ memory { ...@@ -23,25 +23,30 @@ memory {
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_2p5v: 2p5v { reg_2p5v: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
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@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>;
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_usb_otg_vbus: usb_otg_vbus { reg_usb_otg_vbus: regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>;
regulator-name = "usb_otg_vbus"; regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
......
...@@ -17,9 +17,12 @@ memory { ...@@ -17,9 +17,12 @@ memory {
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_usb_otg_vbus: usb_otg_vbus { reg_usb_otg_vbus: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "usb_otg_vbus"; regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
...@@ -27,8 +30,9 @@ reg_usb_otg_vbus: usb_otg_vbus { ...@@ -27,8 +30,9 @@ reg_usb_otg_vbus: usb_otg_vbus {
enable-active-high; enable-active-high;
}; };
reg_usb_h1_vbus: usb_h1_vbus { reg_usb_h1_vbus: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>;
regulator-name = "usb_h1_vbus"; regulator-name = "usb_h1_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
...@@ -36,8 +40,9 @@ reg_usb_h1_vbus: usb_h1_vbus { ...@@ -36,8 +40,9 @@ reg_usb_h1_vbus: usb_h1_vbus {
enable-active-high; enable-active-high;
}; };
reg_audio: wm8962_supply { reg_audio: regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>;
regulator-name = "wm8962-supply"; regulator-name = "wm8962-supply";
gpio = <&gpio4 10 0>; gpio = <&gpio4 10 0>;
enable-active-high; enable-active-high;
......
...@@ -12,17 +12,21 @@ ...@@ -12,17 +12,21 @@
/ { / {
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_2p5v: 2p5v { reg_2p5v: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
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@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>;
regulator-name = "3P3V"; regulator-name = "3P3V";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
......
...@@ -20,9 +20,12 @@ memory { ...@@ -20,9 +20,12 @@ memory {
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_usb_otg1_vbus: usb_otg1_vbus { reg_usb_otg1_vbus: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "usb_otg1_vbus"; regulator-name = "usb_otg1_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
...@@ -30,8 +33,9 @@ reg_usb_otg1_vbus: usb_otg1_vbus { ...@@ -30,8 +33,9 @@ reg_usb_otg1_vbus: usb_otg1_vbus {
enable-active-high; enable-active-high;
}; };
reg_usb_otg2_vbus: usb_otg2_vbus { reg_usb_otg2_vbus: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>;
regulator-name = "usb_otg2_vbus"; regulator-name = "usb_otg2_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment