diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:03:07 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:03:07 +0800 |
| commit | 1c563c0006661025d7a6c9bc85fc889a4e8a1c06 (patch) | |
| tree | 93d455583031d0cacebfd436d5b2118a536de5f7 /arch/arm/boot | |
| parent | 71205f3b80da389c52cc2611f59e183a77c56f4f (diff) | |
| parent | 28ec98bc2e4a175b60f45d505e715a33b93dd077 (diff) | |
Merge tag 'v4.4.55' into linux-linaro-lsk-v4.4lsk-v4.4-17.03
This is the 4.4.55 stable release
Diffstat (limited to 'arch/arm/boot')
| -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 e74df327cdd3..20618a897c99 100644 --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts @@ -122,6 +122,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 da84e65b56ef..e27024cdf48b 100644 --- a/arch/arm/boot/dts/at91-sama5d4_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts @@ -110,6 +110,8 @@ }; usart3: serial@fc00c000 { + atmel,use-dma-rx; + atmel,use-dma-tx; status = "okay"; }; |