Skip to content

Commit

Permalink
ARM: tegra: Fix AHB base address on Tegra20, Tegra30 and Tegra114
Browse files Browse the repository at this point in the history
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 <kwizart@gmail.com>
Reviewed-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
  • Loading branch information
Nicolas Chauvet authored and Thierry Reding committed Aug 21, 2015
1 parent 82fe42f commit 0d5ccb3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/tegra114.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/tegra20.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/tegra30.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 0d5ccb3

Please sign in to comment.