Skip to contentSkip to conversation

Fix AHB base address on tegra20, tegra30 and tegra114

PATCH New Nicolas Chauvet 3 participants 3 messages Aug 8, 2015 – Aug 13, 2015

Subsystems (2)
Device tree bindings Tegra architecture support
lore
Share & tools
lore

Nicolas Chauvet

author
#0 lore raw

PATCH 1/1 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, the commit ce7a10b0ff3db63 checks for the low bit of the base address and removes theses 0x04 bytes at runtime.

This patch fix 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 <[email protected]>
---
 arch/arm/boot/dts/tegra114.dtsi | 4 ++--
 arch/arm/boot/dts/tegra20.dtsi  | 4 ++--
 arch/arm/boot/dts/tegra30.dtsi  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/tegra114.dtsi +2 -2
index f58a3d9..4bdf8f9 100644
@@ -214,9 +214,9 @@
 		#dma-cells = <1>;
 	};
 
-	ahb: ahb at 6000c004 {
+	ahb: ahb at 6000c000 {
 		compatible = "nvidia,tegra114-ahb", "nvidia,tegra30-ahb";
-		reg = <0x6000c004 0x14c>;
+		reg = <0x6000c000 0x150>;
 	};
 
 	gpio: gpio at 6000d000 {
arch/arm/boot/dts/tegra20.dtsi +2 -2
index f444b67..f6f1461 100644
@@ -225,9 +225,9 @@
 		#dma-cells = <1>;
 	};
 
-	ahb at 6000c004 {
+	ahb at 6000c000 {
 		compatible = "nvidia,tegra20-ahb";
-		reg = <0x6000c004 0x10c>; /* AHB Arbitration + Gizmo Controller */
+		reg = <0x6000c000 0x110>; /* AHB Arbitration + Gizmo Controller */
 	};
 
 	gpio: gpio at 6000d000 {
arch/arm/boot/dts/tegra30.dtsi +2 -2
index 782b11b..559763e 100644
@@ -329,9 +329,9 @@
 		#dma-cells = <1>;
 	};
 
-	ahb: ahb at 6000c004 {
+	ahb: ahb at 6000c000 {
 		compatible = "nvidia,tegra30-ahb";
-		reg = <0x6000c004 0x14c>; /* AHB Arbitration + Gizmo Controller */
+		reg = <0x6000c000 0x150>; /* AHB Arbitration + Gizmo Controller */
 	};
 
 	gpio: gpio at 6000d000 {
Signature · 1 line
2.4.3
#1 lore raw

PATCH 1/1 Fix AHB base address on tegra20, tegra30 and tegra114

Quoted 6 lines · Nicolas Chauvet

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, the commit ce7a10b0ff3db63 checks for the low bit of the base address and removes theses 0x04 bytes at runtime.

Quoted 8 lines

This patch fix 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 <[email protected]>
Reviewed-by Paul Walmsley <[email protected]>

- Paul

Applied
#2 lore raw

PATCH 1/1 Fix AHB base address on tegra20, tegra30 and tegra114

In reply to Nicolas Chauvet
Quoted 11 lines · Nicolas Chauvet

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, the commit ce7a10b0ff3db63 checks for the low bit of the base address and removes theses 0x04 bytes at runtime.

This patch fix 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

Quoted 8 lines

Tested on tegra20-paz00 (aka ac100)

Signed-off-by Nicolas Chauvet <[email protected]>
---
 arch/arm/boot/dts/tegra114.dtsi | 4 ++--
 arch/arm/boot/dts/tegra20.dtsi  | 4 ++--
 arch/arm/boot/dts/tegra30.dtsi  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

Applied, thanks.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150813/f2090462/attachment.sig>