Merge commit '949bdcc8' into omap-for-v4.19/dt

792f9867 · Tony Lindgren · ab9a1366 · 949bdcc8 · 792f9867
Commit 792f9867 authored Jul 11, 2018 by Tony Lindgren
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

arch/arm/boot/dts/dra7.dtsi arch/arm/boot/dts/dra7.dtsi +2 -2

No files found.
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -1893,7 +1893,7 @@ phy_sel: cpsw-phy-sel@4a002554 {
 			};
 		};
-		dcan1: can@481cc000 {
+		dcan1: can@4ae3c000 {
 			compatible = "ti,dra7-d_can";
 			ti,hwmods = "dcan1";
 			reg = <0x4ae3c000 0x2000>;
@@ -1903,7 +1903,7 @@ dcan1: can@481cc000 {
 			status = "disabled";
 		};
-		dcan2: can@481d0000 {
+		dcan2: can@48480000 {
 			compatible = "ti,dra7-d_can";
 			ti,hwmods = "dcan2";
 			reg = <0x48480000 0x2000>;