diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 11:50:36 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 11:50:36 -0400 |
commit | 44086148bf0047fcdb5dd013f79ffe394e82cf1c (patch) | |
tree | a38ec9b7bf8edeb9dc60046826893bd5278382f3 | |
parent | 41c9002ad1c8a16806cdf0d45faae20eb98213b2 (diff) | |
parent | 4dd7933ad606af457bc85b1afdaaac68aa993abf (diff) |
Merge tag 'at91-dt3' of git://github.com/at91linux/linux-at91 into next/dt
Pull "More AT91 DT material for 3.18" from Nicolas Ferre:
- specify DMA channels for USART on sama5d3 and choose peripherals
that will use them on the EK boards
- SSC update for audio on at91sam9rl and at91sam9g20
- addition of the NFC clock and new pinctrl compatible string
to use enhancements that will land in drivers during this release
- several new nodes and fixes
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'at91-dt3' of git://github.com/at91linux/linux-at91:
ARM: at91/dt: at91sam9m10g45ek add rtc node
ARM: at91/dt: sama5d3: use new pinctrl compatible string
ARM: at91/dt: sama5d3: add the nfc clock
ARM: at91/dt: declare sckc node on at91sam9g45
ARM: at91/dt: Fix typo regarding can0_clk
ARM: at91/dt: at91sam9g20: switch ssc compatible string
ARM: at91/dt: at91sam9rl: switch ssc compatible string
ARM: at91: sama5d3xek: reserve dma channel for audio
ARM: at91: sama5d3: add usart dma configurations
-rw-r--r-- | arch/arm/boot/dts/at91sam9g20.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9g45.dtsi | 37 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9m10g45ek.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9rl.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/sama5d3.dtsi | 23 | ||||
-rw-r--r-- | arch/arm/boot/dts/sama5d3_can.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/sama5d3xmb.dtsi | 4 |
7 files changed, 72 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi index 31f7652612fc..5734dc18d7e1 100644 --- a/arch/arm/boot/dts/at91sam9g20.dtsi +++ b/arch/arm/boot/dts/at91sam9g20.dtsi | |||
@@ -22,6 +22,10 @@ | |||
22 | compatible = "atmel,at91sam9g20-i2c"; | 22 | compatible = "atmel,at91sam9g20-i2c"; |
23 | }; | 23 | }; |
24 | 24 | ||
25 | ssc0: ssc@fffbc000 { | ||
26 | compatible = "atmel,at91sam9rl-ssc"; | ||
27 | }; | ||
28 | |||
25 | adc0: adc@fffe0000 { | 29 | adc0: adc@fffe0000 { |
26 | atmel,adc-startup-time = <40>; | 30 | atmel,adc-startup-time = <40>; |
27 | }; | 31 | }; |
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi index 857fd3e0b8a0..d3f65130a1f8 100644 --- a/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/arch/arm/boot/dts/at91sam9g45.dtsi | |||
@@ -165,7 +165,7 @@ | |||
165 | compatible = "atmel,at91rm9200-clk-master"; | 165 | compatible = "atmel,at91rm9200-clk-master"; |
166 | #clock-cells = <0>; | 166 | #clock-cells = <0>; |
167 | interrupts-extended = <&pmc AT91_PMC_MCKRDY>; | 167 | interrupts-extended = <&pmc AT91_PMC_MCKRDY>; |
168 | clocks = <&slow_xtal>, <&main>, <&plladiv>, <&utmi>; | 168 | clocks = <&clk32k>, <&main>, <&plladiv>, <&utmi>; |
169 | atmel,clk-output-range = <0 133333333>; | 169 | atmel,clk-output-range = <0 133333333>; |
170 | atmel,clk-divisors = <1 2 4 3>; | 170 | atmel,clk-divisors = <1 2 4 3>; |
171 | }; | 171 | }; |
@@ -181,7 +181,7 @@ | |||
181 | #address-cells = <1>; | 181 | #address-cells = <1>; |
182 | #size-cells = <0>; | 182 | #size-cells = <0>; |
183 | interrupt-parent = <&pmc>; | 183 | interrupt-parent = <&pmc>; |
184 | clocks = <&slow_xtal>, <&main>, <&plladiv>, <&utmi>, <&mck>; | 184 | clocks = <&clk32k>, <&main>, <&plladiv>, <&utmi>, <&mck>; |
185 | 185 | ||
186 | prog0: prog0 { | 186 | prog0: prog0 { |
187 | #clock-cells = <0>; | 187 | #clock-cells = <0>; |
@@ -1165,6 +1165,39 @@ | |||
1165 | atmel,can-isoc; | 1165 | atmel,can-isoc; |
1166 | }; | 1166 | }; |
1167 | }; | 1167 | }; |
1168 | |||
1169 | sckc@fffffd50 { | ||
1170 | compatible = "atmel,at91sam9x5-sckc"; | ||
1171 | reg = <0xfffffd50 0x4>; | ||
1172 | |||
1173 | slow_osc: slow_osc { | ||
1174 | compatible = "atmel,at91sam9x5-clk-slow-osc"; | ||
1175 | #clock-cells = <0>; | ||
1176 | atmel,startup-time-usec = <1200000>; | ||
1177 | clocks = <&slow_xtal>; | ||
1178 | }; | ||
1179 | |||
1180 | slow_rc_osc: slow_rc_osc { | ||
1181 | compatible = "atmel,at91sam9x5-clk-slow-rc-osc"; | ||
1182 | #clock-cells = <0>; | ||
1183 | atmel,startup-time-usec = <75>; | ||
1184 | clock-frequency = <32768>; | ||
1185 | clock-accuracy = <50000000>; | ||
1186 | }; | ||
1187 | |||
1188 | clk32k: slck { | ||
1189 | compatible = "atmel,at91sam9x5-clk-slow"; | ||
1190 | #clock-cells = <0>; | ||
1191 | clocks = <&slow_rc_osc &slow_osc>; | ||
1192 | }; | ||
1193 | }; | ||
1194 | |||
1195 | rtc@fffffdb0 { | ||
1196 | compatible = "atmel,at91rm9200-rtc"; | ||
1197 | reg = <0xfffffdb0 0x30>; | ||
1198 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; | ||
1199 | status = "disabled"; | ||
1200 | }; | ||
1168 | }; | 1201 | }; |
1169 | 1202 | ||
1170 | fb0: fb@0x00500000 { | 1203 | fb0: fb@0x00500000 { |
diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts index 96ccc7de4f0a..d8dd22651090 100644 --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts | |||
@@ -160,6 +160,10 @@ | |||
160 | pinctrl-names = "default"; | 160 | pinctrl-names = "default"; |
161 | pinctrl-0 = <&pinctrl_pwm_leds>; | 161 | pinctrl-0 = <&pinctrl_pwm_leds>; |
162 | }; | 162 | }; |
163 | |||
164 | rtc@fffffdb0 { | ||
165 | status = "okay"; | ||
166 | }; | ||
163 | }; | 167 | }; |
164 | 168 | ||
165 | fb0: fb@0x00500000 { | 169 | fb0: fb@0x00500000 { |
diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi index ab56c8b81dfa..f0b4352650ed 100644 --- a/arch/arm/boot/dts/at91sam9rl.dtsi +++ b/arch/arm/boot/dts/at91sam9rl.dtsi | |||
@@ -204,7 +204,7 @@ | |||
204 | }; | 204 | }; |
205 | 205 | ||
206 | ssc0: ssc@fffc0000 { | 206 | ssc0: ssc@fffc0000 { |
207 | compatible = "atmel,at91rm9200-ssc"; | 207 | compatible = "atmel,at91sam9rl-ssc"; |
208 | reg = <0xfffc0000 0x4000>; | 208 | reg = <0xfffc0000 0x4000>; |
209 | interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>; | 209 | interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>; |
210 | pinctrl-names = "default"; | 210 | pinctrl-names = "default"; |
@@ -213,7 +213,7 @@ | |||
213 | }; | 213 | }; |
214 | 214 | ||
215 | ssc1: ssc@fffc4000 { | 215 | ssc1: ssc@fffc4000 { |
216 | compatible = "atmel,at91rm9200-ssc"; | 216 | compatible = "atmel,at91sam9rl-ssc"; |
217 | reg = <0xfffc4000 0x4000>; | 217 | reg = <0xfffc4000 0x4000>; |
218 | interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>; | 218 | interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>; |
219 | pinctrl-names = "default"; | 219 | pinctrl-names = "default"; |
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi index 7702a0d120cb..5f4144d1e3a1 100644 --- a/arch/arm/boot/dts/sama5d3.dtsi +++ b/arch/arm/boot/dts/sama5d3.dtsi | |||
@@ -177,6 +177,9 @@ | |||
177 | compatible = "atmel,at91sam9260-usart"; | 177 | compatible = "atmel,at91sam9260-usart"; |
178 | reg = <0xf001c000 0x100>; | 178 | reg = <0xf001c000 0x100>; |
179 | interrupts = <12 IRQ_TYPE_LEVEL_HIGH 5>; | 179 | interrupts = <12 IRQ_TYPE_LEVEL_HIGH 5>; |
180 | dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(3)>, | ||
181 | <&dma0 2 (AT91_DMA_CFG_PER_ID(4) | AT91_DMA_CFG_FIFOCFG_ASAP)>; | ||
182 | dma-names = "tx", "rx"; | ||
180 | pinctrl-names = "default"; | 183 | pinctrl-names = "default"; |
181 | pinctrl-0 = <&pinctrl_usart0>; | 184 | pinctrl-0 = <&pinctrl_usart0>; |
182 | clocks = <&usart0_clk>; | 185 | clocks = <&usart0_clk>; |
@@ -188,6 +191,9 @@ | |||
188 | compatible = "atmel,at91sam9260-usart"; | 191 | compatible = "atmel,at91sam9260-usart"; |
189 | reg = <0xf0020000 0x100>; | 192 | reg = <0xf0020000 0x100>; |
190 | interrupts = <13 IRQ_TYPE_LEVEL_HIGH 5>; | 193 | interrupts = <13 IRQ_TYPE_LEVEL_HIGH 5>; |
194 | dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(5)>, | ||
195 | <&dma0 2 (AT91_DMA_CFG_PER_ID(6) | AT91_DMA_CFG_FIFOCFG_ASAP)>; | ||
196 | dma-names = "tx", "rx"; | ||
191 | pinctrl-names = "default"; | 197 | pinctrl-names = "default"; |
192 | pinctrl-0 = <&pinctrl_usart1>; | 198 | pinctrl-0 = <&pinctrl_usart1>; |
193 | clocks = <&usart1_clk>; | 199 | clocks = <&usart1_clk>; |
@@ -333,6 +339,9 @@ | |||
333 | compatible = "atmel,at91sam9260-usart"; | 339 | compatible = "atmel,at91sam9260-usart"; |
334 | reg = <0xf8020000 0x100>; | 340 | reg = <0xf8020000 0x100>; |
335 | interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>; | 341 | interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>; |
342 | dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(7)>, | ||
343 | <&dma1 2 (AT91_DMA_CFG_PER_ID(8) | AT91_DMA_CFG_FIFOCFG_ASAP)>; | ||
344 | dma-names = "tx", "rx"; | ||
336 | pinctrl-names = "default"; | 345 | pinctrl-names = "default"; |
337 | pinctrl-0 = <&pinctrl_usart2>; | 346 | pinctrl-0 = <&pinctrl_usart2>; |
338 | clocks = <&usart2_clk>; | 347 | clocks = <&usart2_clk>; |
@@ -344,6 +353,9 @@ | |||
344 | compatible = "atmel,at91sam9260-usart"; | 353 | compatible = "atmel,at91sam9260-usart"; |
345 | reg = <0xf8024000 0x100>; | 354 | reg = <0xf8024000 0x100>; |
346 | interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>; | 355 | interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>; |
356 | dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(9)>, | ||
357 | <&dma1 2 (AT91_DMA_CFG_PER_ID(10) | AT91_DMA_CFG_FIFOCFG_ASAP)>; | ||
358 | dma-names = "tx", "rx"; | ||
347 | pinctrl-names = "default"; | 359 | pinctrl-names = "default"; |
348 | pinctrl-0 = <&pinctrl_usart3>; | 360 | pinctrl-0 = <&pinctrl_usart3>; |
349 | clocks = <&usart3_clk>; | 361 | clocks = <&usart3_clk>; |
@@ -412,6 +424,9 @@ | |||
412 | compatible = "atmel,at91sam9260-usart"; | 424 | compatible = "atmel,at91sam9260-usart"; |
413 | reg = <0xffffee00 0x200>; | 425 | reg = <0xffffee00 0x200>; |
414 | interrupts = <2 IRQ_TYPE_LEVEL_HIGH 7>; | 426 | interrupts = <2 IRQ_TYPE_LEVEL_HIGH 7>; |
427 | dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(13)>, | ||
428 | <&dma1 2 (AT91_DMA_CFG_PER_ID(14) | AT91_DMA_CFG_FIFOCFG_ASAP)>; | ||
429 | dma-names = "tx", "rx"; | ||
415 | pinctrl-names = "default"; | 430 | pinctrl-names = "default"; |
416 | pinctrl-0 = <&pinctrl_dbgu>; | 431 | pinctrl-0 = <&pinctrl_dbgu>; |
417 | clocks = <&dbgu_clk>; | 432 | clocks = <&dbgu_clk>; |
@@ -430,7 +445,7 @@ | |||
430 | pinctrl@fffff200 { | 445 | pinctrl@fffff200 { |
431 | #address-cells = <1>; | 446 | #address-cells = <1>; |
432 | #size-cells = <1>; | 447 | #size-cells = <1>; |
433 | compatible = "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus"; | 448 | compatible = "atmel,sama5d3-pinctrl", "atmel,at91sam9x5-pinctrl", "simple-bus"; |
434 | ranges = <0xfffff200 0xfffff200 0xa00>; | 449 | ranges = <0xfffff200 0xfffff200 0xa00>; |
435 | atmel,mux-mask = < | 450 | atmel,mux-mask = < |
436 | /* A B C */ | 451 | /* A B C */ |
@@ -1005,6 +1020,11 @@ | |||
1005 | reg = <2>; | 1020 | reg = <2>; |
1006 | }; | 1021 | }; |
1007 | 1022 | ||
1023 | hsmc_clk: hsmc_clk { | ||
1024 | #clock-cells = <0>; | ||
1025 | reg = <5>; | ||
1026 | }; | ||
1027 | |||
1008 | pioA_clk: pioA_clk { | 1028 | pioA_clk: pioA_clk { |
1009 | #clock-cells = <0>; | 1029 | #clock-cells = <0>; |
1010 | reg = <6>; | 1030 | reg = <6>; |
@@ -1405,6 +1425,7 @@ | |||
1405 | 0xffffc000 0x00000070 /* NFC HSMC regs */ | 1425 | 0xffffc000 0x00000070 /* NFC HSMC regs */ |
1406 | 0x00200000 0x00100000 /* NFC SRAM banks */ | 1426 | 0x00200000 0x00100000 /* NFC SRAM banks */ |
1407 | >; | 1427 | >; |
1428 | clocks = <&hsmc_clk>; | ||
1408 | }; | 1429 | }; |
1409 | }; | 1430 | }; |
1410 | }; | 1431 | }; |
diff --git a/arch/arm/boot/dts/sama5d3_can.dtsi b/arch/arm/boot/dts/sama5d3_can.dtsi index a0775851cce5..eaf41451ad0c 100644 --- a/arch/arm/boot/dts/sama5d3_can.dtsi +++ b/arch/arm/boot/dts/sama5d3_can.dtsi | |||
@@ -40,7 +40,7 @@ | |||
40 | atmel,clk-output-range = <0 66000000>; | 40 | atmel,clk-output-range = <0 66000000>; |
41 | }; | 41 | }; |
42 | 42 | ||
43 | can1_clk: can0_clk { | 43 | can1_clk: can1_clk { |
44 | #clock-cells = <0>; | 44 | #clock-cells = <0>; |
45 | reg = <41>; | 45 | reg = <41>; |
46 | atmel,clk-output-range = <0 66000000>; | 46 | atmel,clk-output-range = <0 66000000>; |
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi index b8c6f20e780c..49c10d33df30 100644 --- a/arch/arm/boot/dts/sama5d3xmb.dtsi +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi | |||
@@ -25,6 +25,8 @@ | |||
25 | }; | 25 | }; |
26 | 26 | ||
27 | spi0: spi@f0004000 { | 27 | spi0: spi@f0004000 { |
28 | dmas = <0>, <0>; /* Do not use DMA for spi0 */ | ||
29 | |||
28 | m25p80@0 { | 30 | m25p80@0 { |
29 | compatible = "atmel,at25df321a"; | 31 | compatible = "atmel,at25df321a"; |
30 | spi-max-frequency = <50000000>; | 32 | spi-max-frequency = <50000000>; |
@@ -51,6 +53,7 @@ | |||
51 | }; | 53 | }; |
52 | 54 | ||
53 | usart1: serial@f0020000 { | 55 | usart1: serial@f0020000 { |
56 | dmas = <0>, <0>; /* Do not use DMA for usart1 */ | ||
54 | pinctrl-names = "default"; | 57 | pinctrl-names = "default"; |
55 | pinctrl-0 = <&pinctrl_usart1 &pinctrl_usart1_rts_cts>; | 58 | pinctrl-0 = <&pinctrl_usart1 &pinctrl_usart1_rts_cts>; |
56 | status = "okay"; | 59 | status = "okay"; |
@@ -132,6 +135,7 @@ | |||
132 | }; | 135 | }; |
133 | 136 | ||
134 | dbgu: serial@ffffee00 { | 137 | dbgu: serial@ffffee00 { |
138 | dmas = <0>, <0>; /* Do not use DMA for dbgu */ | ||
135 | status = "okay"; | 139 | status = "okay"; |
136 | }; | 140 | }; |
137 | 141 | ||