Skip to contentSkip to conversation

ARM: dts: <omap2/omap4/omap5/dra7>>: fix address translation for pbias

PATCH In review Kishon Vijay Abraham I 2 participants 2 messages Sep 4, 2015 – Sep 25, 2015 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ARM: dts: <omap2/omap4/omap5/dra7>>: fix address translation for pbias

"ARM: dts: <omap2/omap4/omap5/dra7>: add minimal l4 bus layout with control module support" moved pbias_regulator dt node from being a child node of ocp to be the child node of 'syscon'. Since 'syscon' doesn't have the 'ranges' property, address translation fails while trying to convert the address to resource. Fix it here by populating 'ranges' property in syscon dt node.

Fixes 72b10ac00eb1 ("ARM: dts: omap24xx: add minimal l4 bus

layout with control module support")

Fixes 7415b0b4c645 ("ARM: dts: omap4: add minimal l4 bus layout

with control module support")

Fixes ed8509edddeb ("ARM: dts: omap5: add minimal l4 bus

layout with control module support")

Fixes d919501feffa ("ARM: dts: dra7: add minimal l4 bus

layout with control module support")

---
Changes from v1:
*) squashed [1] to a single patch
[1] -> https://lkml.org/lkml/2015/9/3/166

 arch/arm/boot/dts/dra7.dtsi     |    1 +
 arch/arm/boot/dts/omap2430.dtsi |    1 +
 arch/arm/boot/dts/omap4.dtsi    |    1 +
 arch/arm/boot/dts/omap5.dtsi    |    1 +
 4 files changed, 4 insertions(+)
arch/arm/boot/dts/dra7.dtsi +1 -0
index d6bc6db..5896896 100644
@@ -120,6 +120,7 @@
 					reg = <0x0 0x1400>;
 					#address-cells = <1>;
 					#size-cells = <1>;
+					ranges = <0 0x0 0x1400>;
 
 					pbias_regulator: pbias_regulator {
 						compatible = "ti,pbias-dra7", "ti,pbias-omap";
arch/arm/boot/dts/omap2430.dtsi +1 -0
index 3961a6f..798dda0 100644
@@ -56,6 +56,7 @@
 					reg = <0x270 0x240>;
 					#address-cells = <1>;
 					#size-cells = <1>;
+					ranges = <0 0x270 0x240>;
 
 					scm_clocks: clocks {
 						#address-cells = <1>;
arch/arm/boot/dts/omap4.dtsi +1 -0
index 5aad7f3..5a206c1 100644
@@ -196,6 +196,7 @@
 					reg = <0x5a0 0x170>;
 					#address-cells = <1>;
 					#size-cells = <1>;
+					ranges = <0 0x5a0 0x170>;
 
 					pbias_regulator: pbias_regulator {
 						compatible = "ti,pbias-omap4", "ti,pbias-omap";
arch/arm/boot/dts/omap5.dtsi +1 -0
index 76ef595..dd7a0e8 100644
@@ -185,6 +185,7 @@
 					reg = <0x5a0 0xec>;
 					#address-cells = <1>;
 					#size-cells = <1>;
+					ranges = <0 0x5a0 0xec>;
 
 					pbias_regulator: pbias_regulator {
 						compatible = "ti,pbias-omap5", "ti,pbias-omap";
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 7 lines · Kishon Vijay Abraham I

"ARM: dts: <omap2/omap4/omap5/dra7>: add minimal l4 bus layout with control module support" moved pbias_regulator dt node from being a child node of ocp to be the child node of 'syscon'. Since 'syscon' doesn't have the 'ranges' property, address translation fails while trying to convert the address to resource. Fix it here by populating 'ranges' property in syscon dt node.

I'm applying the following version of this with omap3 device tree booting fixed for MMC.

Regards,

Tony

8<-----------------------From 9a5e3f27d1b8ca349b79e8b5fe1874eeeedb6f45 Mon Sep 17 00:00:00 2001
From: Kishon Vijay Abraham I <[email protected]>
Date: Fri, 4 Sep 2015 17:38:24 +0530
Subject: [PATCH] ARM: dts: fix omap2+ address translation for pbias

"ARM: dts: <omap2/omap4/omap5/dra7>: add minimal l4 bus layout with control module support" moved pbias_regulator dt node from being a child node of ocp to be the child node of 'syscon'. Since 'syscon' doesn't have the 'ranges' property, address translation fails while trying to convert the address to resource. Fix it here by populating 'ranges' property in syscon dt node.

Fixes 72b10ac00eb1 ("ARM: dts: omap24xx: add minimal l4 bus

layout with control module support")

Fixes 7415b0b4c645 ("ARM: dts: omap4: add minimal l4 bus layout

with control module support")

Fixes ed8509edddeb ("ARM: dts: omap5: add minimal l4 bus

layout with control module support")

Fixes d919501feffa ("ARM: dts: dra7: add minimal l4 bus

layout with control module support")

[tony at atomide.com: fixed omap3 pbias to work]
arch/arm/boot/dts/dra7.dtsi +1 -0
@@ -120,6 +120,7 @@
 					reg = <0x0 0x1400>;
 					#address-cells = <1>;
 					#size-cells = <1>;
+					ranges = <0 0x0 0x1400>;
 
 					pbias_regulator: pbias_regulator {
 						compatible = "ti,pbias-dra7", "ti,pbias-omap";
arch/arm/boot/dts/omap2430.dtsi +1 -0
@@ -56,6 +56,7 @@
 					reg = <0x270 0x240>;
 					#address-cells = <1>;
 					#size-cells = <1>;
+					ranges = <0 0x270 0x240>;
 
 					scm_clocks: clocks {
 						#address-cells = <1>;
arch/arm/boot/dts/omap3.dtsi +13 -12
@@ -113,10 +113,22 @@
 				};
 
 				scm_conf: scm_conf at 270 {
-					compatible = "syscon";
+					compatible = "syscon", "simple-bus";
 					reg = <0x270 0x330>;
 					#address-cells = <1>;
 					#size-cells = <1>;
+					ranges = <0 0x270 0x330>;
+
+					pbias_regulator: pbias_regulator {
+						compatible = "ti,pbias-omap3", "ti,pbias-omap";
+						reg = <0x2b0 0x4>;
+						syscon = <&scm_conf>;
+						pbias_mmc_reg: pbias_mmc_omap2430 {
+							regulator-name = "pbias_mmc_omap2430";
+							regulator-min-microvolt = <1800000>;
+							regulator-max-microvolt = <3000000>;
+						};
+					};
 
 					scm_clocks: clocks {
 						#address-cells = <1>;
@@ -202,17 +214,6 @@
 			dma-requests = <96>;
 		};
 
-		pbias_regulator: pbias_regulator {
-			compatible = "ti,pbias-omap3", "ti,pbias-omap";
-			reg = <0x2b0 0x4>;
-			syscon = <&scm_conf>;
-			pbias_mmc_reg: pbias_mmc_omap2430 {
-				regulator-name = "pbias_mmc_omap2430";
-				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <3000000>;
-			};
-		};
-
 		gpio1: gpio at 48310000 {
 			compatible = "ti,omap3-gpio";
 			reg = <0x48310000 0x200>;
arch/arm/boot/dts/omap4.dtsi +1 -0
@@ -196,6 +196,7 @@
 					reg = <0x5a0 0x170>;
 					#address-cells = <1>;
 					#size-cells = <1>;
+					ranges = <0 0x5a0 0x170>;
 
 					pbias_regulator: pbias_regulator {
 						compatible = "ti,pbias-omap4", "ti,pbias-omap";
arch/arm/boot/dts/omap5.dtsi +1 -0
@@ -185,6 +185,7 @@
 					reg = <0x5a0 0xec>;
 					#address-cells = <1>;
 					#size-cells = <1>;
+					ranges = <0 0x5a0 0xec>;
 
 					pbias_regulator: pbias_regulator {
 						compatible = "ti,pbias-omap5", "ti,pbias-omap";