ARM: dts: tegra20: fix GR3D, DSI unit and reg base addresses

Commit 58ecb23f64ee ("ARM: tegra: add missing unit addresses to DT") added
unit address and changed reg base for GR3D and DSI host1x modules, but these
addresses belongs to GR2D and TVO modules respectively. Fix it by changing
modules unit and reg base addresses to proper ones.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Fixes: 58ecb23f64ee (ARM: tegra: add missing unit addresses to DT)
Cc: <stable@vger.kernel.org> # v3.13+
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index 8acf5d85c99da5b0077f6ce1b80c2ba08d45865c..f76fe94267d6c34c4df0514384bede4aef2d9183 100644 (file)
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -68,9 +68,9 @@
                        reset-names = "2d";
                };
 
-               gr3d@54140000 {
+               gr3d@54180000 {
                        compatible = "nvidia,tegra20-gr3d";
-                       reg = <0x54140000 0x00040000>;
+                       reg = <0x54180000 0x00040000>;
                        clocks = <&tegra_car TEGRA20_CLK_GR3D>;
                        resets = <&tegra_car 24>;
                        reset-names = "3d";
@@ -130,9 +130,9 @@
                        status = "disabled";
                };
 
-               dsi@542c0000 {
+               dsi@54300000 {
                        compatible = "nvidia,tegra20-dsi";
-                       reg = <0x542c0000 0x00040000>;
+                       reg = <0x54300000 0x00040000>;
                        clocks = <&tegra_car TEGRA20_CLK_DSI>;
                        resets = <&tegra_car 48>;
                        reset-names = "dsi";