Commit 9a5e3f27 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Tony Lindgren

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: 72b10ac0 ("ARM: dts: omap24xx: add minimal l4 bus
layout with control module support")

Fixes: 7415b0b4 ("ARM: dts: omap4: add minimal l4 bus layout
with control module support")

Fixes: ed8509ed ("ARM: dts: omap5: add minimal l4 bus
layout with control module support")

Fixes: d919501f ("ARM: dts: dra7: add minimal l4 bus
layout with control module support")
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
[tony@atomide.com: fixed omap3 pbias to work]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 4bbc2bc1
...@@ -120,6 +120,7 @@ scm_conf: scm_conf@0 { ...@@ -120,6 +120,7 @@ scm_conf: scm_conf@0 {
reg = <0x0 0x1400>; reg = <0x0 0x1400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0 0x0 0x1400>;
pbias_regulator: pbias_regulator { pbias_regulator: pbias_regulator {
compatible = "ti,pbias-dra7", "ti,pbias-omap"; compatible = "ti,pbias-dra7", "ti,pbias-omap";
......
...@@ -56,6 +56,7 @@ scm_conf: scm_conf@270 { ...@@ -56,6 +56,7 @@ scm_conf: scm_conf@270 {
reg = <0x270 0x240>; reg = <0x270 0x240>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0 0x270 0x240>;
scm_clocks: clocks { scm_clocks: clocks {
#address-cells = <1>; #address-cells = <1>;
......
...@@ -113,10 +113,22 @@ omap3_pmx_core: pinmux@30 { ...@@ -113,10 +113,22 @@ omap3_pmx_core: pinmux@30 {
}; };
scm_conf: scm_conf@270 { scm_conf: scm_conf@270 {
compatible = "syscon"; compatible = "syscon", "simple-bus";
reg = <0x270 0x330>; reg = <0x270 0x330>;
#address-cells = <1>; #address-cells = <1>;
#size-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 { scm_clocks: clocks {
#address-cells = <1>; #address-cells = <1>;
...@@ -202,17 +214,6 @@ sdma: dma-controller@48056000 { ...@@ -202,17 +214,6 @@ sdma: dma-controller@48056000 {
dma-requests = <96>; 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@48310000 { gpio1: gpio@48310000 {
compatible = "ti,omap3-gpio"; compatible = "ti,omap3-gpio";
reg = <0x48310000 0x200>; reg = <0x48310000 0x200>;
......
...@@ -196,6 +196,7 @@ omap4_padconf_global: omap4_padconf_global@5a0 { ...@@ -196,6 +196,7 @@ omap4_padconf_global: omap4_padconf_global@5a0 {
reg = <0x5a0 0x170>; reg = <0x5a0 0x170>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0 0x5a0 0x170>;
pbias_regulator: pbias_regulator { pbias_regulator: pbias_regulator {
compatible = "ti,pbias-omap4", "ti,pbias-omap"; compatible = "ti,pbias-omap4", "ti,pbias-omap";
......
...@@ -185,6 +185,7 @@ omap5_padconf_global: omap5_padconf_global@5a0 { ...@@ -185,6 +185,7 @@ omap5_padconf_global: omap5_padconf_global@5a0 {
reg = <0x5a0 0xec>; reg = <0x5a0 0xec>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0 0x5a0 0xec>;
pbias_regulator: pbias_regulator { pbias_regulator: pbias_regulator {
compatible = "ti,pbias-omap5", "ti,pbias-omap"; compatible = "ti,pbias-omap5", "ti,pbias-omap";
......
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