UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correction of 9x5 and 9n12 USART nodes 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJRENe8AAoJEAf03oE53VmQhSUH/2ayxjgCbnCKWYEi0P8MoAiL
 KfX/FOLA+0cB1WnZqE6zmxUkCoTHArjOywHVN+zmjh6Qs8DN0UhWacy5WBqkhu2O
 C5GagBobhxYOdnRHqFEDip0XfYA0As+Rp2dyzMs9PhWQ8wpSFgZgPpUIxp8HjXIR
 mkom+piRz+QhcW3HoCp9MDwszARy//s2unEoxXMN8ECi32aV9hwcpDOW/v67vN9i
 Vm4SpFH6AKOM62HlpcismwtLydNgpbN3PYmstaRbk+JKXS1idBU72YU4MSL898ru
 sI7ztKM8NkXZmpKjWav6z7Hy/FUrvk0fSFEO1QkuSMCVlxMqTk+OH+Cla72kI+o=
 =CSe9
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Olof Johansson 2013-02-12 15:04:11 -08:00
parent cae617b64c c3f0f282d9
commit 0e55f0b003
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/boot/dts/at91sam9n12.dtsi
View File

@ -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";

6
arch/arm/boot/dts/at91sam9x5.dtsi
View File

@ -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";