Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4794986 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-ab-4.11-dt2' of...

Merge tag 'at91-ab-4.11-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt

DT for 4.11 #2:

 - Enable the DMA on sama5d2 and sama5d4 xplained to fix an issue seen by
 kernelci

* tag 'at91-ab-4.11-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

:
  ARM: dts: at91: Enable DMA on sama5d2_xplained console
  ARM: dts: at91: Enable DMA on sama5d4_xplained console

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 18e738d7 78162d48
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -148,6 +148,8 @@
			uart1: serial@f8020000 {
				pinctrl-names = "default";
				pinctrl-0 = <&pinctrl_uart1_default>;
				atmel,use-dma-rx;
				atmel,use-dma-tx;
				status = "okay";
			};

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@
			};

			usart3: serial@fc00c000 {
				atmel,use-dma-rx;
				atmel,use-dma-tx;
				status = "okay";
			};