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

Commit 0e55f0b0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into next/fixes-non-critical 

From Nicolas Ferre:
Correction of 9x5 and 9n12 USART nodes

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91/DT: remove atmel,use-dma-* from 9x5 and 9n12 USART nodes
parents cae617b6 c3f0f282

arch/arm/boot/dts/at91sam9n12.dtsi

+0 −8
Original line number Original line Diff line number Diff line
@@ -324,8 +324,6 @@ 
				compatible = "atmel,at91sam9260-usart";

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf801c000 0x4000>;

				reg = <0xf801c000 0x4000>;

				interrupts = <5 4 5>;

				interrupts = <5 4 5>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				pinctrl-names = "default";

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart0>;

				pinctrl-0 = <&pinctrl_usart0>;

				status = "disabled";

				status = "disabled";
@@ -335,8 +333,6 @@ 
				compatible = "atmel,at91sam9260-usart";

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8020000 0x4000>;

				reg = <0xf8020000 0x4000>;

				interrupts = <6 4 5>;

				interrupts = <6 4 5>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				pinctrl-names = "default";

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart1>;

				pinctrl-0 = <&pinctrl_usart1>;

				status = "disabled";

				status = "disabled";
@@ -346,8 +342,6 @@ 
				compatible = "atmel,at91sam9260-usart";

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8024000 0x4000>;

				reg = <0xf8024000 0x4000>;

				interrupts = <7 4 5>;

				interrupts = <7 4 5>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				pinctrl-names = "default";

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart2>;

				pinctrl-0 = <&pinctrl_usart2>;

				status = "disabled";

				status = "disabled";
@@ -357,8 +351,6 @@ 
				compatible = "atmel,at91sam9260-usart";

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8028000 0x4000>;

				reg = <0xf8028000 0x4000>;

				interrupts = <8 4 5>;

				interrupts = <8 4 5>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				pinctrl-names = "default";

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart3>;

				pinctrl-0 = <&pinctrl_usart3>;

				status = "disabled";

				status = "disabled";

arch/arm/boot/dts/at91sam9x5.dtsi

+0 −6
Original line number Original line Diff line number Diff line
@@ -402,8 +402,6 @@ 
				compatible = "atmel,at91sam9260-usart";

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf801c000 0x200>;

				reg = <0xf801c000 0x200>;

				interrupts = <5 4 5>;

				interrupts = <5 4 5>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				pinctrl-names = "default";

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart0>;

				pinctrl-0 = <&pinctrl_usart0>;

				status = "disabled";

				status = "disabled";
@@ -413,8 +411,6 @@ 
				compatible = "atmel,at91sam9260-usart";

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8020000 0x200>;

				reg = <0xf8020000 0x200>;

				interrupts = <6 4 5>;

				interrupts = <6 4 5>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				pinctrl-names = "default";

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart1>;

				pinctrl-0 = <&pinctrl_usart1>;

				status = "disabled";

				status = "disabled";
@@ -424,8 +420,6 @@ 
				compatible = "atmel,at91sam9260-usart";

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8024000 0x200>;

				reg = <0xf8024000 0x200>;

				interrupts = <7 4 5>;

				interrupts = <7 4 5>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				pinctrl-names = "default";

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart2>;

				pinctrl-0 = <&pinctrl_usart2>;

				status = "disabled";

				status = "disabled";