ARM: tegra: Fix AHB base address on Tegra20, Tegra30 and Tegra114

Current base address is wrong by 0x04 bytes for AHB bus device as shown
in dmesg:

	tegra-ahb 6000c004.ahb: incorrect AHB base address in DT data - enabling workaround

To correct old DTBs, commit ce7a10b0ff3d ("ARM: 8334/1: amba: tegra-ahb:
detect and correct bogus base address") checks for the low bit of the
base address and removes theses 0x04 bytes at runtime.

This patch fixes the original DTS, so upstream version doesn't need the
workaround of the base address.

As both addresses are valid, this patch doesn't break compatibility.

Tested on tegra20-paz00 (aka ac100).

Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
Reviewed-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index f58a3d9d5f1394760c4f931b27c5f31d2018f991..4bdf8f941c61e34b2b3452d18c698f6b87287ba8 100644 (file)
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -214,9 +214,9 @@
                #dma-cells = <1>;
        };
 
-       ahb: ahb@6000c004 {
+       ahb: ahb@6000c000 {
                compatible = "nvidia,tegra114-ahb", "nvidia,tegra30-ahb";
-               reg = <0x6000c004 0x14c>;
+               reg = <0x6000c000 0x150>;
        };
 
        gpio: gpio@6000d000 {

diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index f444b67f55c6becc04f33b2748ba5f28eb994d6c..f6f1461a7cdefa454b5881a531100838da23c8f0 100644 (file)
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -225,9 +225,9 @@
                #dma-cells = <1>;
        };
 
-       ahb@6000c004 {
+       ahb@6000c000 {
                compatible = "nvidia,tegra20-ahb";
-               reg = <0x6000c004 0x10c>; /* AHB Arbitration + Gizmo Controller */
+               reg = <0x6000c000 0x110>; /* AHB Arbitration + Gizmo Controller */
        };
 
        gpio: gpio@6000d000 {

diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index 782b11b2af6aa53470afed4f2432ce9f00a22c03..559763e00caa8fd204602abbca1c062fe3f4cff3 100644 (file)
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -329,9 +329,9 @@
                #dma-cells = <1>;
        };
 
-       ahb: ahb@6000c004 {
+       ahb: ahb@6000c000 {
                compatible = "nvidia,tegra30-ahb";
-               reg = <0x6000c004 0x14c>; /* AHB Arbitration + Gizmo Controller */
+               reg = <0x6000c000 0x150>; /* AHB Arbitration + Gizmo Controller */
        };
 
        gpio: gpio@6000d000 {