diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-07-11 15:54:32 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-07-11 15:54:32 +0300 |
| commit | 792f98677d7f777a4f58e567b5b0578191cb986a (patch) | |
| tree | 0f87499e7a0dd9ab37c3562f73397af562326135 /arch/arm/boot/dts/dra7.dtsi | |
| parent | ab9a13665e7c25b31cbe4f6ea8acf2deaad5cacd (diff) | |
| parent | 949bdcc8a97c6078f21c8d4966436b117f2e4cd3 (diff) | |
| download | linux-792f98677d7f777a4f58e567b5b0578191cb986a.tar.xz | |
Merge commit '949bdcc8a97c' into omap-for-v4.19/dt
Diffstat (limited to 'arch/arm/boot/dts/dra7.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/dra7.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 9dcd14edc202..93fc2d79d337 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -1893,7 +1893,7 @@ }; }; - dcan1: can@481cc000 { + dcan1: can@4ae3c000 { compatible = "ti,dra7-d_can"; ti,hwmods = "dcan1"; reg = <0x4ae3c000 0x2000>; @@ -1903,7 +1903,7 @@ status = "disabled"; }; - dcan2: can@481d0000 { + dcan2: can@48480000 { compatible = "ti,dra7-d_can"; ti,hwmods = "dcan2"; reg = <0x48480000 0x2000>; |