Merge tag 'usb-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
[platform/kernel/linux-rpi.git] / arch / arm / boot / dts / sama5d3.dtsi
index 10e4492..0bb5b6f 100644 (file)
                                status = "disabled";
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               clocks = <&mci0_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 21>;
                                clock-names = "mci_clk";
                        };
 
                                dma-names = "tx", "rx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi0>;
-                               clocks = <&spi0_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 24>;
                                clock-names = "spi_clk";
                                status = "disabled";
                        };
                                dma-names = "tx", "rx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
-                               clocks = <&ssc0_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 38>;
                                clock-names = "pclk";
                                status = "disabled";
                        };
                                #size-cells = <0>;
                                reg = <0xf0010000 0x100>;
                                interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>;
-                               clocks = <&tcb0_clk>, <&clk32k>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 26>, <&clk32k>;
                                clock-names = "t0_clk", "slow_clk";
                        };
 
                                pinctrl-0 = <&pinctrl_i2c0>;
                                pinctrl-1 = <&pinctrl_i2c0_gpio>;
                                sda-gpios = <&pioA 30 GPIO_ACTIVE_HIGH>;
-                               scl-gpios = <&pioA 31 GPIO_ACTIVE_HIGH>;
+                               scl-gpios = <&pioA 31 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               clocks = <&twi0_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 18>;
                                status = "disabled";
                        };
 
                                pinctrl-0 = <&pinctrl_i2c1>;
                                pinctrl-1 = <&pinctrl_i2c1_gpio>;
                                sda-gpios = <&pioC 26 GPIO_ACTIVE_HIGH>;
-                               scl-gpios = <&pioC 27 GPIO_ACTIVE_HIGH>;
+                               scl-gpios = <&pioC 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               clocks = <&twi1_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;
                                status = "disabled";
                        };
 
                                dma-names = "tx", "rx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart0>;
-                               clocks = <&usart0_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 12>;
                                clock-names = "usart";
                                status = "disabled";
                        };
                                dma-names = "tx", "rx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart1>;
-                               clocks = <&usart1_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 13>;
                                clock-names = "usart";
                                status = "disabled";
                        };
                                interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_uart0>;
-                               clocks = <&uart0_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 16>;
                                clock-names = "usart";
                                status = "disabled";
                        };
                                reg = <0xf002c000 0x300>;
                                interrupts = <28 IRQ_TYPE_LEVEL_HIGH 4>;
                                #pwm-cells = <3>;
-                               clocks = <&pwm_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 28>;
                                status = "disabled";
                        };
 
                                interrupts = <37 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_isi_data_0_7>;
-                               clocks = <&isi_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 37>;
                                clock-names = "isi_clk";
                                status = "disabled";
                                port {
                                status = "disabled";
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               clocks = <&mci1_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 22>;
                                clock-names = "mci_clk";
                        };
 
                                dma-names = "tx", "rx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi1>;
-                               clocks = <&spi1_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 25>;
                                clock-names = "spi_clk";
                                status = "disabled";
                        };
                                dma-names = "tx", "rx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
-                               clocks = <&ssc1_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 39>;
                                clock-names = "pclk";
                                status = "disabled";
                        };
                                        &pinctrl_adc0_ad10
                                        &pinctrl_adc0_ad11
                                        >;
-                               clocks = <&adc_clk>,
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 29>,
                                         <&adc_op_clk>;
                                clock-names = "adc_clk", "adc_op_clk";
                                atmel,adc-channels-used = <0xfff>;
                                pinctrl-0 = <&pinctrl_i2c2>;
                                pinctrl-1 = <&pinctrl_i2c2_gpio>;
                                sda-gpios = <&pioA 18 GPIO_ACTIVE_HIGH>;
-                               scl-gpios = <&pioA 19 GPIO_ACTIVE_HIGH>;
+                               scl-gpios = <&pioA 19 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               clocks = <&twi2_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 20>;
                                status = "disabled";
                        };
 
                                dma-names = "tx", "rx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart2>;
-                               clocks = <&usart2_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 14>;
                                clock-names = "usart";
                                status = "disabled";
                        };
                                dma-names = "tx", "rx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart3>;
-                               clocks = <&usart3_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 15>;
                                clock-names = "usart";
                                status = "disabled";
                        };
                                interrupts = <42 IRQ_TYPE_LEVEL_HIGH 0>;
                                dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(17)>;
                                dma-names = "tx";
-                               clocks = <&sha_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 42>;
                                clock-names = "sha_clk";
                        };
 
                                dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(18)>,
                                       <&dma1 2 AT91_DMA_CFG_PER_ID(19)>;
                                dma-names = "tx", "rx";
-                               clocks = <&aes_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 43>;
                                clock-names = "aes_clk";
                        };
 
                                dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(20)>,
                                       <&dma1 2 AT91_DMA_CFG_PER_ID(21)>;
                                dma-names = "tx", "rx";
-                               clocks = <&tdes_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 44>;
                                clock-names = "tdes_clk";
                        };
 
                                compatible = "atmel,at91sam9g45-trng";
                                reg = <0xf8040000 0x100>;
                                interrupts = <45 IRQ_TYPE_LEVEL_HIGH 0>;
-                               clocks = <&trng_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 45>;
                        };
 
                        hsmc: hsmc@ffffc000 {
                                compatible = "atmel,sama5d3-smc", "syscon", "simple-mfd";
                                reg = <0xffffc000 0x1000>;
                                interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>;
-                               clocks = <&hsmc_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
                                #address-cells = <1>;
                                #size-cells = <1>;
                                ranges;
                                reg = <0xffffe600 0x200>;
                                interrupts = <30 IRQ_TYPE_LEVEL_HIGH 0>;
                                #dma-cells = <2>;
-                               clocks = <&dma0_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 30>;
                                clock-names = "dma_clk";
                        };
 
                                reg = <0xffffe800 0x200>;
                                interrupts = <31 IRQ_TYPE_LEVEL_HIGH 0>;
                                #dma-cells = <2>;
-                               clocks = <&dma1_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 31>;
                                clock-names = "dma_clk";
                        };
 
                        ramc0: ramc@ffffea00 {
                                compatible = "atmel,sama5d3-ddramc";
                                reg = <0xffffea00 0x200>;
-                               clocks = <&ddrck>, <&mpddr_clk>;
+                               clocks = <&pmc PMC_TYPE_SYSTEM 2>, <&pmc PMC_TYPE_PERIPHERAL 49>;
                                clock-names = "ddrck", "mpddr";
                        };
 
                                dma-names = "tx", "rx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_dbgu>;
-                               clocks = <&dbgu_clk>;
+                               clocks = <&pmc PMC_TYPE_PERIPHERAL 2>;
                                clock-names = "usart";
                                status = "disabled";
                        };
                                        gpio-controller;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
-                                       clocks = <&pioA_clk>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 6>;
                                };
 
                                pioB: gpio@fffff400 {
                                        gpio-controller;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
-                                       clocks = <&pioB_clk>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 7>;
                                };
 
                                pioC: gpio@fffff600 {
                                        gpio-controller;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
-                                       clocks = <&pioC_clk>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 8>;
                                };
 
                                pioD: gpio@fffff800 {
                                        gpio-controller;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
-                                       clocks = <&pioD_clk>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 9>;
                                };
 
                                pioE: gpio@fffffa00 {
                                        gpio-controller;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
-                                       clocks = <&pioE_clk>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 10>;
                                };
                        };
 
                                compatible = "atmel,sama5d3-pmc", "syscon";
                                reg = <0xfffffc00 0x120>;
                                interrupts = <1 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 = <50000000>;
-                               };
-
-                               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 = <8000000 50000000>;
-                                       #atmel,pll-clk-output-range-cells = <4>;
-                                       atmel,pll-clk-output-ranges = <400000000 1000000000 0 0>;
-                               };
-
-                               plladiv: plladivck {
-                                       compatible = "atmel,at91sam9x5-clk-plldiv";
-                                       #clock-cells = <0>;
-                                       clocks = <&plla>;
-                               };
-
-                               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 = <0 166000000>;
-                                       atmel,clk-divisors = <1 2 4 3>;
-                               };
-
-                               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)>;
-                                       };
-                               };
-
-                               smd: smdclk {
-                                       compatible = "atmel,at91sam9x5-clk-smd";
-                                       #clock-cells = <0>;
-                                       clocks = <&plladiv>, <&utmi>;
-                               };
-
-                               systemck {
-                                       compatible = "atmel,at91rm9200-clk-system";
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-
-                                       ddrck: ddrck {
-                                               #clock-cells = <0>;
-                                               reg = <2>;
-                                               clocks = <&mck>;
-                                       };
-
-                                       smdck: smdck {
-                                               #clock-cells = <0>;
-                                               reg = <4>;
-                                               clocks = <&smd>;
-                                       };
-
-                                       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>;
-                                       };
-                               };
-
-                               periphck {
-                                       compatible = "atmel,at91sam9x5-clk-peripheral";
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       clocks = <&mck>;
-
-                                       dbgu_clk: dbgu_clk {
-                                               #clock-cells = <0>;
-                                               reg = <2>;
-                                       };
-
-                                       hsmc_clk: hsmc_clk {
-                                               #clock-cells = <0>;
-                                               reg = <5>;
-                                       };
-
-                                       pioA_clk: pioA_clk {
-                                               #clock-cells = <0>;
-                                               reg = <6>;
-                                       };
-
-                                       pioB_clk: pioB_clk {
-                                               #clock-cells = <0>;
-                                               reg = <7>;
-                                       };
-
-                                       pioC_clk: pioC_clk {
-                                               #clock-cells = <0>;
-                                               reg = <8>;
-                                       };
-
-                                       pioD_clk: pioD_clk {
-                                               #clock-cells = <0>;
-                                               reg = <9>;
-                                       };
-
-                                       pioE_clk: pioE_clk {
-                                               #clock-cells = <0>;
-                                               reg = <10>;
-                                       };
-
-                                       usart0_clk: usart0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <12>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       usart1_clk: usart1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <13>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       usart2_clk: usart2_clk {
-                                               #clock-cells = <0>;
-                                               reg = <14>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       usart3_clk: usart3_clk {
-                                               #clock-cells = <0>;
-                                               reg = <15>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       uart0_clk: uart0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <16>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       twi0_clk: twi0_clk {
-                                               reg = <18>;
-                                               #clock-cells = <0>;
-                                               atmel,clk-output-range = <0 41500000>;
-                                       };
-
-                                       twi1_clk: twi1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <19>;
-                                               atmel,clk-output-range = <0 41500000>;
-                                       };
-
-                                       twi2_clk: twi2_clk {
-                                               #clock-cells = <0>;
-                                               reg = <20>;
-                                               atmel,clk-output-range = <0 41500000>;
-                                       };
-
-                                       mci0_clk: mci0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <21>;
-                                       };
-
-                                       mci1_clk: mci1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <22>;
-                                       };
-
-                                       spi0_clk: spi0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <24>;
-                                               atmel,clk-output-range = <0 166000000>;
-                                       };
-
-                                       spi1_clk: spi1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <25>;
-                                               atmel,clk-output-range = <0 166000000>;
-                                       };
-
-                                       tcb0_clk: tcb0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <26>;
-                                               atmel,clk-output-range = <0 166000000>;
-                                       };
-
-                                       pwm_clk: pwm_clk {
-                                               #clock-cells = <0>;
-                                               reg = <28>;
-                                       };
-
-                                       adc_clk: adc_clk {
-                                               #clock-cells = <0>;
-                                               reg = <29>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       dma0_clk: dma0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <30>;
-                                       };
-
-                                       dma1_clk: dma1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <31>;
-                                       };
-
-                                       uhphs_clk: uhphs_clk {
-                                               #clock-cells = <0>;
-                                               reg = <32>;
-                                       };
-
-                                       udphs_clk: udphs_clk {
-                                               #clock-cells = <0>;
-                                               reg = <33>;
-                                       };
-
-                                       isi_clk: isi_clk {
-                                               #clock-cells = <0>;
-                                               reg = <37>;
-                                       };
-
-                                       ssc0_clk: ssc0_clk {
-                                               #clock-cells = <0>;
-                                               reg = <38>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       ssc1_clk: ssc1_clk {
-                                               #clock-cells = <0>;
-                                               reg = <39>;
-                                               atmel,clk-output-range = <0 83000000>;
-                                       };
-
-                                       sha_clk: sha_clk {
-                                               #clock-cells = <0>;
-                                               reg = <42>;
-                                       };
-
-                                       aes_clk: aes_clk {
-                                               #clock-cells = <0>;
-                                               reg = <43>;
-                                       };
-
-                                       tdes_clk: tdes_clk {
-                                               #clock-cells = <0>;
-                                               reg = <44>;
-                                       };
-
-                                       trng_clk: trng_clk {
-                                               #clock-cells = <0>;
-                                               reg = <45>;
-                                       };
-
-                                       fuse_clk: fuse_clk {
-                                               #clock-cells = <0>;
-                                               reg = <48>;
-                                       };
-
-                                       mpddr_clk: mpddr_clk {
-                                               #clock-cells = <0>;
-                                               reg = <49>;
-                                       };
-                               };
+                               #clock-cells = <2>;
+                               clocks = <&clk32k>, <&main_xtal>;
+                               clock-names = "slow_clk", "main_xtal";
                        };
 
                        reset_controller: rstc@fffffe00 {
                                compatible = "atmel,at91sam9260-pit";
                                reg = <0xfffffe30 0xf>;
                                interrupts = <3 IRQ_TYPE_LEVEL_HIGH 5>;
-                               clocks = <&mck>;
+                               clocks = <&pmc PMC_TYPE_CORE PMC_MCK>;
                        };
 
                        watchdog: watchdog@fffffe40 {
                        reg = <0x00500000 0x100000
                               0xf8030000 0x4000>;
                        interrupts = <33 IRQ_TYPE_LEVEL_HIGH 2>;
-                       clocks = <&udphs_clk>, <&utmi>;
+                       clocks = <&pmc PMC_TYPE_PERIPHERAL 33>, <&pmc PMC_TYPE_CORE PMC_UTMI>;
                        clock-names = "pclk", "hclk";
                        status = "disabled";
                };
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00600000 0x100000>;
                        interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;
-                       clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
+                       clocks = <&pmc PMC_TYPE_PERIPHERAL 32>, <&pmc PMC_TYPE_PERIPHERAL 32>, <&pmc PMC_TYPE_SYSTEM 6>;
                        clock-names = "ohci_clk", "hclk", "uhpck";
                        status = "disabled";
                };
                        compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
                        reg = <0x00700000 0x100000>;
                        interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;
-                       clocks = <&utmi>, <&uhphs_clk>;
+                       clocks = <&pmc PMC_TYPE_CORE PMC_UTMI>, <&pmc PMC_TYPE_PERIPHERAL 32>;
                        clock-names = "usb_clk", "ehci_clk";
                        status = "disabled";
                };
                                  0x1 0x0 0x40000000 0x10000000
                                  0x2 0x0 0x50000000 0x10000000
                                  0x3 0x0 0x60000000 0x10000000>;
-                       clocks = <&mck>;
+                       clocks = <&pmc PMC_TYPE_CORE PMC_MCK>;
                        status = "disabled";
 
                        nand_controller: nand-controller {