Merge commit '949bdcc8a97c' into omap-for-v4.19/dt
authorTony Lindgren <tony@atomide.com>
Wed, 11 Jul 2018 12:54:32 +0000 (05:54 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 11 Jul 2018 12:54:32 +0000 (05:54 -0700)
arch/arm/boot/dts/dra7.dtsi

index 9dcd14edc20287f80c73a3b95d21e303ffa6d39c..93fc2d79d33728e9d0cf5ce2e7c1623f00a137a6 100644 (file)
                        };
                };
 
-               dcan1: can@481cc000 {
+               dcan1: can@4ae3c000 {
                        compatible = "ti,dra7-d_can";
                        ti,hwmods = "dcan1";
                        reg = <0x4ae3c000 0x2000>;
                        status = "disabled";
                };
 
-               dcan2: can@481d0000 {
+               dcan2: can@48480000 {
                        compatible = "ti,dra7-d_can";
                        ti,hwmods = "dcan2";
                        reg = <0x48480000 0x2000>;