Skip to contentSkip to conversation

ARM: tegra: update *.dts for regulator-compatible deprecation

PATCH New Stephen Warren 2 participants 3 messages Oct 2, 2012 – Oct 15, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: tegra: update *.dts for regulator-compatible deprecation

From: Stephen Warren <[email protected]>

Commit 13511de "regulator: deprecate regulator-compatible DT property" now allows for simpler content within the regulators node within a PMIC. Modify all the Tegra device tree files to take advantage of this.

---
 arch/arm/boot/dts/tegra20-harmony.dts   |   63 ++++------------
 arch/arm/boot/dts/tegra20-paz00.dts     |   59 ++++------------
 arch/arm/boot/dts/tegra20-seaboard.dts  |   59 ++++------------
 arch/arm/boot/dts/tegra20-tamonten.dtsi |   63 ++++------------
 arch/arm/boot/dts/tegra20-ventana.dts   |   59 ++++------------
 arch/arm/boot/dts/tegra20-whistler.dts  |  119 ++++++++-----------------------
 arch/arm/boot/dts/tegra30-cardhu.dtsi   |   47 +++---------
 7 files changed, 112 insertions(+), 357 deletions(-)
arch/arm/boot/dts/tegra20-harmony.dts +15 -48
index c3ef1ad..74b8a47 100644
@@ -297,131 +297,98 @@
 			vinldo9-supply = <&sm2_reg>;
 
 			regulators {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				sys_reg: regulator at 0 {
-					reg = <0>;
-					regulator-compatible = "sys";
+				sys_reg: sys {
 					regulator-name = "vdd_sys";
 					regulator-always-on;
 				};
 
-				regulator at 1 {
-					reg = <1>;
-					regulator-compatible = "sm0";
+				sm0 {
 					regulator-name = "vdd_sm0,vdd_core";
 					regulator-min-microvolt = <1200000>;
 					regulator-max-microvolt = <1200000>;
 					regulator-always-on;
 				};
 
-				regulator at 2 {
-					reg = <2>;
-					regulator-compatible = "sm1";
+				sm1 {
 					regulator-name = "vdd_sm1,vdd_cpu";
 					regulator-min-microvolt = <1000000>;
 					regulator-max-microvolt = <1000000>;
 					regulator-always-on;
 				};
 
-				sm2_reg: regulator at 3 {
-					reg = <3>;
-					regulator-compatible = "sm2";
+				sm2_reg: sm2 {
 					regulator-name = "vdd_sm2,vin_ldo*";
 					regulator-min-microvolt = <3700000>;
 					regulator-max-microvolt = <3700000>;
 					regulator-always-on;
 				};
 
-				regulator at 4 {
-					reg = <4>;
-					regulator-compatible = "ldo0";
+				ldo0 {
 					regulator-name = "vdd_ldo0,vddio_pex_clk";
 					regulator-min-microvolt = <3300000>;
 					regulator-max-microvolt = <3300000>;
 				};
 
-				regulator at 5 {
-					reg = <5>;
-					regulator-compatible = "ldo1";
+				ldo1 {
 					regulator-name = "vdd_ldo1,avdd_pll*";
 					regulator-min-microvolt = <1100000>;
 					regulator-max-microvolt = <1100000>;
 					regulator-always-on;
 				};
 
-				regulator at 6 {
-					reg = <6>;
-					regulator-compatible = "ldo2";
+				ldo2 {
 					regulator-name = "vdd_ldo2,vdd_rtc";
 					regulator-min-microvolt = <1200000>;
 					regulator-max-microvolt = <1200000>;
 				};
 
-				regulator at 7 {
-					reg = <7>;
-					regulator-compatible = "ldo3";
+				ldo3 {
 					regulator-name = "vdd_ldo3,avdd_usb*";
 					regulator-min-microvolt = <3300000>;
 					regulator-max-microvolt = <3300000>;
 					regulator-always-on;
 				};
 
-				regulator at 8 {
-					reg = <8>;
-					regulator-compatible = "ldo4";
+				ldo4 {
 					regulator-name = "vdd_ldo4,avdd_osc,vddio_sys";
 					regulator-min-microvolt = <1800000>;
 					regulator-max-microvolt = <1800000>;
 					regulator-always-on;
 				};
 
-				regulator at 9 {
-					reg = <9>;
-					regulator-compatible = "ldo5";
+				ldo5 {
 					regulator-name = "vdd_ldo5,vcore_mmc";
 					regulator-min-microvolt = <2850000>;
 					regulator-max-microvolt = <2850000>;
 					regulator-always-on;
 				};
 
-				regulator at 10 {
-					reg = <10>;
-					regulator-compatible = "ldo6";
+				ldo6 {
 					regulator-name = "vdd_ldo6,avdd_vdac";
 					regulator-min-microvolt = <1800000>;
 					regulator-max-microvolt = <1800000>;
 				};
 
-				regulator at 11 {
-					reg = <11>;
-					regulator-compatible = "ldo7";
+				ldo7 {
 					regulator-name = "vdd_ldo7,avdd_hdmi";
 					regulator-min-microvolt = <3300000>;
 					regulator-max-microvolt = <3300000>;
 				};
 
-				regulator at 12 {
-					reg = <12>;
-					regulator-compatible = "ldo8";
+				ldo8 {
 					regulator-name = "vdd_ldo8,avdd_hdmi_pll";
 					regulator-min-microvolt = <1800000>;
 					regulator-max-microvolt = <1800000>;
 				};
 
-				regulator at 13 {
-					reg = <13>;
-					regulator-compatible = "ldo9";
+				ldo9 {
 					regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx";
 					regulator-min-microvolt = <2850000>;
 					regulator-max-microvolt = <2850000>;
 					regulator-always-on;
 				};
 
-				regulator at 14 {
-					reg = <14>;
-					regulator-compatible = "ldo_rtc";
+				ldo_rtc {
 					regulator-name = "vdd_rtc_out,vdd_cell";
 					regulator-min-microvolt = <3300000>;
 					regulator-max-microvolt = <3300000>;
arch/arm/boot/dts/tegra20-paz00.dts +14 -45

138 lines not on this page · raw message

arch/arm/boot/dts/tegra20-seaboard.dts +14 -45

137 lines not on this page · raw message

arch/arm/boot/dts/tegra20-tamonten.dtsi +15 -48

146 lines not on this page · raw message

arch/arm/boot/dts/tegra20-ventana.dts +14 -45

137 lines not on this page · raw message

arch/arm/boot/dts/tegra20-whistler.dts +29 -90

272 lines not on this page · raw message

arch/arm/boot/dts/tegra30-cardhu.dtsi +11 -36

111 lines not on this page · raw message

Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 ARM: tegra: update *.dts for regulator-compatible deprecation

Quoted 7 lines · Stephen Warren

From: Stephen Warren <[email protected]>

Commit 13511de "regulator: deprecate regulator-compatible DT property" now allows for simpler content within the regulators node within a PMIC. Modify all the Tegra device tree files to take advantage of this.

Quoted 9 lines
---
 arch/arm/boot/dts/tegra20-harmony.dts   |   63 ++++------------
 arch/arm/boot/dts/tegra20-paz00.dts     |   59 ++++------------
 arch/arm/boot/dts/tegra20-seaboard.dts  |   59 ++++------------
 arch/arm/boot/dts/tegra20-tamonten.dtsi |   63 ++++------------
 arch/arm/boot/dts/tegra20-ventana.dts   |   59 ++++------------
 arch/arm/boot/dts/tegra20-whistler.dts  |  119 ++++++++-----------------------
 arch/arm/boot/dts/tegra30-cardhu.dtsi   |   47 +++---------
 7 files changed, 112 insertions(+), 357 deletions(-)

Funny how this has come full circle.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121002/698128c5/attachment-0001.sig>

author Applied
#2 lore raw

PATCH 1/1 ARM: tegra: update *.dts for regulator-compatible deprecation

In reply to Stephen Warren
Quoted 5 lines · Stephen Warren

From: Stephen Warren <[email protected]>

Commit 13511de "regulator: deprecate regulator-compatible DT property" now allows for simpler content within the regulators node within a PMIC. Modify all the Tegra device tree files to take advantage of this.

Applied to Tegra's for-3.8/cleanup.