Merge tag 'at91-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard...

Pull AT91 ramc and reset/poweroff related DT patches from Maxim Ripard:
 "This branch gathers a few devicetree patches needed for the reworks found in
  the later patches to be sent. More precisely, it holds:
    - The addition of ddrck for the sama5d3 and the sam9 SoCs
    - The addition of the shutdown controller node in the sama5d3 DTSI
    - The slight rework of the ramc bindings for the SoCs that have several RAM
      controllers"

Conflicts:
	arch/arm/boot/dts/at91sam9g45.dtsi

diff --combined arch/arm/boot/dts/at91sam9263.dtsi
index bb23c2d33cf8edacd928da1e2650027886d60d6e,e8ecb03772cef6883a960682516e93b15a2c1040..840958ba556c6e102871d9009bb02bb723ff47e3
--- 1/arch/arm/boot/dts/at91sam9263.dtsi
--- 2/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@@ -10,7 -10,6 +10,7 @@@
  #include <dt-bindings/pinctrl/at91.h>
  #include <dt-bindings/interrupt-controller/irq.h>
  #include <dt-bindings/gpio/gpio.h>
 +#include <dt-bindings/clock/at91.h>
  
  / {
        model = "Atmel AT91SAM9263 family SoC";
@@@ -33,7 -32,6 +33,7 @@@
                ssc1 = &ssc1;
                pwm0 = &pwm0;
        };
 +
        cpus {
                #address-cells = <0>;
                #size-cells = <0>;
@@@ -48,20 -46,6 +48,20 @@@
                reg = <0x20000000 0x08000000>;
        };
  
 +      clocks {
 +              main_xtal: main_xtal {
 +                      compatible = "fixed-clock";
 +                      #clock-cells = <0>;
 +                      clock-frequency = <0>;
 +              };
 +
 +              slow_xtal: slow_xtal {
 +                      compatible = "fixed-clock";
 +                      #clock-cells = <0>;
 +                      clock-frequency = <0>;
 +              };
 +      };
 +
        ahb {
                compatible = "simple-bus";
                #address-cells = <1>;
@@@ -85,285 -69,28 +85,289 @@@
                        pmc: pmc@fffffc00 {
                                compatible = "atmel,at91rm9200-pmc";
                                reg = <0xfffffc00 0x100>;
 +                              interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
 +                              interrupt-controller;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              #interrupt-cells = <1>;
 +
 +                              main_osc: main_osc {
 +                                      compatible = "atmel,at91rm9200-clk-main-osc";
 +                                      #clock-cells = <0>;
 +                                      interrupts-extended = <&pmc AT91_PMC_MOSCS>;
 +                                      clocks = <&main_xtal>;
 +                              };
 +
 +                              main: mainck {
 +                                      compatible = "atmel,at91rm9200-clk-main";
 +                                      #clock-cells = <0>;
 +                                      clocks = <&main_osc>;
 +                              };
 +
 +                              plla: pllack {
 +                                      compatible = "atmel,at91rm9200-clk-pll";
 +                                      #clock-cells = <0>;
 +                                      interrupts-extended = <&pmc AT91_PMC_LOCKA>;
 +                                      clocks = <&main>;
 +                                      reg = <0>;
 +                                      atmel,clk-input-range = <1000000 32000000>;
 +                                      #atmel,pll-clk-output-range-cells = <4>;
 +                                      atmel,pll-clk-output-ranges = <80000000 200000000 0 1>,
 +                                                              <190000000 240000000 2 1>;
 +                              };
 +
 +                              pllb: pllbck {
 +                                      compatible = "atmel,at91rm9200-clk-pll";
 +                                      #clock-cells = <0>;
 +                                      interrupts-extended = <&pmc AT91_PMC_LOCKB>;
 +                                      clocks = <&main>;
 +                                      reg = <1>;
 +                                      atmel,clk-input-range = <1000000 5000000>;
 +                                      #atmel,pll-clk-output-range-cells = <4>;
 +                                      atmel,pll-clk-output-ranges = <70000000 130000000 1 1>;
 +                              };
 +
 +                              mck: masterck {
 +                                      compatible = "atmel,at91rm9200-clk-master";
 +                                      #clock-cells = <0>;
 +                                      interrupts-extended = <&pmc AT91_PMC_MCKRDY>;
 +                                      clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>;
 +                                      atmel,clk-output-range = <0 120000000>;
 +                                      atmel,clk-divisors = <1 2 4 0>;
 +                              };
 +
 +                              usb: usbck {
 +                                      compatible = "atmel,at91rm9200-clk-usb";
 +                                      #clock-cells = <0>;
 +                                      atmel,clk-divisors = <1 2 4 0>;
 +                                      clocks = <&pllb>;
 +                              };
 +
 +                              prog: progck {
 +                                      compatible = "atmel,at91rm9200-clk-programmable";
 +                                      #address-cells = <1>;
 +                                      #size-cells = <0>;
 +                                      interrupt-parent = <&pmc>;
 +                                      clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>;
 +
 +                                      prog0: prog0 {
 +                                              #clock-cells = <0>;
 +                                              reg = <0>;
 +                                              interrupts = <AT91_PMC_PCKRDY(0)>;
 +                                      };
 +
 +                                      prog1: prog1 {
 +                                              #clock-cells = <0>;
 +                                              reg = <1>;
 +                                              interrupts = <AT91_PMC_PCKRDY(1)>;
 +                                      };
 +
 +                                      prog2: prog2 {
 +                                              #clock-cells = <0>;
 +                                              reg = <2>;
 +                                              interrupts = <AT91_PMC_PCKRDY(2)>;
 +                                      };
 +
 +                                      prog3: prog3 {
 +                                              #clock-cells = <0>;
 +                                              reg = <3>;
 +                                              interrupts = <AT91_PMC_PCKRDY(3)>;
 +                                      };
 +                              };
 +
 +                              systemck {
 +                                      compatible = "atmel,at91rm9200-clk-system";
 +                                      #address-cells = <1>;
 +                                      #size-cells = <0>;
 +
 +                                      uhpck: uhpck {
 +                                              #clock-cells = <0>;
 +                                              reg = <6>;
 +                                              clocks = <&usb>;
 +                                      };
 +
 +                                      udpck: udpck {
 +                                              #clock-cells = <0>;
 +                                              reg = <7>;
 +                                              clocks = <&usb>;
 +                                      };
 +
 +                                      pck0: pck0 {
 +                                              #clock-cells = <0>;
 +                                              reg = <8>;
 +                                              clocks = <&prog0>;
 +                                      };
 +
 +                                      pck1: pck1 {
 +                                              #clock-cells = <0>;
 +                                              reg = <9>;
 +                                              clocks = <&prog1>;
 +                                      };
 +
 +                                      pck2: pck2 {
 +                                              #clock-cells = <0>;
 +                                              reg = <10>;
 +                                              clocks = <&prog2>;
 +                                      };
 +
 +                                      pck3: pck3 {
 +                                              #clock-cells = <0>;
 +                                              reg = <11>;
 +                                              clocks = <&prog3>;
 +                                      };
 +                              };
 +
 +                              periphck {
 +                                      compatible = "atmel,at91rm9200-clk-peripheral";
 +                                      #address-cells = <1>;
 +                                      #size-cells = <0>;
 +                                      clocks = <&mck>;
 +
 +                                      pioA_clk: pioA_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <2>;
 +                                      };
 +
 +                                      pioB_clk: pioB_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <3>;
 +                                      };
 +
 +                                      pioCDE_clk: pioCDE_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <4>;
 +                                      };
 +
 +                                      usart0_clk: usart0_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <7>;
 +                                      };
 +
 +                                      usart1_clk: usart1_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <8>;
 +                                      };
 +
 +                                      usart2_clk: usart2_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <9>;
 +                                      };
 +
 +                                      mci0_clk: mci0_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <10>;
 +                                      };
 +
 +                                      mci1_clk: mci1_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <11>;
 +                                      };
 +
 +                                      can_clk: can_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <12>;
 +                                      };
 +
 +                                      twi0_clk: twi0_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <13>;
 +                                      };
 +
 +                                      spi0_clk: spi0_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <14>;
 +                                      };
 +
 +                                      spi1_clk: spi1_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <15>;
 +                                      };
 +
 +                                      ssc0_clk: ssc0_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <16>;
 +                                      };
 +
 +                                      ssc1_clk: ssc1_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <17>;
 +                                      };
 +
 +                                      ac91_clk: ac97_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <18>;
 +                                      };
 +
 +                                      tcb_clk: tcb_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <19>;
 +                                      };
 +
 +                                      pwm_clk: pwm_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <20>;
 +                                      };
 +
 +                                      macb0_clk: macb0_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <21>;
 +                                      };
 +
 +                                      g2de_clk: g2de_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <23>;
 +                                      };
 +
 +                                      udc_clk: udc_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <24>;
 +                                      };
 +
 +                                      isi_clk: isi_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <25>;
 +                                      };
 +
 +                                      lcd_clk: lcd_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <26>;
 +                                      };
 +
 +                                      dma_clk: dma_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <27>;
 +                                      };
 +
 +                                      ohci_clk: ohci_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <29>;
 +                                      };
 +                              };
                        };
  
-                       ramc: ramc@ffffe200 {
+                       ramc0: ramc@ffffe200 {
                                compatible = "atmel,at91sam9260-sdramc";
-                               reg = <0xffffe200 0x200
-                                      0xffffe800 0x200>;
+                               reg = <0xffffe200 0x200>;
+                       };
+ 
+                       ramc1: ramc@ffffe800 {
+                               compatible = "atmel,at91sam9260-sdramc";
+                               reg = <0xffffe800 0x200>;
                        };
  
                        pit: timer@fffffd30 {
                                compatible = "atmel,at91sam9260-pit";
                                reg = <0xfffffd30 0xf>;
                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
 +                              clocks = <&mck>;
                        };
  
                        tcb0: timer@fff7c000 {
                                compatible = "atmel,at91rm9200-tcb";
                                reg = <0xfff7c000 0x100>;
                                interrupts = <19 IRQ_TYPE_LEVEL_HIGH 0>;
 +                              clocks = <&tcb_clk>;
 +                              clock-names = "t0_clk";
                        };
  
                        rstc@fffffd00 {
@@@ -680,7 -407,6 +684,7 @@@
                                        gpio-controller;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
 +                                      clocks = <&pioA_clk>;
                                };
  
                                pioB: gpio@fffff400 {
@@@ -691,7 -417,6 +695,7 @@@
                                        gpio-controller;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
 +                                      clocks = <&pioB_clk>;
                                };
  
                                pioC: gpio@fffff600 {
@@@ -702,7 -427,6 +706,7 @@@
                                        gpio-controller;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
 +                                      clocks = <&pioCDE_clk>;
                                };
  
                                pioD: gpio@fffff800 {
@@@ -713,7 -437,6 +717,7 @@@
                                        gpio-controller;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
 +                                      clocks = <&pioCDE_clk>;
                                };
  
                                pioE: gpio@fffffa00 {
@@@ -724,7 -447,6 +728,7 @@@
                                        gpio-controller;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
 +                                      clocks = <&pioCDE_clk>;
                                };
                        };
  
@@@ -734,8 -456,6 +738,8 @@@
                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_dbgu>;
 +                              clocks = <&mck>;
 +                              clock-names = "usart";
                                status = "disabled";
                        };
  
@@@ -747,8 -467,6 +751,8 @@@
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart0>;
 +                              clocks = <&usart0_clk>;
 +                              clock-names = "usart";
                                status = "disabled";
                        };
  
@@@ -760,8 -478,6 +764,8 @@@
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart1>;
 +                              clocks = <&usart1_clk>;
 +                              clock-names = "usart";
                                status = "disabled";
                        };
  
@@@ -773,8 -489,6 +777,8 @@@
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart2>;
 +                              clocks = <&usart2_clk>;
 +                              clock-names = "usart";
                                status = "disabled";
                        };
  
@@@ -784,8 -498,6 +788,8 @@@
                                interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
 +                              clocks = <&ssc0_clk>;
 +                              clock-names = "pclk";
                                status = "disabled";
                        };
  
@@@ -795,8 -507,6 +799,8 @@@
                                interrupts = <17 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
 +                              clocks = <&ssc1_clk>;
 +                              clock-names = "pclk";
                                status = "disabled";
                        };
  
@@@ -806,8 -516,6 +810,8 @@@
                                interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_macb_rmii>;
 +                              clocks = <&macb0_clk>, <&macb0_clk>;
 +                              clock-names = "hclk", "pclk";
                                status = "disabled";
                        };
  
@@@ -815,8 -523,6 +819,8 @@@
                                compatible = "atmel,at91rm9200-udc";
                                reg = <0xfff78000 0x4000>;
                                interrupts = <24 IRQ_TYPE_LEVEL_HIGH 2>;
 +                              clocks = <&udc_clk>, <&udpck>;
 +                              clock-names = "pclk", "hclk";
                                status = "disabled";
                        };
  
@@@ -826,7 -532,6 +830,7 @@@
                                interrupts = <13 IRQ_TYPE_LEVEL_HIGH 6>;
                                #address-cells = <1>;
                                #size-cells = <0>;
 +                              clocks = <&twi0_clk>;
                                status = "disabled";
                        };
  
@@@ -836,8 -541,6 +840,8 @@@
                                interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
 +                              clocks = <&mci0_clk>;
 +                              clock-names = "mci_clk";
                                status = "disabled";
                        };
  
@@@ -847,8 -550,6 +851,8 @@@
                                interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
 +                              clocks = <&mci1_clk>;
 +                              clock-names = "mci_clk";
                                status = "disabled";
                        };
  
@@@ -871,8 -572,6 +875,8 @@@
                                interrupts = <14 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi0>;
 +                              clocks = <&spi0_clk>;
 +                              clock-names = "spi_clk";
                                status = "disabled";
                        };
  
@@@ -884,8 -583,6 +888,8 @@@
                                interrupts = <15 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi1>;
 +                              clocks = <&spi1_clk>;
 +                              clock-names = "spi_clk";
                                status = "disabled";
                        };
  
@@@ -894,8 -591,6 +898,8 @@@
                                reg = <0xfffb8000 0x300>;
                                interrupts = <20 IRQ_TYPE_LEVEL_HIGH 4>;
                                #pwm-cells = <3>;
 +                              clocks = <&pwm_clk>;
 +                              clock-names = "pwm_clk";
                                status = "disabled";
                        };
                };
@@@ -931,8 -626,6 +935,8 @@@
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00a00000 0x100000>;
                        interrupts = <29 IRQ_TYPE_LEVEL_HIGH 2>;
 +                      clocks = <&usb>, <&ohci_clk>, <&ohci_clk>, <&uhpck>;
 +                      clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
                        status = "disabled";
                };
        };

diff --combined arch/arm/boot/dts/at91sam9g45.dtsi
index 932a669156af81674a4d2ffc12f3b6e729d4b731,6f648b85b7256db3317d73968c7eca29873842da..857fd3e0b8a0da91250fb3060fb49a99e3d308c0
--- 1/arch/arm/boot/dts/at91sam9g45.dtsi
--- 2/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@@ -14,7 -14,6 +14,7 @@@
  #include <dt-bindings/pinctrl/at91.h>
  #include <dt-bindings/interrupt-controller/irq.h>
  #include <dt-bindings/gpio/gpio.h>
 +#include <dt-bindings/clock/at91.h>
  
  / {
        model = "Atmel AT91SAM9G45 family SoC";
@@@ -54,26 -53,6 +54,26 @@@
                reg = <0x70000000 0x10000000>;
        };
  
 +      clocks {
 +              slow_xtal: slow_xtal {
 +                      compatible = "fixed-clock";
 +                      #clock-cells = <0>;
 +                      clock-frequency = <0>;
 +              };
 +
 +              main_xtal: main_xtal {
 +                      compatible = "fixed-clock";
 +                      #clock-cells = <0>;
 +                      clock-frequency = <0>;
 +              };
 +
 +              adc_op_clk: adc_op_clk{
 +                      compatible = "fixed-clock";
 +                      #clock-cells = <0>;
 +                      clock-frequency = <300000>;
 +              };
 +      };
 +
        ahb {
                compatible = "simple-bus";
                #address-cells = <1>;
@@@ -96,281 -75,17 +96,287 @@@
  
                        ramc0: ramc@ffffe400 {
                                compatible = "atmel,at91sam9g45-ddramc";
-                               reg = <0xffffe400 0x200
-                                      0xffffe600 0x200>;
+                               reg = <0xffffe400 0x200>;
++                              clocks = <&ddrck>;
++                              clock-names = "ddrck";
+                       };
+ 
+                       ramc1: ramc@ffffe600 {
+                               compatible = "atmel,at91sam9g45-ddramc";
+                               reg = <0xffffe600 0x200>;
 +                              clocks = <&ddrck>;
 +                              clock-names = "ddrck";
                        };
  
                        pmc: pmc@fffffc00 {
 -                              compatible = "atmel,at91rm9200-pmc";
 +                              compatible = "atmel,at91sam9g45-pmc";
                                reg = <0xfffffc00 0x100>;
 +                              interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
 +                              interrupt-controller;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              #interrupt-cells = <1>;
 +
 +                              main_osc: main_osc {
 +                                      compatible = "atmel,at91rm9200-clk-main-osc";
 +                                      #clock-cells = <0>;
 +                                      interrupts-extended = <&pmc AT91_PMC_MOSCS>;
 +                                      clocks = <&main_xtal>;
 +                              };
 +
 +                              main: mainck {
 +                                      compatible = "atmel,at91rm9200-clk-main";
 +                                      #clock-cells = <0>;
 +                                      clocks = <&main_osc>;
 +                              };
 +
 +                              plla: pllack {
 +                                      compatible = "atmel,at91rm9200-clk-pll";
 +                                      #clock-cells = <0>;
 +                                      interrupts-extended = <&pmc AT91_PMC_LOCKA>;
 +                                      clocks = <&main>;
 +                                      reg = <0>;
 +                                      atmel,clk-input-range = <2000000 32000000>;
 +                                      #atmel,pll-clk-output-range-cells = <4>;
 +                                      atmel,pll-clk-output-ranges = <745000000 800000000 0 0
 +                                                                     695000000 750000000 1 0
 +                                                                     645000000 700000000 2 0
 +                                                                     595000000 650000000 3 0
 +                                                                     545000000 600000000 0 1
 +                                                                     495000000 555000000 1 1
 +                                                                     445000000 500000000 2 1
 +                                                                     400000000 450000000 3 1>;
 +                              };
 +
 +                              plladiv: plladivck {
 +                                      compatible = "atmel,at91sam9x5-clk-plldiv";
 +                                      #clock-cells = <0>;
 +                                      clocks = <&plla>;
 +                              };
 +
 +                              utmi: utmick {
 +                                      compatible = "atmel,at91sam9x5-clk-utmi";
 +                                      #clock-cells = <0>;
 +                                      interrupts-extended = <&pmc AT91_PMC_LOCKU>;
 +                                      clocks = <&main>;
 +                              };
 +
 +                              mck: masterck {
 +                                      compatible = "atmel,at91rm9200-clk-master";
 +                                      #clock-cells = <0>;
 +                                      interrupts-extended = <&pmc AT91_PMC_MCKRDY>;
 +                                      clocks = <&slow_xtal>, <&main>, <&plladiv>, <&utmi>;
 +                                      atmel,clk-output-range = <0 133333333>;
 +                                      atmel,clk-divisors = <1 2 4 3>;
 +                              };
 +
 +                              usb: usbck {
 +                                      compatible = "atmel,at91sam9x5-clk-usb";
 +                                      #clock-cells = <0>;
 +                                      clocks = <&plladiv>, <&utmi>;
 +                              };
 +
 +                              prog: progck {
 +                                      compatible = "atmel,at91sam9g45-clk-programmable";
 +                                      #address-cells = <1>;
 +                                      #size-cells = <0>;
 +                                      interrupt-parent = <&pmc>;
 +                                      clocks = <&slow_xtal>, <&main>, <&plladiv>, <&utmi>, <&mck>;
 +
 +                                      prog0: prog0 {
 +                                              #clock-cells = <0>;
 +                                              reg = <0>;
 +                                              interrupts = <AT91_PMC_PCKRDY(0)>;
 +                                      };
 +
 +                                      prog1: prog1 {
 +                                              #clock-cells = <0>;
 +                                              reg = <1>;
 +                                              interrupts = <AT91_PMC_PCKRDY(1)>;
 +                                      };
 +                              };
 +
 +                              systemck {
 +                                      compatible = "atmel,at91rm9200-clk-system";
 +                                      #address-cells = <1>;
 +                                      #size-cells = <0>;
 +
 +                                      ddrck: ddrck {
 +                                              #clock-cells = <0>;
 +                                              reg = <2>;
 +                                              clocks = <&mck>;
 +                                      };
 +
 +                                      uhpck: uhpck {
 +                                              #clock-cells = <0>;
 +                                              reg = <6>;
 +                                              clocks = <&usb>;
 +                                      };
 +
 +                                      pck0: pck0 {
 +                                              #clock-cells = <0>;
 +                                              reg = <8>;
 +                                              clocks = <&prog0>;
 +                                      };
 +
 +                                      pck1: pck1 {
 +                                              #clock-cells = <0>;
 +                                              reg = <9>;
 +                                              clocks = <&prog1>;
 +                                      };
 +                              };
 +
 +                              periphck {
 +                                      compatible = "atmel,at91rm9200-clk-peripheral";
 +                                      #address-cells = <1>;
 +                                      #size-cells = <0>;
 +                                      clocks = <&mck>;
 +
 +                                      pioA_clk: pioA_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <2>;
 +                                      };
 +
 +                                      pioB_clk: pioB_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <3>;
 +                                      };
 +
 +                                      pioC_clk: pioC_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <4>;
 +                                      };
 +
 +                                      pioDE_clk: pioDE_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <5>;
 +                                      };
 +
 +                                      trng_clk: trng_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <6>;
 +                                      };
 +
 +                                      usart0_clk: usart0_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <7>;
 +                                      };
 +
 +                                      usart1_clk: usart1_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <8>;
 +                                      };
 +
 +                                      usart2_clk: usart2_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <9>;
 +                                      };
 +
 +                                      usart3_clk: usart3_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <10>;
 +                                      };
 +
 +                                      mci0_clk: mci0_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <11>;
 +                                      };
 +
 +                                      twi0_clk: twi0_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <12>;
 +                                      };
 +
 +                                      twi1_clk: twi1_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <13>;
 +                                      };
 +
 +                                      spi0_clk: spi0_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <14>;
 +                                      };
 +
 +                                      spi1_clk: spi1_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <15>;
 +                                      };
 +
 +                                      ssc0_clk: ssc0_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <16>;
 +                                      };
 +
 +                                      ssc1_clk: ssc1_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <17>;
 +                                      };
 +
 +                                      tcb0_clk: tcb0_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <18>;
 +                                      };
 +
 +                                      pwm_clk: pwm_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <19>;
 +                                      };
 +
 +                                      adc_clk: adc_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <20>;
 +                                      };
 +
 +                                      dma0_clk: dma0_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <21>;
 +                                      };
 +
 +                                      uhphs_clk: uhphs_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <22>;
 +                                      };
 +
 +                                      lcd_clk: lcd_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <23>;
 +                                      };
 +
 +                                      ac97_clk: ac97_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <24>;
 +                                      };
 +
 +                                      macb0_clk: macb0_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <25>;
 +                                      };
 +
 +                                      isi_clk: isi_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <26>;
 +                                      };
 +
 +                                      udphs_clk: udphs_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <27>;
 +                                      };
 +
 +                                      aestdessha_clk: aestdessha_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <28>;
 +                                      };
 +
 +                                      mci1_clk: mci1_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <29>;
 +                                      };
 +
 +                                      vdec_clk: vdec_clk {
 +                                              #clock-cells = <0>;
 +                                              reg = <30>;
 +                                      };
 +                              };
                        };
  
                        rstc@fffffd00 {
@@@ -382,7 -97,6 +388,7 @@@
                                compatible = "atmel,at91sam9260-pit";
                                reg = <0xfffffd30 0xf>;
                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
 +                              clocks = <&mck>;
                        };
  
  
@@@ -395,16 -109,12 +401,16 @@@
                                compatible = "atmel,at91rm9200-tcb";
                                reg = <0xfff7c000 0x100>;
                                interrupts = <18 IRQ_TYPE_LEVEL_HIGH 0>;
 +                              clocks = <&tcb0_clk>, <&tcb0_clk>, <&tcb0_clk>;
 +                              clock-names = "t0_clk", "t1_clk", "t2_clk";
                        };
  
                        tcb1: timer@fffd4000 {
                                compatible = "atmel,at91rm9200-tcb";
                                reg = <0xfffd4000 0x100>;
                                interrupts = <18 IRQ_TYPE_LEVEL_HIGH 0>;
 +                              clocks = <&tcb0_clk>, <&tcb0_clk>, <&tcb0_clk>;
 +                              clock-names = "t0_clk", "t1_clk", "t2_clk";
                        };
  
                        dma: dma-controller@ffffec00 {
@@@ -412,8 -122,6 +418,8 @@@
                                reg = <0xffffec00 0x200>;
                                interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>;
                                #dma-cells = <2>;
 +                              clocks = <&dma0_clk>;
 +                              clock-names = "dma_clk";
                        };
  
                        pinctrl@fffff200 {
@@@ -812,7 -520,6 +818,7 @@@
                                        gpio-controller;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
 +                                      clocks = <&pioA_clk>;
                                };
  
                                pioB: gpio@fffff400 {
@@@ -823,7 -530,6 +829,7 @@@
                                        gpio-controller;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
 +                                      clocks = <&pioB_clk>;
                                };
  
                                pioC: gpio@fffff600 {
@@@ -834,7 -540,6 +840,7 @@@
                                        gpio-controller;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
 +                                      clocks = <&pioC_clk>;
                                };
  
                                pioD: gpio@fffff800 {
@@@ -845,7 -550,6 +851,7 @@@
                                        gpio-controller;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
 +                                      clocks = <&pioDE_clk>;
                                };
  
                                pioE: gpio@fffffa00 {
@@@ -856,7 -560,6 +862,7 @@@
                                        gpio-controller;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
 +                                      clocks = <&pioDE_clk>;
                                };
                        };
  
@@@ -866,8 -569,6 +872,8 @@@
                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_dbgu>;
 +                              clocks = <&mck>;
 +                              clock-names = "usart";
                                status = "disabled";
                        };
  
@@@ -879,8 -580,6 +885,8 @@@
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart0>;
 +                              clocks = <&usart0_clk>;
 +                              clock-names = "usart";
                                status = "disabled";
                        };
  
@@@ -892,8 -591,6 +898,8 @@@
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart1>;
 +                              clocks = <&usart1_clk>;
 +                              clock-names = "usart";
                                status = "disabled";
                        };
  
@@@ -905,8 -602,6 +911,8 @@@
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart2>;
 +                              clocks = <&usart2_clk>;
 +                              clock-names = "usart";
                                status = "disabled";
                        };
  
@@@ -918,8 -613,6 +924,8 @@@
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart3>;
 +                              clocks = <&usart3_clk>;
 +                              clock-names = "usart";
                                status = "disabled";
                        };
  
@@@ -929,8 -622,6 +935,8 @@@
                                interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_macb_rmii>;
 +                              clocks = <&macb0_clk>, <&macb0_clk>;
 +                              clock-names = "hclk", "pclk";
                                status = "disabled";
                        };
  
@@@ -942,7 -633,6 +948,7 @@@
                                pinctrl-0 = <&pinctrl_i2c0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
 +                              clocks = <&twi0_clk>;
                                status = "disabled";
                        };
  
@@@ -954,7 -644,6 +960,7 @@@
                                pinctrl-0 = <&pinctrl_i2c1>;
                                #address-cells = <1>;
                                #size-cells = <0>;
 +                              clocks = <&twi1_clk>;
                                status = "disabled";
                        };
  
@@@ -964,8 -653,6 +970,8 @@@
                                interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
 +                              clocks = <&ssc0_clk>;
 +                              clock-names = "pclk";
                                status = "disabled";
                        };
  
@@@ -975,8 -662,6 +981,8 @@@
                                interrupts = <17 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
 +                              clocks = <&ssc1_clk>;
 +                              clock-names = "pclk";
                                status = "disabled";
                        };
  
@@@ -986,8 -671,6 +992,8 @@@
                                compatible = "atmel,at91sam9g45-adc";
                                reg = <0xfffb0000 0x100>;
                                interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
 +                              clocks = <&adc_clk>, <&adc_op_clk>;
 +                              clock-names = "adc_clk", "adc_op_clk";
                                atmel,adc-channels-used = <0xff>;
                                atmel,adc-vref = <3300>;
                                atmel,adc-startup-time = <40>;
@@@ -1027,7 -710,6 +1033,7 @@@
                                reg = <0xfffb8000 0x300>;
                                interrupts = <19 IRQ_TYPE_LEVEL_HIGH 4>;
                                #pwm-cells = <3>;
 +                              clocks = <&pwm_clk>;
                                status = "disabled";
                        };
  
@@@ -1040,8 -722,6 +1046,8 @@@
                                dma-names = "rxtx";
                                #address-cells = <1>;
                                #size-cells = <0>;
 +                              clocks = <&mci0_clk>;
 +                              clock-names = "mci_clk";
                                status = "disabled";
                        };
  
@@@ -1054,8 -734,6 +1060,8 @@@
                                dma-names = "rxtx";
                                #address-cells = <1>;
                                #size-cells = <0>;
 +                              clocks = <&mci1_clk>;
 +                              clock-names = "mci_clk";
                                status = "disabled";
                        };
  
@@@ -1078,8 -756,6 +1084,8 @@@
                                interrupts = <14 4 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi0>;
 +                              clocks = <&spi0_clk>;
 +                              clock-names = "spi_clk";
                                status = "disabled";
                        };
  
@@@ -1091,8 -767,6 +1097,8 @@@
                                interrupts = <15 4 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi1>;
 +                              clocks = <&spi1_clk>;
 +                              clock-names = "spi_clk";
                                status = "disabled";
                        };
  
@@@ -1103,8 -777,6 +1109,8 @@@
                                reg = <0x00600000 0x80000
                                       0xfff78000 0x400>;
                                interrupts = <27 IRQ_TYPE_LEVEL_HIGH 0>;
 +                              clocks = <&udphs_clk>, <&utmi>;
 +                              clock-names = "pclk", "hclk";
                                status = "disabled";
  
                                ep0 {
@@@ -1167,8 -839,6 +1173,8 @@@
                        interrupts = <23 IRQ_TYPE_LEVEL_HIGH 3>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_fb>;
 +                      clocks = <&lcd_clk>, <&lcd_clk>;
 +                      clock-names = "hclk", "lcdc_clk";
                        status = "disabled";
                };
  
@@@ -1195,9 -865,6 +1201,9 @@@
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00700000 0x100000>;
                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
 +                      //TODO
 +                      clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
 +                      clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
                        status = "disabled";
                };
  
@@@ -1205,9 -872,6 +1211,9 @@@
                        compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
                        reg = <0x00800000 0x100000>;
                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
 +                      //TODO
 +                      clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
 +                      clock-names = "usb_clk", "ehci_clk", "hclk", "uhpck";
                        status = "disabled";
                };
        };

diff --combined arch/arm/boot/dts/at91sam9n12.dtsi
index 2bfac310dbece7093c49b1c1ced69b0676d9e320,1534e4997ee3af09362629e7109f36ddfb21c789..68eb9aded1648e7078d7097eaedbf829ed151561
--- 1/arch/arm/boot/dts/at91sam9n12.dtsi
--- 2/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@@ -50,18 -50,16 +50,18 @@@
                reg = <0x20000000 0x10000000>;
        };
  
 -      slow_xtal: slow_xtal {
 -              compatible = "fixed-clock";
 -              #clock-cells = <0>;
 -              clock-frequency = <0>;
 -      };
 +      clocks {
 +              slow_xtal: slow_xtal {
 +                      compatible = "fixed-clock";
 +                      #clock-cells = <0>;
 +                      clock-frequency = <0>;
 +              };
  
 -      main_xtal: main_xtal {
 -              compatible = "fixed-clock";
 -              #clock-cells = <0>;
 -              clock-frequency = <0>;
 +              main_xtal: main_xtal {
 +                      compatible = "fixed-clock";
 +                      #clock-cells = <0>;
 +                      clock-frequency = <0>;
 +              };
        };
  
        ahb {
@@@ -87,6 -85,8 +87,8 @@@
                        ramc0: ramc@ffffe800 {
                                compatible = "atmel,at91sam9g45-ddramc";
                                reg = <0xffffe800 0x200>;
+                               clocks = <&ddrck>;
+                               clock-names = "ddrck";
                        };
  
                        pmc: pmc@fffffc00 {
@@@ -134,8 -134,8 +136,8 @@@
                                                                      <595000000 650000000 3 0>,
                                                                      <545000000 600000000 0 1>,
                                                                      <495000000 555000000 1 1>,
 -                                                                    <445000000 500000000 1 2>,
 -                                                                    <400000000 450000000 1 3>;
 +                                                                    <445000000 500000000 2 1>,
 +                                                                    <400000000 450000000 3 1>;
                                };
  
                                plladiv: plladivck {
@@@ -927,7 -927,7 +929,7 @@@
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00500000 0x00100000>;
                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
 -                      clocks = <&usb>, <&uhphs_clk>, <&udphs_clk>,
 +                      clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>,
                                 <&uhpck>;
                        clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
                        status = "disabled";

diff --combined arch/arm/boot/dts/at91sam9x5.dtsi
index e1a5c70b885c87fabfa0569757a71db73dbf36cf,72e1483a651cc5c19ac53f8b867cd8f12d11a63f..765a1e39858e71af97ba53b40d83e08f314b7857
--- 1/arch/arm/boot/dts/at91sam9x5.dtsi
--- 2/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@@ -52,24 -52,22 +52,24 @@@
                reg = <0x20000000 0x10000000>;
        };
  
 -      slow_xtal: slow_xtal {
 -              compatible = "fixed-clock";
 -              #clock-cells = <0>;
 -              clock-frequency = <0>;
 -      };
 +      clocks {
 +              slow_xtal: slow_xtal {
 +                      compatible = "fixed-clock";
 +                      #clock-cells = <0>;
 +                      clock-frequency = <0>;
 +              };
  
 -      main_xtal: main_xtal {
 -              compatible = "fixed-clock";
 -              #clock-cells = <0>;
 -              clock-frequency = <0>;
 -      };
 +              main_xtal: main_xtal {
 +                      compatible = "fixed-clock";
 +                      #clock-cells = <0>;
 +                      clock-frequency = <0>;
 +              };
  
 -      adc_op_clk: adc_op_clk{
 -              compatible = "fixed-clock";
 -              #clock-cells = <0>;
 -              clock-frequency = <5000000>;
 +              adc_op_clk: adc_op_clk{
 +                      compatible = "fixed-clock";
 +                      #clock-cells = <0>;
 +                      clock-frequency = <5000000>;
 +              };
        };
  
        ahb {
@@@ -95,6 -93,8 +95,8 @@@
                        ramc0: ramc@ffffe800 {
                                compatible = "atmel,at91sam9g45-ddramc";
                                reg = <0xffffe800 0x200>;
+                               clocks = <&ddrck>;
+                               clock-names = "ddrck";
                        };
  
                        pmc: pmc@fffffc00 {
@@@ -142,8 -142,8 +144,8 @@@
                                                                       595000000 650000000 3 0
                                                                       545000000 600000000 0 1
                                                                       495000000 555000000 1 1
 -                                                                     445000000 500000000 1 2
 -                                                                     400000000 450000000 1 3>;
 +                                                                     445000000 500000000 2 1
 +                                                                     400000000 450000000 3 1>;
                                };
  
                                plladiv: plladivck {
@@@ -1047,8 -1047,6 +1049,8 @@@
                                reg = <0x00500000 0x80000
                                       0xf803c000 0x400>;
                                interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;
 +                              clocks = <&usb>, <&udphs_clk>;
 +                              clock-names = "hclk", "pclk";
                                status = "disabled";
  
                                ep0 {
@@@ -1126,7 -1124,6 +1128,7 @@@
                                compatible = "atmel,at91sam9rl-pwm";
                                reg = <0xf8034000 0x300>;
                                interrupts = <18 IRQ_TYPE_LEVEL_HIGH 4>;
 +                              clocks = <&pwm_clk>;
                                #pwm-cells = <3>;
                                status = "disabled";
                        };
@@@ -1158,7 -1155,8 +1160,7 @@@
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00600000 0x100000>;
                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
 -                      clocks = <&usb>, <&uhphs_clk>, <&udphs_clk>,
 -                               <&uhpck>;
 +                      clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
                        clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
                        status = "disabled";
                };

diff --combined arch/arm/boot/dts/sama5d3.dtsi
index 45013b867c8d2c414a93469c475c99446a3b0e71,97952ef7f24012bc388c4515992f3e5901be80f4..7702a0d120cb976f9cb2f442fb26a54a19308f85
--- 1/arch/arm/boot/dts/sama5d3.dtsi
--- 2/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@@ -58,19 -58,19 +58,19 @@@
                reg = <0x20000000 0x8000000>;
        };
  
 -      slow_xtal: slow_xtal {
 -              compatible = "fixed-clock";
 -              #clock-cells = <0>;
 -              clock-frequency = <0>;
 -      };
 +      clocks {
 +              slow_xtal: slow_xtal {
 +                      compatible = "fixed-clock";
 +                      #clock-cells = <0>;
 +                      clock-frequency = <0>;
 +              };
  
 -      main_xtal: main_xtal {
 -              compatible = "fixed-clock";
 -              #clock-cells = <0>;
 -              clock-frequency = <0>;
 -      };
 +              main_xtal: main_xtal {
 +                      compatible = "fixed-clock";
 +                      #clock-cells = <0>;
 +                      clock-frequency = <0>;
 +              };
  
 -      clocks {
                adc_op_clk: adc_op_clk{
                        compatible = "fixed-clock";
                        #clock-cells = <0>;
@@@ -402,8 -402,10 +402,10 @@@
                        };
  
                        ramc0: ramc@ffffea00 {
-                               compatible = "atmel,at91sam9g45-ddramc";
+                               compatible = "atmel,sama5d3-ddramc";
                                reg = <0xffffea00 0x200>;
+                               clocks = <&ddrck>, <&mpddr_clk>;
+                               clock-names = "ddrck", "mpddr";
                        };
  
                        dbgu: serial@ffffee00 {
@@@ -1170,6 -1172,11 +1172,11 @@@
                                                #clock-cells = <0>;
                                                reg = <48>;
                                        };
+ 
+                                       mpddr_clk: mpddr_clk {
+                                               #clock-cells = <0>;
+                                               reg = <49>;
+                                       };
                                };
                        };
  
@@@ -1178,6 -1185,11 +1185,11 @@@
                                reg = <0xfffffe00 0x10>;
                        };
  
+                       shutdown-controller@fffffe10 {
+                               compatible = "atmel,at91sam9x5-shdwc";
+                               reg = <0xfffffe10 0x10>;
+                       };
+ 
                        pit: timer@fffffe30 {
                                compatible = "atmel,at91sam9260-pit";
                                reg = <0xfffffe30 0xf>;