aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-29 11:26:36 -0400
committerArnd Bergmann <arnd@arndb.de>2013-04-29 11:28:37 -0400
commitb45e0ed41adee52c49c222e752495d69d7e57981 (patch)
tree047a1bc78938b7b8e4bd1d587da06f49cd37f285
parentaabdd2901ad0bfaeaf108eb29183cbb270dba3bf (diff)
parenta6268b86483ba91c9df3e278bbc82d665d781d9e (diff)
Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into late/cleanup
From Nicolas Ferre <nicolas.ferre@atmel.com>: DT modifications for generic slave DMA binding. Addition of MCI and I2C DMA bindings. A little DT machine compatibility removal for SAMA5. * tag 'at91-soc' of git://github.com/at91linux/linux-at91: ARM: at91/sama5d34ek.dts: remove not needed compatibility string ARM: at91: dts: add MCI DMA support ARM: at91: dts: add i2c dma support ARM: at91: dts: set #dma-cells to the correct value Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat
-rw-r--r--arch/arm/boot/dts/at91sam9g45.dtsi5
-rw-r--r--arch/arm/boot/dts/at91sam9n12.dtsi9
-rw-r--r--arch/arm/boot/dts/at91sam9x5.dtsi15
-rw-r--r--arch/arm/boot/dts/sama5d3.dtsi19
-rw-r--r--arch/arm/boot/dts/sama5d34ek.dts2
5 files changed, 47 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 6b1d4cab24c2..2b6e30cbc48b 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -108,6 +108,7 @@
108 compatible = "atmel,at91sam9g45-dma"; 108 compatible = "atmel,at91sam9g45-dma";
109 reg = <0xffffec00 0x200>; 109 reg = <0xffffec00 0x200>;
110 interrupts = <21 4 0>; 110 interrupts = <21 4 0>;
111 #dma-cells = <2>;
111 }; 112 };
112 113
113 pinctrl@fffff200 { 114 pinctrl@fffff200 {
@@ -512,6 +513,8 @@
512 compatible = "atmel,hsmci"; 513 compatible = "atmel,hsmci";
513 reg = <0xfff80000 0x600>; 514 reg = <0xfff80000 0x600>;
514 interrupts = <11 4 0>; 515 interrupts = <11 4 0>;
516 dmas = <&dma 1 0>;
517 dma-names = "rxtx";
515 #address-cells = <1>; 518 #address-cells = <1>;
516 #size-cells = <0>; 519 #size-cells = <0>;
517 status = "disabled"; 520 status = "disabled";
@@ -521,6 +524,8 @@
521 compatible = "atmel,hsmci"; 524 compatible = "atmel,hsmci";
522 reg = <0xfffd0000 0x600>; 525 reg = <0xfffd0000 0x600>;
523 interrupts = <29 4 0>; 526 interrupts = <29 4 0>;
527 dmas = <&dma 1 13>;
528 dma-names = "rxtx";
524 #address-cells = <1>; 529 #address-cells = <1>;
525 #size-cells = <0>; 530 #size-cells = <0>;
526 status = "disabled"; 531 status = "disabled";
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 7750f98dd764..b0bd70485f87 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -89,6 +89,8 @@
89 compatible = "atmel,hsmci"; 89 compatible = "atmel,hsmci";
90 reg = <0xf0008000 0x600>; 90 reg = <0xf0008000 0x600>;
91 interrupts = <12 4 0>; 91 interrupts = <12 4 0>;
92 dmas = <&dma 1 0>;
93 dma-names = "rxtx";
92 #address-cells = <1>; 94 #address-cells = <1>;
93 #size-cells = <0>; 95 #size-cells = <0>;
94 status = "disabled"; 96 status = "disabled";
@@ -110,6 +112,7 @@
110 compatible = "atmel,at91sam9g45-dma"; 112 compatible = "atmel,at91sam9g45-dma";
111 reg = <0xffffec00 0x200>; 113 reg = <0xffffec00 0x200>;
112 interrupts = <20 4 0>; 114 interrupts = <20 4 0>;
115 #dma-cells = <2>;
113 }; 116 };
114 117
115 pinctrl@fffff400 { 118 pinctrl@fffff400 {
@@ -360,6 +363,9 @@
360 compatible = "atmel,at91sam9x5-i2c"; 363 compatible = "atmel,at91sam9x5-i2c";
361 reg = <0xf8010000 0x100>; 364 reg = <0xf8010000 0x100>;
362 interrupts = <9 4 6>; 365 interrupts = <9 4 6>;
366 dmas = <&dma 1 13>,
367 <&dma 1 14>;
368 dma-names = "tx", "rx";
363 #address-cells = <1>; 369 #address-cells = <1>;
364 #size-cells = <0>; 370 #size-cells = <0>;
365 status = "disabled"; 371 status = "disabled";
@@ -369,6 +375,9 @@
369 compatible = "atmel,at91sam9x5-i2c"; 375 compatible = "atmel,at91sam9x5-i2c";
370 reg = <0xf8014000 0x100>; 376 reg = <0xf8014000 0x100>;
371 interrupts = <10 4 6>; 377 interrupts = <10 4 6>;
378 dmas = <&dma 1 15>,
379 <&dma 1 16>;
380 dma-names = "tx", "rx";
372 #address-cells = <1>; 381 #address-cells = <1>;
373 #size-cells = <0>; 382 #size-cells = <0>;
374 status = "disabled"; 383 status = "disabled";
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index a98c0d50fbbe..cbb94732786c 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -104,12 +104,14 @@
104 compatible = "atmel,at91sam9g45-dma"; 104 compatible = "atmel,at91sam9g45-dma";
105 reg = <0xffffec00 0x200>; 105 reg = <0xffffec00 0x200>;
106 interrupts = <20 4 0>; 106 interrupts = <20 4 0>;
107 #dma-cells = <2>;
107 }; 108 };
108 109
109 dma1: dma-controller@ffffee00 { 110 dma1: dma-controller@ffffee00 {
110 compatible = "atmel,at91sam9g45-dma"; 111 compatible = "atmel,at91sam9g45-dma";
111 reg = <0xffffee00 0x200>; 112 reg = <0xffffee00 0x200>;
112 interrupts = <21 4 0>; 113 interrupts = <21 4 0>;
114 #dma-cells = <2>;
113 }; 115 };
114 116
115 pinctrl@fffff400 { 117 pinctrl@fffff400 {
@@ -399,6 +401,8 @@
399 compatible = "atmel,hsmci"; 401 compatible = "atmel,hsmci";
400 reg = <0xf0008000 0x600>; 402 reg = <0xf0008000 0x600>;
401 interrupts = <12 4 0>; 403 interrupts = <12 4 0>;
404 dmas = <&dma0 1 0>;
405 dma-names = "rxtx";
402 #address-cells = <1>; 406 #address-cells = <1>;
403 #size-cells = <0>; 407 #size-cells = <0>;
404 status = "disabled"; 408 status = "disabled";
@@ -408,6 +412,8 @@
408 compatible = "atmel,hsmci"; 412 compatible = "atmel,hsmci";
409 reg = <0xf000c000 0x600>; 413 reg = <0xf000c000 0x600>;
410 interrupts = <26 4 0>; 414 interrupts = <26 4 0>;
415 dmas = <&dma1 1 0>;
416 dma-names = "rxtx";
411 #address-cells = <1>; 417 #address-cells = <1>;
412 #size-cells = <0>; 418 #size-cells = <0>;
413 status = "disabled"; 419 status = "disabled";
@@ -469,6 +475,9 @@
469 compatible = "atmel,at91sam9x5-i2c"; 475 compatible = "atmel,at91sam9x5-i2c";
470 reg = <0xf8010000 0x100>; 476 reg = <0xf8010000 0x100>;
471 interrupts = <9 4 6>; 477 interrupts = <9 4 6>;
478 dmas = <&dma0 1 7>,
479 <&dma0 1 8>;
480 dma-names = "tx", "rx";
472 #address-cells = <1>; 481 #address-cells = <1>;
473 #size-cells = <0>; 482 #size-cells = <0>;
474 status = "disabled"; 483 status = "disabled";
@@ -478,6 +487,9 @@
478 compatible = "atmel,at91sam9x5-i2c"; 487 compatible = "atmel,at91sam9x5-i2c";
479 reg = <0xf8014000 0x100>; 488 reg = <0xf8014000 0x100>;
480 interrupts = <10 4 6>; 489 interrupts = <10 4 6>;
490 dmas = <&dma1 1 5>,
491 <&dma1 1 6>;
492 dma-names = "tx", "rx";
481 #address-cells = <1>; 493 #address-cells = <1>;
482 #size-cells = <0>; 494 #size-cells = <0>;
483 status = "disabled"; 495 status = "disabled";
@@ -487,6 +499,9 @@
487 compatible = "atmel,at91sam9x5-i2c"; 499 compatible = "atmel,at91sam9x5-i2c";
488 reg = <0xf8018000 0x100>; 500 reg = <0xf8018000 0x100>;
489 interrupts = <11 4 6>; 501 interrupts = <11 4 6>;
502 dmas = <&dma0 1 9>,
503 <&dma0 1 10>;
504 dma-names = "tx", "rx";
490 #address-cells = <1>; 505 #address-cells = <1>;
491 #size-cells = <0>; 506 #size-cells = <0>;
492 status = "disabled"; 507 status = "disabled";
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 39b0458d365a..2e643ea51cce 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -60,6 +60,8 @@
60 compatible = "atmel,hsmci"; 60 compatible = "atmel,hsmci";
61 reg = <0xf0000000 0x600>; 61 reg = <0xf0000000 0x600>;
62 interrupts = <21 4 0>; 62 interrupts = <21 4 0>;
63 dmas = <&dma0 2 0>;
64 dma-names = "rxtx";
63 pinctrl-names = "default"; 65 pinctrl-names = "default";
64 pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7>; 66 pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7>;
65 status = "disabled"; 67 status = "disabled";
@@ -111,6 +113,9 @@
111 compatible = "atmel,at91sam9x5-i2c"; 113 compatible = "atmel,at91sam9x5-i2c";
112 reg = <0xf0014000 0x4000>; 114 reg = <0xf0014000 0x4000>;
113 interrupts = <18 4 6>; 115 interrupts = <18 4 6>;
116 dmas = <&dma0 2 7>,
117 <&dma0 2 8>;
118 dma-names = "tx", "rx";
114 pinctrl-names = "default"; 119 pinctrl-names = "default";
115 pinctrl-0 = <&pinctrl_i2c0>; 120 pinctrl-0 = <&pinctrl_i2c0>;
116 #address-cells = <1>; 121 #address-cells = <1>;
@@ -122,6 +127,9 @@
122 compatible = "atmel,at91sam9x5-i2c"; 127 compatible = "atmel,at91sam9x5-i2c";
123 reg = <0xf0018000 0x4000>; 128 reg = <0xf0018000 0x4000>;
124 interrupts = <19 4 6>; 129 interrupts = <19 4 6>;
130 dmas = <&dma0 2 9>,
131 <&dma0 2 10>;
132 dma-names = "tx", "rx";
125 pinctrl-names = "default"; 133 pinctrl-names = "default";
126 pinctrl-0 = <&pinctrl_i2c1>; 134 pinctrl-0 = <&pinctrl_i2c1>;
127 #address-cells = <1>; 135 #address-cells = <1>;
@@ -167,6 +175,8 @@
167 compatible = "atmel,hsmci"; 175 compatible = "atmel,hsmci";
168 reg = <0xf8000000 0x600>; 176 reg = <0xf8000000 0x600>;
169 interrupts = <22 4 0>; 177 interrupts = <22 4 0>;
178 dmas = <&dma1 2 0>;
179 dma-names = "rxtx";
170 pinctrl-names = "default"; 180 pinctrl-names = "default";
171 pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3>; 181 pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3>;
172 status = "disabled"; 182 status = "disabled";
@@ -178,6 +188,8 @@
178 compatible = "atmel,hsmci"; 188 compatible = "atmel,hsmci";
179 reg = <0xf8004000 0x600>; 189 reg = <0xf8004000 0x600>;
180 interrupts = <23 4 0>; 190 interrupts = <23 4 0>;
191 dmas = <&dma1 2 1>;
192 dma-names = "rxtx";
181 pinctrl-names = "default"; 193 pinctrl-names = "default";
182 pinctrl-0 = <&pinctrl_mmc2_clk_cmd_dat0 &pinctrl_mmc2_dat1_3>; 194 pinctrl-0 = <&pinctrl_mmc2_clk_cmd_dat0 &pinctrl_mmc2_dat1_3>;
183 status = "disabled"; 195 status = "disabled";
@@ -294,6 +306,9 @@
294 compatible = "atmel,at91sam9x5-i2c"; 306 compatible = "atmel,at91sam9x5-i2c";
295 reg = <0xf801c000 0x4000>; 307 reg = <0xf801c000 0x4000>;
296 interrupts = <20 4 6>; 308 interrupts = <20 4 6>;
309 dmas = <&dma1 2 11>,
310 <&dma1 2 12>;
311 dma-names = "tx", "rx";
297 #address-cells = <1>; 312 #address-cells = <1>;
298 #size-cells = <0>; 313 #size-cells = <0>;
299 status = "disabled"; 314 status = "disabled";
@@ -348,14 +363,14 @@
348 compatible = "atmel,at91sam9g45-dma"; 363 compatible = "atmel,at91sam9g45-dma";
349 reg = <0xffffe600 0x200>; 364 reg = <0xffffe600 0x200>;
350 interrupts = <30 4 0>; 365 interrupts = <30 4 0>;
351 #dma-cells = <1>; 366 #dma-cells = <2>;
352 }; 367 };
353 368
354 dma1: dma-controller@ffffe800 { 369 dma1: dma-controller@ffffe800 {
355 compatible = "atmel,at91sam9g45-dma"; 370 compatible = "atmel,at91sam9g45-dma";
356 reg = <0xffffe800 0x200>; 371 reg = <0xffffe800 0x200>;
357 interrupts = <31 4 0>; 372 interrupts = <31 4 0>;
358 #dma-cells = <1>; 373 #dma-cells = <2>;
359 }; 374 };
360 375
361 ramc0: ramc@ffffea00 { 376 ramc0: ramc@ffffea00 {
diff --git a/arch/arm/boot/dts/sama5d34ek.dts b/arch/arm/boot/dts/sama5d34ek.dts
index d2739f8d7ae9..6bebfcdcb1d1 100644
--- a/arch/arm/boot/dts/sama5d34ek.dts
+++ b/arch/arm/boot/dts/sama5d34ek.dts
@@ -12,7 +12,7 @@
12 12
13/ { 13/ {
14 model = "Atmel SAMA5D34-EK"; 14 model = "Atmel SAMA5D34-EK";
15 compatible = "atmel,sama5d34ek", "atmel,sama5ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5"; 15 compatible = "atmel,sama5d34ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5";
16 16
17 ahb { 17 ahb {
18 apb { 18 apb {
generated by cgit v1.2.2 (git 2.25.0) at 2025-12-26 01:25:32 -0500