Skip to content

Commit 0d5ccb3

Browse files
kwizartthierryreding
authored andcommitted
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 ce7a10b ("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 <[email protected]> Reviewed-by: Paul Walmsley <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
1 parent 82fe42f commit 0d5ccb3

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

arch/arm/boot/dts/tegra114.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,9 @@
214214
#dma-cells = <1>;
215215
};
216216

217-
ahb: ahb@6000c004 {
217+
ahb: ahb@6000c000 {
218218
compatible = "nvidia,tegra114-ahb", "nvidia,tegra30-ahb";
219-
reg = <0x6000c004 0x14c>;
219+
reg = <0x6000c000 0x150>;
220220
};
221221

222222
gpio: gpio@6000d000 {

arch/arm/boot/dts/tegra20.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,9 @@
225225
#dma-cells = <1>;
226226
};
227227

228-
ahb@6000c004 {
228+
ahb@6000c000 {
229229
compatible = "nvidia,tegra20-ahb";
230-
reg = <0x6000c004 0x10c>; /* AHB Arbitration + Gizmo Controller */
230+
reg = <0x6000c000 0x110>; /* AHB Arbitration + Gizmo Controller */
231231
};
232232

233233
gpio: gpio@6000d000 {

arch/arm/boot/dts/tegra30.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,9 +329,9 @@
329329
#dma-cells = <1>;
330330
};
331331

332-
ahb: ahb@6000c004 {
332+
ahb: ahb@6000c000 {
333333
compatible = "nvidia,tegra30-ahb";
334-
reg = <0x6000c004 0x14c>; /* AHB Arbitration + Gizmo Controller */
334+
reg = <0x6000c000 0x150>; /* AHB Arbitration + Gizmo Controller */
335335
};
336336

337337
gpio: gpio@6000d000 {

0 commit comments

Comments
 (0)