diff options
-rw-r--r-- | arch/arm/boot/dts/at91sam9263.dtsi | 9 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9g45.dtsi | 9 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9m10g45ek.dts | 25 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9n12.dtsi | 9 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9x5.dtsi | 9 | ||||
-rw-r--r-- | arch/arm/boot/dts/sama5d3.dtsi | 16 |
6 files changed, 75 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi index 22e255ab6963..c8fa9b9f07e3 100644 --- a/arch/arm/boot/dts/at91sam9263.dtsi +++ b/arch/arm/boot/dts/at91sam9263.dtsi | |||
@@ -30,6 +30,7 @@ | |||
30 | i2c0 = &i2c0; | 30 | i2c0 = &i2c0; |
31 | ssc0 = &ssc0; | 31 | ssc0 = &ssc0; |
32 | ssc1 = &ssc1; | 32 | ssc1 = &ssc1; |
33 | pwm0 = &pwm0; | ||
33 | }; | 34 | }; |
34 | cpus { | 35 | cpus { |
35 | #address-cells = <0>; | 36 | #address-cells = <0>; |
@@ -575,6 +576,14 @@ | |||
575 | pinctrl-0 = <&pinctrl_spi1>; | 576 | pinctrl-0 = <&pinctrl_spi1>; |
576 | status = "disabled"; | 577 | status = "disabled"; |
577 | }; | 578 | }; |
579 | |||
580 | pwm0: pwm@fffb8000 { | ||
581 | compatible = "atmel,at91sam9rl-pwm"; | ||
582 | reg = <0xfffb8000 0x300>; | ||
583 | interrupts = <20 IRQ_TYPE_LEVEL_HIGH 4>; | ||
584 | #pwm-cells = <3>; | ||
585 | status = "disabled"; | ||
586 | }; | ||
578 | }; | 587 | }; |
579 | 588 | ||
580 | fb0: fb@0x00700000 { | 589 | fb0: fb@0x00700000 { |
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi index d7af9ecb85d2..ef0857cb171c 100644 --- a/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/arch/arm/boot/dts/at91sam9g45.dtsi | |||
@@ -37,6 +37,7 @@ | |||
37 | i2c1 = &i2c1; | 37 | i2c1 = &i2c1; |
38 | ssc0 = &ssc0; | 38 | ssc0 = &ssc0; |
39 | ssc1 = &ssc1; | 39 | ssc1 = &ssc1; |
40 | pwm0 = &pwm0; | ||
40 | }; | 41 | }; |
41 | cpus { | 42 | cpus { |
42 | #address-cells = <0>; | 43 | #address-cells = <0>; |
@@ -670,6 +671,14 @@ | |||
670 | }; | 671 | }; |
671 | }; | 672 | }; |
672 | 673 | ||
674 | pwm0: pwm@fffb8000 { | ||
675 | compatible = "atmel,at91sam9rl-pwm"; | ||
676 | reg = <0xfffb8000 0x300>; | ||
677 | interrupts = <19 IRQ_TYPE_LEVEL_HIGH 4>; | ||
678 | #pwm-cells = <3>; | ||
679 | status = "disabled"; | ||
680 | }; | ||
681 | |||
673 | mmc0: mmc@fff80000 { | 682 | mmc0: mmc@fff80000 { |
674 | compatible = "atmel,hsmci"; | 683 | compatible = "atmel,hsmci"; |
675 | reg = <0xfff80000 0x600>; | 684 | reg = <0xfff80000 0x600>; |
diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts index 7b76dbde8c41..7ff665a8c708 100644 --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts | |||
@@ -105,6 +105,14 @@ | |||
105 | AT91_PIOD 29 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PD29 gpio WP pin pull up */ | 105 | AT91_PIOD 29 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PD29 gpio WP pin pull up */ |
106 | }; | 106 | }; |
107 | }; | 107 | }; |
108 | |||
109 | pwm0 { | ||
110 | pinctrl_pwm_leds: pwm-led { | ||
111 | atmel,pins = | ||
112 | <AT91_PIOD 0 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PD0 periph B */ | ||
113 | AT91_PIOD 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PD31 periph B */ | ||
114 | }; | ||
115 | }; | ||
108 | }; | 116 | }; |
109 | 117 | ||
110 | spi0: spi@fffa4000{ | 118 | spi0: spi@fffa4000{ |
@@ -121,6 +129,13 @@ | |||
121 | atmel,vbus-gpio = <&pioB 19 GPIO_ACTIVE_HIGH>; | 129 | atmel,vbus-gpio = <&pioB 19 GPIO_ACTIVE_HIGH>; |
122 | status = "okay"; | 130 | status = "okay"; |
123 | }; | 131 | }; |
132 | |||
133 | pwm0: pwm@fffb8000 { | ||
134 | status = "okay"; | ||
135 | |||
136 | pinctrl-names = "default"; | ||
137 | pinctrl-0 = <&pinctrl_pwm_leds>; | ||
138 | }; | ||
124 | }; | 139 | }; |
125 | 140 | ||
126 | fb0: fb@0x00500000 { | 141 | fb0: fb@0x00500000 { |
@@ -194,16 +209,22 @@ | |||
194 | gpios = <&pioD 30 GPIO_ACTIVE_HIGH>; | 209 | gpios = <&pioD 30 GPIO_ACTIVE_HIGH>; |
195 | linux,default-trigger = "heartbeat"; | 210 | linux,default-trigger = "heartbeat"; |
196 | }; | 211 | }; |
212 | }; | ||
213 | |||
214 | pwmleds { | ||
215 | compatible = "pwm-leds"; | ||
197 | 216 | ||
198 | d6 { | 217 | d6 { |
199 | label = "d6"; | 218 | label = "d6"; |
200 | gpios = <&pioD 0 GPIO_ACTIVE_LOW>; | 219 | pwms = <&pwm0 3 5000 0>; |
220 | max-brightness = <255>; | ||
201 | linux,default-trigger = "nand-disk"; | 221 | linux,default-trigger = "nand-disk"; |
202 | }; | 222 | }; |
203 | 223 | ||
204 | d7 { | 224 | d7 { |
205 | label = "d7"; | 225 | label = "d7"; |
206 | gpios = <&pioD 31 GPIO_ACTIVE_LOW>; | 226 | pwms = <&pwm0 1 5000 0>; |
227 | max-brightness = <255>; | ||
207 | linux,default-trigger = "mmc0"; | 228 | linux,default-trigger = "mmc0"; |
208 | }; | 229 | }; |
209 | }; | 230 | }; |
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi index 6224f9fe2f2b..7248270a3ea6 100644 --- a/arch/arm/boot/dts/at91sam9n12.dtsi +++ b/arch/arm/boot/dts/at91sam9n12.dtsi | |||
@@ -33,6 +33,7 @@ | |||
33 | i2c0 = &i2c0; | 33 | i2c0 = &i2c0; |
34 | i2c1 = &i2c1; | 34 | i2c1 = &i2c1; |
35 | ssc0 = &ssc0; | 35 | ssc0 = &ssc0; |
36 | pwm0 = &pwm0; | ||
36 | }; | 37 | }; |
37 | cpus { | 38 | cpus { |
38 | #address-cells = <0>; | 39 | #address-cells = <0>; |
@@ -542,6 +543,14 @@ | |||
542 | reg = <0xfffffe40 0x10>; | 543 | reg = <0xfffffe40 0x10>; |
543 | status = "disabled"; | 544 | status = "disabled"; |
544 | }; | 545 | }; |
546 | |||
547 | pwm0: pwm@f8034000 { | ||
548 | compatible = "atmel,at91sam9rl-pwm"; | ||
549 | reg = <0xf8034000 0x300>; | ||
550 | interrupts = <18 IRQ_TYPE_LEVEL_HIGH 4>; | ||
551 | #pwm-cells = <3>; | ||
552 | status = "disabled"; | ||
553 | }; | ||
545 | }; | 554 | }; |
546 | 555 | ||
547 | nand0: nand@40000000 { | 556 | nand0: nand@40000000 { |
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index 40267a116c3c..6e5e9cfc3c49 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi | |||
@@ -35,6 +35,7 @@ | |||
35 | i2c1 = &i2c1; | 35 | i2c1 = &i2c1; |
36 | i2c2 = &i2c2; | 36 | i2c2 = &i2c2; |
37 | ssc0 = &ssc0; | 37 | ssc0 = &ssc0; |
38 | pwm0 = &pwm0; | ||
38 | }; | 39 | }; |
39 | cpus { | 40 | cpus { |
40 | #address-cells = <0>; | 41 | #address-cells = <0>; |
@@ -762,6 +763,14 @@ | |||
762 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; | 763 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; |
763 | status = "disabled"; | 764 | status = "disabled"; |
764 | }; | 765 | }; |
766 | |||
767 | pwm0: pwm@f8034000 { | ||
768 | compatible = "atmel,at91sam9rl-pwm"; | ||
769 | reg = <0xf8034000 0x300>; | ||
770 | interrupts = <18 IRQ_TYPE_LEVEL_HIGH 4>; | ||
771 | #pwm-cells = <3>; | ||
772 | status = "disabled"; | ||
773 | }; | ||
765 | }; | 774 | }; |
766 | 775 | ||
767 | nand0: nand@40000000 { | 776 | nand0: nand@40000000 { |
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi index fad42f5fd8c4..1105558d188b 100644 --- a/arch/arm/boot/dts/sama5d3.dtsi +++ b/arch/arm/boot/dts/sama5d3.dtsi | |||
@@ -37,6 +37,7 @@ | |||
37 | i2c2 = &i2c2; | 37 | i2c2 = &i2c2; |
38 | ssc0 = &ssc0; | 38 | ssc0 = &ssc0; |
39 | ssc1 = &ssc1; | 39 | ssc1 = &ssc1; |
40 | pwm0 = &pwm0; | ||
40 | }; | 41 | }; |
41 | cpus { | 42 | cpus { |
42 | #address-cells = <1>; | 43 | #address-cells = <1>; |
@@ -179,6 +180,15 @@ | |||
179 | status = "disabled"; | 180 | status = "disabled"; |
180 | }; | 181 | }; |
181 | 182 | ||
183 | pwm0: pwm@f002c000 { | ||
184 | compatible = "atmel,sama5d3-pwm"; | ||
185 | reg = <0xf002c000 0x300>; | ||
186 | interrupts = <28 IRQ_TYPE_LEVEL_HIGH 4>; | ||
187 | #pwm-cells = <3>; | ||
188 | clocks = <&pwm_clk>; | ||
189 | status = "disabled"; | ||
190 | }; | ||
191 | |||
182 | isi: isi@f0034000 { | 192 | isi: isi@f0034000 { |
183 | compatible = "atmel,at91sam9g45-isi"; | 193 | compatible = "atmel,at91sam9g45-isi"; |
184 | reg = <0xf0034000 0x4000>; | 194 | reg = <0xf0034000 0x4000>; |
@@ -340,6 +350,8 @@ | |||
340 | interrupts = <42 IRQ_TYPE_LEVEL_HIGH 0>; | 350 | interrupts = <42 IRQ_TYPE_LEVEL_HIGH 0>; |
341 | dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(17)>; | 351 | dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(17)>; |
342 | dma-names = "tx"; | 352 | dma-names = "tx"; |
353 | clocks = <&sha_clk>; | ||
354 | clock-names = "sha_clk"; | ||
343 | }; | 355 | }; |
344 | 356 | ||
345 | aes@f8038000 { | 357 | aes@f8038000 { |
@@ -349,6 +361,8 @@ | |||
349 | dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(18)>, | 361 | dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(18)>, |
350 | <&dma1 2 AT91_DMA_CFG_PER_ID(19)>; | 362 | <&dma1 2 AT91_DMA_CFG_PER_ID(19)>; |
351 | dma-names = "tx", "rx"; | 363 | dma-names = "tx", "rx"; |
364 | clocks = <&aes_clk>; | ||
365 | clock-names = "aes_clk"; | ||
352 | }; | 366 | }; |
353 | 367 | ||
354 | tdes@f803c000 { | 368 | tdes@f803c000 { |
@@ -358,6 +372,8 @@ | |||
358 | dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(20)>, | 372 | dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(20)>, |
359 | <&dma1 2 AT91_DMA_CFG_PER_ID(21)>; | 373 | <&dma1 2 AT91_DMA_CFG_PER_ID(21)>; |
360 | dma-names = "tx", "rx"; | 374 | dma-names = "tx", "rx"; |
375 | clocks = <&tdes_clk>; | ||
376 | clock-names = "tdes_clk"; | ||
361 | }; | 377 | }; |
362 | 378 | ||
363 | dma0: dma-controller@ffffe600 { | 379 | dma0: dma-controller@ffffe600 { |