lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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 ce7a10b0ff ("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>
This commit is contained in:
Nicolas Chauvet 2015-08-08 15:58:12 +02:00 committed by Thierry Reding
parent 82fe42f5d7
commit 0d5ccb38d1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/tegra114.dtsi
View File

@ -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 {

4
arch/arm/boot/dts/tegra20.dtsi
View File

@ -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 {

4
arch/arm/boot/dts/tegra30.dtsi
View File

@ -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 {