Skip to content

Commit 5d791ec

Browse files
committed
Merge branch 'at91-5.4-trunk/dt' into linux-5.4-at91
2 parents e58388c + 15bc3df commit 5d791ec

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/arm/boot/dts/sama5d2.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@
716716

717717
can0: can@f8054000 {
718718
compatible = "bosch,m_can";
719-
reg = <0xf8054000 0x4000>, <0x210000 0x2000>;
719+
reg = <0xf8054000 0x4000>, <0x210000 0x1c00>;
720720
reg-names = "m_can", "message_ram";
721721
interrupts = <56 IRQ_TYPE_LEVEL_HIGH 7>,
722722
<64 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -941,7 +941,7 @@
941941

942942
can1: can@fc050000 {
943943
compatible = "bosch,m_can";
944-
reg = <0xfc050000 0x4000>, <0x210000 0x4000>;
944+
reg = <0xfc050000 0x4000>, <0x210000 0x3800>;
945945
reg-names = "m_can", "message_ram";
946946
interrupts = <57 IRQ_TYPE_LEVEL_HIGH 7>,
947947
<65 IRQ_TYPE_LEVEL_HIGH 7>;

0 commit comments

Comments
 (0)