Skip to content

Commit

Permalink
arm/dts: Cleanup regulator naming and remove @0,1
Browse files Browse the repository at this point in the history
regulators do not have a 'reg' property, hence the regulator@0,
regulator@1 do not make sense. get rid of it.

Reported-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Rajendra Nayak authored and Tony Lindgren committed Aug 30, 2012
1 parent ae377aa commit 624411c
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-beagle.dts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
interrupts = <7>; /* SYS_NIRQ cascaded to intc */
interrupt-parent = <&intc>;

vsim: regulator@10 {
vsim: regulator-vsim {
compatible = "ti,twl4030-vsim";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3000000>;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/omap4-sdp.dts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
reg = <0x80000000 0x40000000>; /* 1 GB */
};

vdd_eth: fixedregulator@0 {
vdd_eth: fixedregulator-vdd-eth {
compatible = "regulator-fixed";
regulator-name = "VDD_ETH";
regulator-min-microvolt = <3300000>;
Expand All @@ -28,7 +28,7 @@
regulator-boot-on;
};

vbat: fixedregulator@2 {
vbat: fixedregulator-vbat {
compatible = "regulator-fixed";
regulator-name = "VBAT";
regulator-min-microvolt = <3750000>;
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/boot/dts/twl4030.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@
interrupts = <11>;
};

vdac: regulator@0 {
vdac: regulator-vdac {
compatible = "ti,twl4030-vdac";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};

vpll2: regulator@1 {
vpll2: regulator-vpll2 {
compatible = "ti,twl4030-vpll2";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};

vmmc1: regulator@2 {
vmmc1: regulator-vmmc1 {
compatible = "ti,twl4030-vmmc1";
regulator-min-microvolt = <1850000>;
regulator-max-microvolt = <3150000>;
Expand Down
26 changes: 13 additions & 13 deletions arch/arm/boot/dts/twl6030.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -20,70 +20,70 @@
interrupts = <11>;
};

vaux1: regulator@0 {
vaux1: regulator-vaux1 {
compatible = "ti,twl6030-vaux1";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <3000000>;
};

vaux2: regulator@1 {
vaux2: regulator-vaux2 {
compatible = "ti,twl6030-vaux2";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <2800000>;
};

vaux3: regulator@2 {
vaux3: regulator-vaux3 {
compatible = "ti,twl6030-vaux3";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <3000000>;
};

vmmc: regulator@3 {
vmmc: regulator-vmmc {
compatible = "ti,twl6030-vmmc";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <3000000>;
};

vpp: regulator@4 {
vpp: regulator-vpp {
compatible = "ti,twl6030-vpp";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2500000>;
};

vusim: regulator@5 {
vusim: regulator-vusim {
compatible = "ti,twl6030-vusim";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <2900000>;
};

vdac: regulator@6 {
vdac: regulator-vdac {
compatible = "ti,twl6030-vdac";
};

vana: regulator@7 {
vana: regulator-vana {
compatible = "ti,twl6030-vana";
};

vcxio: regulator@8 {
vcxio: regulator-vcxio {
compatible = "ti,twl6030-vcxio";
regulator-always-on;
};

vusb: regulator@9 {
vusb: regulator-vusb {
compatible = "ti,twl6030-vusb";
};

v1v8: regulator@10 {
v1v8: regulator-v1v8 {
compatible = "ti,twl6030-v1v8";
regulator-always-on;
};

v2v1: regulator@11 {
v2v1: regulator-v2v1 {
compatible = "ti,twl6030-v2v1";
regulator-always-on;
};

clk32kg: regulator@12 {
clk32kg: regulator-clk32kg {
compatible = "ti,twl6030-clk32kg";
};
};

0 comments on commit 624411c

Please sign in to comment.