ARM: dts: at91: sama5d2: switch to new clock binding
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Tue, 12 Jun 2018 18:02:52 +0000 (20:02 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Wed, 21 Nov 2018 10:58:48 +0000 (11:58 +0100)
Switch sama5d2 boards to the new PMC clock bindings.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
arch/arm/boot/dts/at91-sama5d2_xplained.dts
arch/arm/boot/dts/sama5d2.dtsi

index 363a43d77424272529a39fff8346616281e7a0da..4a258867ddf105d0a7c3a8c0c7395b271d43a42c 100644 (file)
                                        dma-names = "tx", "rx";
                                        #address-cells = <1>;
                                        #size-cells = <0>;
-                                       clocks = <&flx1_clk>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 20>;
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_mikrobus_i2c>;
                                        atmel,fifo-size = <16>;
                                        compatible = "atmel,at91sam9260-usart";
                                        reg = <0x200 0x200>;
                                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>;
-                                       clocks = <&flx3_clk>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 22>;
                                        clock-names = "usart";
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_flx3_default>;
                                        compatible = "atmel,at91rm9200-spi";
                                        reg = <0x400 0x200>;
                                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>;
-                                       clocks = <&flx3_clk>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 22>;
                                        clock-names = "spi_clk";
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_flx3_default>;
                                        compatible = "atmel,at91sam9260-usart";
                                        reg = <0x200 0x200>;
                                        interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
-                                       clocks = <&flx4_clk>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;
                                        clock-names = "usart";
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_flx4_default>;
                                        compatible = "atmel,at91rm9200-spi";
                                        reg = <0x400 0x200>;
                                        interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
-                                       clocks = <&flx4_clk>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;
                                        clock-names = "spi_clk";
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_mikrobus_spi &pinctrl_mikrobus1_spi_cs &pinctrl_mikrobus2_spi_cs>;
                                        dma-names = "tx", "rx";
                                        #address-cells = <1>;
                                        #size-cells = <0>;
-                                       clocks = <&flx4_clk>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_flx4_default>;
                                        atmel,fifo-size = <16>;
index 2214bfe7aa205f624c7ad485ae88f0d3ef8a15fa..ba7f3e646c2606bf724ef0e5878e9305c602df81 100644 (file)
                                        dma-names = "tx", "rx";
                                        #address-cells = <1>;
                                        #size-cells = <0>;
-                                       clocks = <&flx0_clk>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_flx0_default>;
                                        atmel,fifo-size = <16>;
index 518e2b095ccfdadff77444b1c4baf621478d55fc..fa54e8866f1ecb9909d5c917b308bff292a5730a 100644 (file)
                                        compatible = "atmel,at91sam9260-usart";
                                        reg = <0x200 0x200>;
                                        interrupts = <19 IRQ_TYPE_LEVEL_HIGH 7>;
-                                       clocks = <&flx0_clk>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;
                                        clock-names = "usart";
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_flx0_default>;
                                        dma-names = "tx", "rx";
                                        #address-cells = <1>;
                                        #size-cells = <0>;
-                                       clocks = <&flx4_clk>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_flx4_default>;
                                        atmel,fifo-size = <16>;
index dd0dda6ed44b5ff9d7aec2574e10a0c34ed14130..dc2280d9127f9ed4d74e8fb5dab6c139794abca5 100644 (file)
@@ -84,7 +84,7 @@
                compatible = "arm,coresight-etb10", "arm,primecell";
                reg = <0x740000 0x1000>;
 
-               clocks = <&mck>;
+               clocks = <&pmc PMC_TYPE_CORE PMC_MCK>;
                clock-names = "apb_pclk";
 
                in-ports {
                compatible = "arm,coresight-etm3x", "arm,primecell";
                reg = <0x73C000 0x1000>;
 
-               clocks = <&mck>;
+               clocks = <&pmc PMC_TYPE_CORE PMC_MCK>;
                clock-names = "apb_pclk";
 
                out-ports {
                        reg = <0x00300000 0x100000
                               0xfc02c000 0x400>;
                        interrupts = <42 IRQ_TYPE_LEVEL_HIGH 2>;
-                       clocks = <&udphs_clk>, <&utmi>;
+                       clocks = <&pmc PMC_TYPE_PERIPHERAL 42>, <&pmc PMC_TYPE_CORE PMC_UTMI>;
                        clock-names = "pclk", "hclk";
                        status = "disabled";
 
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00400000 0x100000>;
                        interrupts = <41 IRQ_TYPE_LEVEL_HIGH 2>;
-                       clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
+                       clocks = <&pmc PMC_TYPE_PERIPHERAL 41>, <&pmc PMC_TYPE_PERIPHERAL 41>, <&pmc PMC_TYPE_SYSTEM 6>;
                        clock-names = "ohci_clk", "hclk", "uhpck";
                        status = "disabled";
                };
                        compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
                        reg = <0x00500000 0x100000>;
                        interrupts = <41 IRQ_TYPE_LEVEL_HIGH 2>;
-                       clocks = <&utmi>, <&uhphs_clk>;
+                       clocks = <&pmc PMC_TYPE_CORE PMC_UTMI>, <&pmc PMC_TYPE_PERIPHERAL 41>;
                        clock-names = "usb_clk", "ehci_clk";
                        status = "disabled";
                };
                                  0x1 0x0 0x60000000 0x10000000
                                  0x2 0x0 0x70000000 0x10000000
                                  0x3 0x0 0x80000000 0x10000000>;
-                       clocks = <&h32ck>;
+                       clocks = <&pmc PMC_TYPE_CORE PMC_MCK2>;
                        status = "disabled";
 
                        nand_controller: nand-controller {
                        compatible = "atmel,sama5d2-sdhci";
                        reg = <0xa0000000 0x300>;
                        interrupts = <31 IRQ_TYPE_LEVEL_HIGH 0>;
-                       clocks = <&sdmmc0_hclk>, <&sdmmc0_gclk>, <&main>;
+                       clocks = <&pmc PMC_TYPE_PERIPHERAL 31>, <&pmc PMC_TYPE_GCK 31>, <&pmc PMC_TYPE_CORE PMC_MAIN>;
                        clock-names = "hclock", "multclk", "baseclk";
                        status = "disabled";
                };
                        compatible = "atmel,sama5d2-sdhci";
                        reg = <0xb0000000 0x300>;
                        interrupts = <32 IRQ_TYPE_LEVEL_HIGH 0>;
-                       clocks = <&sdmmc1_hclk>, <&sdmmc1_gclk>, <&main>;
+                       clocks = <&pmc PMC_TYPE_PERIPHERAL 32>, <&pmc PMC_TYPE_GCK 32>, <&pmc PMC_TYPE_CORE PMC_MAIN>;
                        clock-names = "hclock", "multclk", "baseclk";
                        status = "disabled";
                };
                                compatible = "atmel,sama5d2-hlcdc";
                                reg = <0xf0000000 0x2000>;
                                interrupts = <45 IRQ_TYPE_LEVEL_HIGH 0>;
-                               clocks = <&lcdc_clk>, <&lcdck>, <&clk32k>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 45>, <&pmc PMC_TYPE_SYSTEM 3>, <&clk32k>;
                                clock-names = "periph_clk","sys_clk", "slow_clk";
                                status = "disabled";
 
                                compatible = "atmel,sama5d2-isc";
                                reg = <0xf0008000 0x4000>;
                                interrupts = <46 IRQ_TYPE_LEVEL_HIGH 5>;
-                               clocks = <&isc_clk>, <&iscck>, <&isc_gclk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 46>, <&pmc PMC_TYPE_SYSTEM 18>, <&pmc PMC_TYPE_GCK 46>;
                                clock-names = "hclock", "iscck", "gck";
                                #clock-cells = <0>;
                                clock-output-names = "isc-mck";
                        ramc0: ramc@f000c000 {
                                compatible = "atmel,sama5d3-ddramc";
                                reg = <0xf000c000 0x200>;
-                               clocks = <&ddrck>, <&mpddr_clk>;
+                               clocks = <&pmc PMC_TYPE_SYSTEM 2>, <&pmc PMC_TYPE_PERIPHERAL 13>;
                                clock-names = "ddrck", "mpddr";
                        };
 
                                reg = <0xf0010000 0x1000>;
                                interrupts = <6 IRQ_TYPE_LEVEL_HIGH 0>;
                                #dma-cells = <1>;
-                               clocks = <&dma0_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 6>;
                                clock-names = "dma_clk";
                        };
 
                                reg = <0xf0004000 0x1000>;
                                interrupts = <7 IRQ_TYPE_LEVEL_HIGH 0>;
                                #dma-cells = <1>;
-                               clocks = <&dma1_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 7>;
                                clock-names = "dma_clk";
                        };
 
                                compatible = "atmel,sama5d2-pmc", "syscon";
                                reg = <0xf0014000 0x160>;
                                interrupts = <74 IRQ_TYPE_LEVEL_HIGH 7>;
-                               interrupt-controller;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               #interrupt-cells = <1>;
-
-                               main_rc_osc: main_rc_osc {
-                                       compatible = "atmel,at91sam9x5-clk-main-rc-osc";
-                                       #clock-cells = <0>;
-                                       interrupt-parent = <&pmc>;
-                                       interrupts = <AT91_PMC_MOSCRCS>;
-                                       clock-frequency = <12000000>;
-                                       clock-accuracy = <100000000>;
-                               };
-
-                               main_osc: main_osc {
-                                       compatible = "atmel,at91rm9200-clk-main-osc";
-                                       #clock-cells = <0>;
-                                       interrupt-parent = <&pmc>;
-                                       interrupts = <AT91_PMC_MOSCS>;
-                                       clocks = <&main_xtal>;
-                               };
-
-                               main: mainck {
-                                       compatible = "atmel,at91sam9x5-clk-main";
-                                       #clock-cells = <0>;
-                                       interrupt-parent = <&pmc>;
-                                       interrupts = <AT91_PMC_MOSCSELS>;
-                                       clocks = <&main_rc_osc &main_osc>;
-                               };
-
-                               plla: pllack {
-                                       compatible = "atmel,sama5d3-clk-pll";
-                                       #clock-cells = <0>;
-                                       interrupt-parent = <&pmc>;
-                                       interrupts = <AT91_PMC_LOCKA>;
-                                       clocks = <&main>;
-                                       reg = <0>;
-                                       atmel,clk-input-range = <12000000 12000000>;
-                                       #atmel,pll-clk-output-range-cells = <4>;
-                                       atmel,pll-clk-output-ranges = <600000000 1200000000 0 0>;
-                               };
-
-                               plladiv: plladivck {
-                                       compatible = "atmel,at91sam9x5-clk-plldiv";
-                                       #clock-cells = <0>;
-                                       clocks = <&plla>;
-                               };
-
-                               audio_pll_frac: audiopll_fracck {
-                                       compatible = "atmel,sama5d2-clk-audio-pll-frac";
-                                       #clock-cells = <0>;
-                                       clocks = <&main>;
-                               };
-
-                               audio_pll_pad: audiopll_padck {
-                                       compatible = "atmel,sama5d2-clk-audio-pll-pad";
-                                       #clock-cells = <0>;
-                                       clocks = <&audio_pll_frac>;
-                               };
-
-                               audio_pll_pmc: audiopll_pmcck {
-                                       compatible = "atmel,sama5d2-clk-audio-pll-pmc";
-                                       #clock-cells = <0>;
-                                       clocks = <&audio_pll_frac>;
-                               };
-
-                               utmi: utmick {
-                                       compatible = "atmel,at91sam9x5-clk-utmi";
-                                       #clock-cells = <0>;
-                                       interrupt-parent = <&pmc>;
-                                       interrupts = <AT91_PMC_LOCKU>;
-                                       clocks = <&main>;
-                               };
-
-                               mck: masterck {
-                                       compatible = "atmel,at91sam9x5-clk-master";
-                                       #clock-cells = <0>;
-                                       interrupt-parent = <&pmc>;
-                                       interrupts = <AT91_PMC_MCKRDY>;
-                                       clocks = <&clk32k>, <&main>, <&plladiv>, <&utmi>;
-                                       atmel,clk-output-range = <124000000 166000000>;
-                                       atmel,clk-divisors = <1 2 4 3>;
-                               };
-
-                               h32ck: h32mxck {
-                                       #clock-cells = <0>;
-                                       compatible = "atmel,sama5d4-clk-h32mx";
-                                       clocks = <&mck>;
-                               };
-
-                               usb: usbck {
-                                       compatible = "atmel,at91sam9x5-clk-usb";
-                                       #clock-cells = <0>;
-                                       clocks = <&plladiv>, <&utmi>;
-                               };
-
-                               prog: progck {
-                                       compatible = "atmel,at91sam9x5-clk-programmable";
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       interrupt-parent = <&pmc>;
-                                       clocks = <&clk32k>, <&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)>;
-                                       };
-
-                                       prog2: prog2 {
-                                               #clock-cells = <0>;
-                                               reg = <2>;
-                                               interrupts = <AT91_PMC_PCKRDY(2)>;
-                                       };
-                               };
-
-                               systemck {
-                                       compatible = "atmel,at91rm9200-clk-system";
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-
-                                       ddrck: ddrck {
-                                               #clock-cells = <0>;
-                                               reg = <2>;
-                                               clocks = <&mck>;
-                                       };
-
-                                       lcdck: lcdck {
-                                               #clock-cells = <0>;
-                                               reg = <3>;
-                                               clocks = <&mck>;
-                                       };
-
-                                       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>;
-                                       };
-
-                                       iscck: iscck {
-                                               #clock-cells = <0>;
-                                               reg = <18>;
-                                               clocks = <&mck>;
-                                       };
-                               };
-
-                               periph32ck {
-                                       compatible = "atmel,at91sam9x5-clk-peripheral";
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       clocks = <&h32ck>;
-
-                                       macb0_clk: macb0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <5>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       tdes_clk: tdes_clk {
-                                               #clock-cells = <0>;
-                                               reg = <11>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       matrix1_clk: matrix1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <14>;
-                                       };
-
-                                       hsmc_clk: hsmc_clk {
-                                               #clock-cells = <0>;
-                                               reg = <17>;
-                                       };
-
-                                       pioA_clk: pioA_clk {
-                                               #clock-cells = <0>;
-                                               reg = <18>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       flx0_clk: flx0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <19>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       flx1_clk: flx1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <20>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       flx2_clk: flx2_clk {
-                                               #clock-cells = <0>;
-                                               reg = <21>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       flx3_clk: flx3_clk {
-                                               #clock-cells = <0>;
-                                               reg = <22>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       flx4_clk: flx4_clk {
-                                               #clock-cells = <0>;
-                                               reg = <23>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       uart0_clk: uart0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <24>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       uart1_clk: uart1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <25>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       uart2_clk: uart2_clk {
-                                               #clock-cells = <0>;
-                                               reg = <26>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       uart3_clk: uart3_clk {
-                                               #clock-cells = <0>;
-                                               reg = <27>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       uart4_clk: uart4_clk {
-                                               #clock-cells = <0>;
-                                               reg = <28>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       twi0_clk: twi0_clk {
-                                               reg = <29>;
-                                               #clock-cells = <0>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       twi1_clk: twi1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <30>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       spi0_clk: spi0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <33>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       spi1_clk: spi1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <34>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       tcb0_clk: tcb0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <35>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       tcb1_clk: tcb1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <36>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       pwm_clk: pwm_clk {
-                                               #clock-cells = <0>;
-                                               reg = <38>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       adc_clk: adc_clk {
-                                               #clock-cells = <0>;
-                                               reg = <40>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       uhphs_clk: uhphs_clk {
-                                               #clock-cells = <0>;
-                                               reg = <41>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       udphs_clk: udphs_clk {
-                                               #clock-cells = <0>;
-                                               reg = <42>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       ssc0_clk: ssc0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <43>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       ssc1_clk: ssc1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <44>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       trng_clk: trng_clk {
-                                               #clock-cells = <0>;
-                                               reg = <47>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       pdmic_clk: pdmic_clk {
-                                               #clock-cells = <0>;
-                                               reg = <48>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       securam_clk: securam_clk {
-                                               #clock-cells = <0>;
-                                               reg = <51>;
-                                       };
-
-                                       i2s0_clk: i2s0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <54>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       i2s1_clk: i2s1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <55>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       can0_clk: can0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <56>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       can1_clk: can1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <57>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       classd_clk: classd_clk {
-                                               #clock-cells = <0>;
-                                               reg = <59>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-                               };
-
-                               periph64ck {
-                                       compatible = "atmel,at91sam9x5-clk-peripheral";
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       clocks = <&mck>;
-
-                                       dma0_clk: dma0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <6>;
-                                       };
-
-                                       dma1_clk: dma1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <7>;
-                                       };
-
-                                       aes_clk: aes_clk {
-                                               #clock-cells = <0>;
-                                               reg = <9>;
-                                       };
-
-                                       aesb_clk: aesb_clk {
-                                               #clock-cells = <0>;
-                                               reg = <10>;
-                                       };
-
-                                       sha_clk: sha_clk {
-                                               #clock-cells = <0>;
-                                               reg = <12>;
-                                       };
-
-                                       mpddr_clk: mpddr_clk {
-                                               #clock-cells = <0>;
-                                               reg = <13>;
-                                       };
-
-                                       matrix0_clk: matrix0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <15>;
-                                       };
-
-                                       sdmmc0_hclk: sdmmc0_hclk {
-                                               #clock-cells = <0>;
-                                               reg = <31>;
-                                       };
-
-                                       sdmmc1_hclk: sdmmc1_hclk {
-                                               #clock-cells = <0>;
-                                               reg = <32>;
-                                       };
-
-                                       lcdc_clk: lcdc_clk {
-                                               #clock-cells = <0>;
-                                               reg = <45>;
-                                       };
-
-                                       isc_clk: isc_clk {
-                                               #clock-cells = <0>;
-                                               reg = <46>;
-                                       };
-
-                                       qspi0_clk: qspi0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <52>;
-                                       };
-
-                                       qspi1_clk: qspi1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <53>;
-                                       };
-                               };
-
-                               gck {
-                                       compatible = "atmel,sama5d2-clk-generated";
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       interrupt-parent = <&pmc>;
-                                       clocks = <&clk32k>, <&main>, <&plladiv>, <&utmi>, <&mck>, <&audio_pll_pmc>;
-
-                                       sdmmc0_gclk: sdmmc0_gclk {
-                                               #clock-cells = <0>;
-                                               reg = <31>;
-                                       };
-
-                                       sdmmc1_gclk: sdmmc1_gclk {
-                                               #clock-cells = <0>;
-                                               reg = <32>;
-                                       };
-
-                                       tcb0_gclk: tcb0_gclk {
-                                               #clock-cells = <0>;
-                                               reg = <35>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       tcb1_gclk: tcb1_gclk {
-                                               #clock-cells = <0>;
-                                               reg = <36>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       pwm_gclk: pwm_gclk {
-                                               #clock-cells = <0>;
-                                               reg = <38>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       isc_gclk: isc_gclk {
-                                               #clock-cells = <0>;
-                                               reg = <46>;
-                                       };
-
-                                       pdmic_gclk: pdmic_gclk {
-                                               #clock-cells = <0>;
-                                               reg = <48>;
-                                       };
-
-                                       i2s0_gclk: i2s0_gclk {
-                                               #clock-cells = <0>;
-                                               reg = <54>;
-                                       };
-
-                                       i2s1_gclk: i2s1_gclk {
-                                               #clock-cells = <0>;
-                                               reg = <55>;
-                                       };
-
-                                       can0_gclk: can0_gclk {
-                                               #clock-cells = <0>;
-                                               reg = <56>;
-                                               atmel,clk-output-range = <0 80000000>;
-                                       };
-
-                                       can1_gclk: can1_gclk {
-                                               #clock-cells = <0>;
-                                               reg = <57>;
-                                               atmel,clk-output-range = <0 80000000>;
-                                       };
-
-                                       classd_gclk: classd_gclk {
-                                               #clock-cells = <0>;
-                                               reg = <59>;
-                                               atmel,clk-output-range = <0 100000000>;
-                                       };
-                               };
-
-                               i2s_clkmux {
-                                       compatible = "atmel,sama5d2-clk-i2s-mux";
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-
-                                       i2s0muxck: i2s0_muxclk {
-                                               clocks = <&i2s0_clk>, <&i2s0_gclk>;
-                                               #clock-cells = <0>;
-                                               reg = <0>;
-                                       };
-
-                                       i2s1muxck: i2s1_muxclk {
-                                               clocks = <&i2s1_clk>, <&i2s1_gclk>;
-                                               #clock-cells = <0>;
-                                               reg = <1>;
-                                       };
-                               };
+                               #clock-cells = <2>;
+                               clocks = <&clk32k>, <&main_xtal>;
+                               clock-names = "slow_clk", "main_xtal";
                        };
 
                        qspi0: spi@f0020000 {
                                reg = <0xf0020000 0x100>, <0xd0000000 0x08000000>;
                                reg-names = "qspi_base", "qspi_mmap";
                                interrupts = <52 IRQ_TYPE_LEVEL_HIGH 7>;
-                               clocks = <&qspi0_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 52>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                status = "disabled";
                                reg = <0xf0024000 0x100>, <0xd8000000 0x08000000>;
                                reg-names = "qspi_base", "qspi_mmap";
                                interrupts = <53 IRQ_TYPE_LEVEL_HIGH 7>;
-                               clocks = <&qspi1_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 53>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                status = "disabled";
                                        (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
                                         AT91_XDMAC_DT_PERID(30))>;
                                dma-names = "tx";
-                               clocks = <&sha_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 12>;
                                clock-names = "sha_clk";
                                status = "okay";
                        };
                                        (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
                                         AT91_XDMAC_DT_PERID(27))>;
                                dma-names = "tx", "rx";
-                               clocks = <&aes_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 9>;
                                clock-names = "aes_clk";
                                status = "okay";
                        };
                                        (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
                                         AT91_XDMAC_DT_PERID(7))>;
                                dma-names = "tx", "rx";
-                               clocks = <&spi0_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 33>;
                                clock-names = "spi_clk";
                                atmel,fifo-size = <16>;
                                #address-cells = <1>;
                                        (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
                                        AT91_XDMAC_DT_PERID(22))>;
                                dma-names = "tx", "rx";
-                               clocks = <&ssc0_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 43>;
                                clock-names = "pclk";
                                status = "disabled";
                        };
                                              67 IRQ_TYPE_LEVEL_HIGH 3>;        /* Queue 2 */
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               clocks = <&macb0_clk>, <&macb0_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 5>, <&pmc PMC_TYPE_PERIPHERAL 5>;
                                clock-names = "hclk", "pclk";
                                status = "disabled";
                        };
                                #size-cells = <0>;
                                reg = <0xf800c000 0x100>;
                                interrupts = <35 IRQ_TYPE_LEVEL_HIGH 0>;
-                               clocks = <&tcb0_clk>, <&clk32k>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 35>, <&clk32k>;
                                clock-names = "t0_clk", "slow_clk";
                        };
 
                                #size-cells = <0>;
                                reg = <0xf8010000 0x100>;
                                interrupts = <36 IRQ_TYPE_LEVEL_HIGH 0>;
-                               clocks = <&tcb1_clk>, <&clk32k>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 36>, <&clk32k>;
                                clock-names = "t0_clk", "slow_clk";
                        };
 
                                compatible = "atmel,sama5d2-smc", "syscon", "simple-mfd";
                                reg = <0xf8014000 0x1000>;
                                interrupts = <17 IRQ_TYPE_LEVEL_HIGH 6>;
-                               clocks = <&hsmc_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 17>;
                                #address-cells = <1>;
                                #size-cells = <1>;
                                ranges;
                                        (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
                                        | AT91_XDMAC_DT_PERID(50))>;
                                dma-names = "rx";
-                               clocks = <&pdmic_clk>, <&pdmic_gclk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 48>, <&pmc PMC_TYPE_GCK 48>;
                                clock-names = "pclk", "gclk";
                                status = "disabled";
                        };
                                        (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
                                         AT91_XDMAC_DT_PERID(36))>;
                                dma-names = "tx", "rx";
-                               clocks = <&uart0_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 24>;
                                clock-names = "usart";
                                status = "disabled";
                        };
                                        (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
                                         AT91_XDMAC_DT_PERID(38))>;
                                dma-names = "tx", "rx";
-                               clocks = <&uart1_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 25>;
                                clock-names = "usart";
                                status = "disabled";
                        };
                                        (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
                                         AT91_XDMAC_DT_PERID(40))>;
                                dma-names = "tx", "rx";
-                               clocks = <&uart2_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 26>;
                                clock-names = "usart";
                                status = "disabled";
                        };
                                dma-names = "tx", "rx";
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               clocks = <&twi0_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 29>;
                                atmel,fifo-size = <16>;
                                status = "disabled";
                        };
                                reg = <0xf802c000 0x4000>;
                                interrupts = <38 IRQ_TYPE_LEVEL_HIGH 7>;
                                #pwm-cells = <3>;
-                               clocks = <&pwm_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 38>;
                        };
 
                        sfr: sfr@f8030000 {
                        flx0: flexcom@f8034000 {
                                compatible = "atmel,sama5d2-flexcom";
                                reg = <0xf8034000 0x200>;
-                               clocks = <&flx0_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;
                                #address-cells = <1>;
                                #size-cells = <1>;
                                ranges = <0x0 0xf8034000 0x800>;
                        flx1: flexcom@f8038000 {
                                compatible = "atmel,sama5d2-flexcom";
                                reg = <0xf8038000 0x200>;
-                               clocks = <&flx1_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 20>;
                                #address-cells = <1>;
                                #size-cells = <1>;
                                ranges = <0x0 0xf8038000 0x800>;
                        securam: sram@f8044000 {
                                compatible = "atmel,sama5d2-securam", "mmio-sram";
                                reg = <0xf8044000 0x1420>;
-                               clocks = <&securam_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 51>;
                                #address-cells = <1>;
                                #size-cells = <1>;
                                ranges = <0 0xf8044000 0x1420>;
                                compatible = "atmel,at91sam9260-pit";
                                reg = <0xf8048030 0x10>;
                                interrupts = <3 IRQ_TYPE_LEVEL_HIGH 5>;
-                               clocks = <&h32ck>;
+                               clocks = <&pmc PMC_TYPE_CORE PMC_MCK2>;
                        };
 
                        watchdog@f8048040 {
                                        (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
                                         AT91_XDMAC_DT_PERID(32))>;
                                dma-names = "tx", "rx";
-                               clocks = <&i2s0_clk>, <&i2s0_gclk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 54>, <&pmc PMC_TYPE_GCK 54>;
                                clock-names = "pclk", "gclk";
-                               assigned-clocks = <&i2s0muxck>;
-                               assigned-clock-parents = <&i2s0_gclk>;
+                               assigned-clocks = <&pmc PMC_TYPE_CORE PMC_I2S0_MUX>;
+                               assigned-clock-parents = <&pmc PMC_TYPE_GCK 54>;
                                status = "disabled";
                        };
 
                                interrupts = <56 IRQ_TYPE_LEVEL_HIGH 7>,
                                             <64 IRQ_TYPE_LEVEL_HIGH 7>;
                                interrupt-names = "int0", "int1";
-                               clocks = <&can0_clk>, <&can0_gclk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 56>, <&pmc PMC_TYPE_GCK 56>;
                                clock-names = "hclk", "cclk";
-                               assigned-clocks = <&can0_gclk>;
-                               assigned-clock-parents = <&utmi>;
+                               assigned-clocks = <&pmc PMC_TYPE_GCK 56>;
+                               assigned-clock-parents = <&pmc PMC_TYPE_CORE PMC_UTMI>;
                                assigned-clock-rates = <40000000>;
                                bosch,mram-cfg = <0x0 0 0 64 0 0 32 32>;
                                status = "disabled";
                                        (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
                                         AT91_XDMAC_DT_PERID(9))>;
                                dma-names = "tx", "rx";
-                               clocks = <&spi1_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 34>;
                                clock-names = "spi_clk";
                                atmel,fifo-size = <16>;
                                #address-cells = <1>;
                                        (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
                                         AT91_XDMAC_DT_PERID(42))>;
                                dma-names = "tx", "rx";
-                               clocks = <&uart3_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 27>;
                                clock-names = "usart";
                                status = "disabled";
                        };
                                         AT91_XDMAC_DT_PERID(44))>;
                                dma-names = "tx", "rx";
                                interrupts = <28 IRQ_TYPE_LEVEL_HIGH 7>;
-                               clocks = <&uart4_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 28>;
                                clock-names = "usart";
                                status = "disabled";
                        };
                        flx2: flexcom@fc010000 {
                                compatible = "atmel,sama5d2-flexcom";
                                reg = <0xfc010000 0x200>;
-                               clocks = <&flx2_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 21>;
                                #address-cells = <1>;
                                #size-cells = <1>;
                                ranges = <0x0 0xfc010000 0x800>;
                        flx3: flexcom@fc014000 {
                                compatible = "atmel,sama5d2-flexcom";
                                reg = <0xfc014000 0x200>;
-                               clocks = <&flx3_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 22>;
                                #address-cells = <1>;
                                #size-cells = <1>;
                                ranges = <0x0 0xfc014000 0x800>;
                        flx4: flexcom@fc018000 {
                                compatible = "atmel,sama5d2-flexcom";
                                reg = <0xfc018000 0x200>;
-                               clocks = <&flx4_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;
                                #address-cells = <1>;
                                #size-cells = <1>;
                                ranges = <0x0 0xfc018000 0x800>;
                                compatible = "atmel,at91sam9g45-trng";
                                reg = <0xfc01c000 0x100>;
                                interrupts = <47 IRQ_TYPE_LEVEL_HIGH 0>;
-                               clocks = <&trng_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 47>;
                        };
 
                        aic: interrupt-controller@fc020000 {
                                dma-names = "tx", "rx";
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               clocks = <&twi1_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 30>;
                                atmel,fifo-size = <16>;
                                status = "disabled";
                        };
                                compatible = "atmel,sama5d2-adc";
                                reg = <0xfc030000 0x100>;
                                interrupts = <40 IRQ_TYPE_LEVEL_HIGH 7>;
-                               clocks = <&adc_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 40>;
                                clock-names = "adc_clk";
                                dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) | AT91_XDMAC_DT_PERID(25))>;
                                dma-names = "rx";
                                #interrupt-cells = <2>;
                                gpio-controller;
                                #gpio-cells = <2>;
-                               clocks = <&pioA_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 18>;
                        };
 
                        secumod@fc040000 {
                                        (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
                                         AT91_XDMAC_DT_PERID(29))>;
                                dma-names = "tx", "rx";
-                               clocks = <&tdes_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 11>;
                                clock-names = "tdes_clk";
                                status = "okay";
                        };
                                        (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
                                         AT91_XDMAC_DT_PERID(47))>;
                                dma-names = "tx";
-                               clocks = <&classd_clk>, <&classd_gclk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 59>, <&pmc PMC_TYPE_GCK 59>;
                                clock-names = "pclk", "gclk";
                                status = "disabled";
                        };
                                        (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
                                         AT91_XDMAC_DT_PERID(34))>;
                                dma-names = "tx", "rx";
-                               clocks = <&i2s1_clk>, <&i2s1_gclk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 55>, <&pmc PMC_TYPE_GCK 55>;
                                clock-names = "pclk", "gclk";
-                               assigned-clocks = <&i2s1muxck>;
-                               assigned-parrents = <&i2s1_gclk>;
+                               assigned-clocks = <&pmc PMC_TYPE_CORE PMC_I2S1_MUX>;
+                               assigned-parrents = <&pmc PMC_TYPE_GCK 55>;
                                status = "disabled";
                        };
 
                                interrupts = <57 IRQ_TYPE_LEVEL_HIGH 7>,
                                             <65 IRQ_TYPE_LEVEL_HIGH 7>;
                                interrupt-names = "int0", "int1";
-                               clocks = <&can1_clk>, <&can1_gclk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 57>, <&pmc PMC_TYPE_GCK 57>;
                                clock-names = "hclk", "cclk";
-                               assigned-clocks = <&can1_gclk>;
-                               assigned-clock-parents = <&utmi>;
+                               assigned-clocks = <&pmc PMC_TYPE_GCK 57>;
+                               assigned-clock-parents = <&pmc PMC_TYPE_CORE PMC_UTMI>;
                                assigned-clock-rates = <40000000>;
                                bosch,mram-cfg = <0x1100 0 0 64 0 0 32 32>;
                                status = "disabled";