Merge tag 'at91-dt2' of git://github.com/at91linux/linux-at91 into next/dt

From Nicolas Ferre:
Second DT pull-request for 3.14
- now that PWM driver is on its way to mainline,
  we can integrate the DT entries
- As an example, use PWM for at91sam9m10g45ek leds
- Addition of clock specification for newly introduced
  crypto DT entries

* tag 'at91-dt2' of git://github.com/at91linux/linux-at91:
  ARM: at91/dt: add clk properties to sama5d3 TDES device node
  ARM: at91/dt: add clk properties to sama5d3 AES device node
  ARM: at91/dt: add clk properties to sama5d3 SHA device node
  ARM: at91: at91sam9m10g45ek: switch to PWM leds
  ARM: at91: add PWM device node

Signed-off-by: Olof Johansson <olof@lixom.net>

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 @@
                 i2c0 = &i2c0;
                 ssc0 = &ssc0;
                 ssc1 = &ssc1;
+                pwm0 = &pwm0;
         };
         cpus {
                 #address-cells = <0>;
@@ -575,6 +576,14 @@
                                 pinctrl-0 = <&pinctrl_spi1>;
                                 status = "disabled";
                         };
+
+                        pwm0: pwm@fffb8000 {
+                                compatible = "atmel,at91sam9rl-pwm";
+                                reg = <0xfffb8000 0x300>;
+                                interrupts = <20 IRQ_TYPE_LEVEL_HIGH 4>;
+                                #pwm-cells = <3>;
+                                status = "disabled";
+                        };
                 };
 
                 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 @@
                 i2c1 = &i2c1;
                 ssc0 = &ssc0;
                 ssc1 = &ssc1;
+                pwm0 = &pwm0;
         };
         cpus {
                 #address-cells = <0>;
@@ -670,6 +671,14 @@
                                 };
                         };
 
+                        pwm0: pwm@fffb8000 {
+                                compatible = "atmel,at91sam9rl-pwm";
+                                reg = <0xfffb8000 0x300>;
+                                interrupts = <19 IRQ_TYPE_LEVEL_HIGH 4>;
+                                #pwm-cells = <3>;
+                                status = "disabled";
+                        };
+
                         mmc0: mmc@fff80000 {
                                 compatible = "atmel,hsmci";
                                 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 @@
                                                          AT91_PIOD 29 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;   /* PD29 gpio WP pin pull up */
                                         };
                                 };
+
+                                pwm0 {
+                                        pinctrl_pwm_leds: pwm-led {
+                                                atmel,pins =
+                                                        <AT91_PIOD 0  AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* PD0 periph B */
+                                                         AT91_PIOD 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;      /* PD31 periph B */
+                                        };
+                                };
                         };
 
                         spi0: spi@fffa4000{
@@ -121,6 +129,13 @@
                                 atmel,vbus-gpio = <&pioB 19 GPIO_ACTIVE_HIGH>;
                                 status = "okay";
                         };
+
+                        pwm0: pwm@fffb8000 {
+                                status = "okay";
+
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_pwm_leds>;
+                        };
                 };
 
                 fb0: fb@0x00500000 {
@@ -194,16 +209,22 @@
                         gpios = <&pioD 30 GPIO_ACTIVE_HIGH>;
                         linux,default-trigger = "heartbeat";
                 };
+        };
+
+        pwmleds {
+                compatible = "pwm-leds";
 
                 d6 {
                         label = "d6";
-                        gpios = <&pioD 0 GPIO_ACTIVE_LOW>;
+                        pwms = <&pwm0 3 5000 0>;
+                        max-brightness = <255>;
                         linux,default-trigger = "nand-disk";
                 };
 
                 d7 {
                         label = "d7";
-                        gpios = <&pioD 31 GPIO_ACTIVE_LOW>;
+                        pwms = <&pwm0 1 5000 0>;
+                        max-brightness = <255>;
                         linux,default-trigger = "mmc0";
                 };
         };
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 @@
                 i2c0 = &i2c0;
                 i2c1 = &i2c1;
                 ssc0 = &ssc0;
+                pwm0 = &pwm0;
         };
         cpus {
                 #address-cells = <0>;
@@ -542,6 +543,14 @@
                                 reg = <0xfffffe40 0x10>;
                                 status = "disabled";
                         };
+
+                        pwm0: pwm@f8034000 {
+                                compatible = "atmel,at91sam9rl-pwm";
+                                reg = <0xf8034000 0x300>;
+                                interrupts = <18 IRQ_TYPE_LEVEL_HIGH 4>;
+                                #pwm-cells = <3>;
+                                status = "disabled";
+                        };
                 };
 
                 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 @@
                 i2c1 = &i2c1;
                 i2c2 = &i2c2;
                 ssc0 = &ssc0;
+                pwm0 = &pwm0;
         };
         cpus {
                 #address-cells = <0>;
@@ -762,6 +763,14 @@
                                 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;