diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-30 07:56:06 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-30 07:56:06 +0300 |
| commit | d47949868bc2232242eef91de2919bc3a024ae3e (patch) | |
| tree | 73c1d878c132a5a66f192f21674372c38a00aca9 /arch | |
| parent | 18e738d767542675bc15f296f9d87ff8444c0b94 (diff) | |
| parent | 78162d48466d23c45a784034630c5928af631e3d (diff) | |
| download | linux-d47949868bc2232242eef91de2919bc3a024ae3e.tar.xz | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/at91-sama5d2_xplained.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/at91-sama5d4_xplained.dts | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts index e2d5cb3fecb1..9f7f8a7d8ff9 100644 --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts @@ -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"; }; diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/at91-sama5d4_xplained.dts index 91cf69e26aa1..5ab14cedb1db 100644 --- a/arch/arm/boot/dts/at91-sama5d4_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts @@ -116,6 +116,8 @@ }; usart3: serial@fc00c000 { + atmel,use-dma-rx; + atmel,use-dma-tx; status = "okay"; }; |