]> Pileus Git - ~andy/linux/commitdiff
ARM: tegra: fix Tegra114 IOMMU register address
authorHiroshi Doyu <hdoyu@nvidia.com>
Wed, 30 Oct 2013 23:17:48 +0000 (17:17 -0600)
committerOlof Johansson <olof@lixom.net>
Thu, 31 Oct 2013 00:38:27 +0000 (17:38 -0700)
The IOMMU node's reg property contains completely bogus values! Somehow,
this had no practical effect, despite the fact the IOMMU driver appears
to be writing to those registers. I suppose that since no HW modules is
actually at that address, the writes simply had no effect.

Note that I'm not CCing stable here, even though the problem exists as
far back as v3.9, simply because this patch doesn't fix any observed
issue, and I don't want to run the risk of suddenly writing to some
registers and causing a regression.

Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
[swarren, wrote commit description]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/boot/dts/tegra114.dtsi

index 2905145d8e59a4ad9c5d3ff88bb6fcbb10593b2e..8d42787c8ff172a0b8594899b8ef92dd08d2be10 100644 (file)
 
        iommu {
                compatible = "nvidia,tegra114-smmu", "nvidia,tegra30-smmu";
-               reg = <0x7000f010 0x02c
-                      0x7000f1f0 0x010
-                      0x7000f228 0x074>;
+               reg = <0x70019010 0x02c
+                      0x700191f0 0x010
+                      0x70019228 0x074>;
                nvidia,#asids = <4>;
                dma-window = <0 0x40000000>;
                nvidia,swgroups = <0x18659fe>;