Merge https://gitlab.denx.de/u-boot/custodians/u-boot-clk
[oweals/u-boot.git] / arch / arm / dts / at91sam9g45.dtsi
index af8b708ac312ad4dfd4b0f1a1f633d053721a9da..c9b2e4698bb5b5c431755ef2819cf13c9ad65c00 100644 (file)
@@ -41,9 +41,6 @@
                pwm0 = &pwm0;
        };
        cpus {
-               #address-cells = <0>;
-               #size-cells = <0>;
-
                cpu {
                        compatible = "arm,arm926ej-s";
                        device_type = "cpu";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges;
+               u-boot,dm-pre-reloc;
 
                apb {
                        compatible = "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges;
+                       u-boot,dm-pre-reloc;
 
                        aic: interrupt-controller@fffff000 {
                                #interrupt-cells = <3>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                #interrupt-cells = <1>;
+                               u-boot,dm-pre-reloc;
 
                                main_osc: main_osc {
                                        compatible = "atmel,at91rm9200-clk-main-osc";
                                        clocks = <&main_osc>;
                                };
 
-                               plla: pllack {
+                               plla: pllack@0 {
                                        compatible = "atmel,at91rm9200-clk-pll";
                                        #clock-cells = <0>;
                                        interrupts-extended = <&pmc AT91_PMC_LOCKA>;
                                        clocks = <&clk32k>, <&main>, <&plladiv>, <&utmi>;
                                        atmel,clk-output-range = <0 133333333>;
                                        atmel,clk-divisors = <1 2 4 3>;
+                                       u-boot,dm-pre-reloc;
                                };
 
                                usb: usbck {
                                        interrupt-parent = <&pmc>;
                                        clocks = <&clk32k>, <&main>, <&plladiv>, <&utmi>, <&mck>;
 
-                                       prog0: prog0 {
+                                       prog0: prog@0 {
                                                #clock-cells = <0>;
                                                reg = <0>;
                                                interrupts = <AT91_PMC_PCKRDY(0)>;
                                        };
 
-                                       prog1: prog1 {
+                                       prog1: prog@1 {
                                                #clock-cells = <0>;
                                                reg = <1>;
                                                interrupts = <AT91_PMC_PCKRDY(1)>;
                                        #address-cells = <1>;
                                        #size-cells = <0>;
 
-                                       ddrck: ddrck {
+                                       ddrck: ddrck@2 {
                                                #clock-cells = <0>;
                                                reg = <2>;
                                                clocks = <&mck>;
                                        };
 
-                                       uhpck: uhpck {
+                                       uhpck: uhpck@6 {
                                                #clock-cells = <0>;
                                                reg = <6>;
                                                clocks = <&usb>;
                                        };
 
-                                       pck0: pck0 {
+                                       pck0: pck0@8 {
                                                #clock-cells = <0>;
                                                reg = <8>;
                                                clocks = <&prog0>;
                                        };
 
-                                       pck1: pck1 {
+                                       pck1: pck1@9 {
                                                #clock-cells = <0>;
                                                reg = <9>;
                                                clocks = <&prog1>;
                                        #size-cells = <0>;
                                        clocks = <&mck>;
 
-                                       pioA_clk: pioA_clk {
+                                       pioA_clk: pioA_clk@2 {
                                                #clock-cells = <0>;
                                                reg = <2>;
                                        };
 
-                                       pioB_clk: pioB_clk {
+                                       pioB_clk: pioB_clk@3 {
                                                #clock-cells = <0>;
                                                reg = <3>;
                                        };
 
-                                       pioC_clk: pioC_clk {
+                                       pioC_clk: pioC_clk@4 {
                                                #clock-cells = <0>;
                                                reg = <4>;
                                        };
 
-                                       pioDE_clk: pioDE_clk {
+                                       pioDE_clk: pioDE_clk@5 {
                                                #clock-cells = <0>;
                                                reg = <5>;
                                        };
 
-                                       trng_clk: trng_clk {
+                                       trng_clk: trng_clk@6 {
                                                #clock-cells = <0>;
                                                reg = <6>;
                                        };
 
-                                       usart0_clk: usart0_clk {
+                                       usart0_clk: usart0_clk@7 {
                                                #clock-cells = <0>;
                                                reg = <7>;
                                        };
 
-                                       usart1_clk: usart1_clk {
+                                       usart1_clk: usart1_clk@8 {
                                                #clock-cells = <0>;
                                                reg = <8>;
                                        };
 
-                                       usart2_clk: usart2_clk {
+                                       usart2_clk: usart2_clk@9 {
                                                #clock-cells = <0>;
                                                reg = <9>;
                                        };
 
-                                       usart3_clk: usart3_clk {
+                                       usart3_clk: usart3_clk@10 {
                                                #clock-cells = <0>;
                                                reg = <10>;
                                        };
 
-                                       mci0_clk: mci0_clk {
+                                       mci0_clk: mci0_clk@11 {
                                                #clock-cells = <0>;
                                                reg = <11>;
                                        };
 
-                                       twi0_clk: twi0_clk {
+                                       twi0_clk: twi0_clk@12 {
                                                #clock-cells = <0>;
                                                reg = <12>;
                                        };
 
-                                       twi1_clk: twi1_clk {
+                                       twi1_clk: twi1_clk@13 {
                                                #clock-cells = <0>;
                                                reg = <13>;
                                        };
 
-                                       spi0_clk: spi0_clk {
+                                       spi0_clk: spi0_clk@14 {
                                                #clock-cells = <0>;
                                                reg = <14>;
                                        };
 
-                                       spi1_clk: spi1_clk {
+                                       spi1_clk: spi1_clk@15 {
                                                #clock-cells = <0>;
                                                reg = <15>;
                                        };
 
-                                       ssc0_clk: ssc0_clk {
+                                       ssc0_clk: ssc0_clk@16 {
                                                #clock-cells = <0>;
                                                reg = <16>;
                                        };
 
-                                       ssc1_clk: ssc1_clk {
+                                       ssc1_clk: ssc1_clk@17 {
                                                #clock-cells = <0>;
                                                reg = <17>;
                                        };
 
-                                       tcb0_clk: tcb0_clk {
+                                       tcb0_clk: tcb0_clk@18 {
                                                #clock-cells = <0>;
                                                reg = <18>;
                                        };
 
-                                       pwm_clk: pwm_clk {
+                                       pwm_clk: pwm_clk@19 {
                                                #clock-cells = <0>;
                                                reg = <19>;
                                        };
 
-                                       adc_clk: adc_clk {
+                                       adc_clk: adc_clk@20 {
                                                #clock-cells = <0>;
                                                reg = <20>;
                                        };
 
-                                       dma0_clk: dma0_clk {
+                                       dma0_clk: dma0_clk@21 {
                                                #clock-cells = <0>;
                                                reg = <21>;
                                        };
 
-                                       uhphs_clk: uhphs_clk {
+                                       uhphs_clk: uhphs_clk@22 {
                                                #clock-cells = <0>;
                                                reg = <22>;
                                        };
 
-                                       lcd_clk: lcd_clk {
+                                       lcd_clk: lcd_clk@23 {
                                                #clock-cells = <0>;
                                                reg = <23>;
                                        };
 
-                                       ac97_clk: ac97_clk {
+                                       ac97_clk: ac97_clk@24 {
                                                #clock-cells = <0>;
                                                reg = <24>;
                                        };
 
-                                       macb0_clk: macb0_clk {
+                                       macb0_clk: macb0_clk@25 {
                                                #clock-cells = <0>;
                                                reg = <25>;
                                        };
 
-                                       isi_clk: isi_clk {
+                                       isi_clk: isi_clk@26 {
                                                #clock-cells = <0>;
                                                reg = <26>;
                                        };
 
-                                       udphs_clk: udphs_clk {
+                                       udphs_clk: udphs_clk@27 {
                                                #clock-cells = <0>;
                                                reg = <27>;
                                        };
 
-                                       aestdessha_clk: aestdessha_clk {
+                                       aestdessha_clk: aestdessha_clk@28 {
                                                #clock-cells = <0>;
                                                reg = <28>;
                                        };
 
-                                       mci1_clk: mci1_clk {
+                                       mci1_clk: mci1_clk@29 {
                                                #clock-cells = <0>;
                                                reg = <29>;
                                        };
 
-                                       vdec_clk: vdec_clk {
+                                       vdec_clk: vdec_clk@30 {
                                                #clock-cells = <0>;
                                                reg = <30>;
                                        };
                                #size-cells = <1>;
                                compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
                                ranges = <0xfffff200 0xfffff200 0xa00>;
+                               reg = <0xfffff200 0x200
+                                      0xfffff400 0x200
+                                      0xfffff600 0x200
+                                      0xfffff800 0x200
+                                      0xfffffa00 0x200
+                                     >;
+                               u-boot,dm-pre-reloc;
 
                                atmel,mux-mask = <
                                      /*    A         B     */
                                };
 
                                dbgu {
+                                       u-boot,dm-pre-reloc;
                                        pinctrl_dbgu: dbgu-0 {
                                                atmel,pins =
-                                                       <AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB12 periph A */
-                                                        AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB13 periph A */
+                                                       <AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
+                                                        AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE>;
                                        };
                                };
 
                                                         AT91_PIOE 30 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PE30 periph A */
                                        };
                                };
+                       };
 
-                               pioA: gpio@fffff200 {
-                                       compatible = "atmel,at91rm9200-gpio";
-                                       reg = <0xfffff200 0x200>;
-                                       interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
-                                       #gpio-cells = <2>;
-                                       gpio-controller;
-                                       interrupt-controller;
-                                       #interrupt-cells = <2>;
-                                       clocks = <&pioA_clk>;
-                               };
+                       pioA: gpio@fffff200 {
+                               compatible = "atmel,at91rm9200-gpio";
+                               reg = <0xfffff200 0x200>;
+                               interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
+                               #gpio-cells = <2>;
+                               gpio-controller;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               clocks = <&pioA_clk>;
+                       };
 
-                               pioB: gpio@fffff400 {
-                                       compatible = "atmel,at91rm9200-gpio";
-                                       reg = <0xfffff400 0x200>;
-                                       interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
-                                       #gpio-cells = <2>;
-                                       gpio-controller;
-                                       interrupt-controller;
-                                       #interrupt-cells = <2>;
-                                       clocks = <&pioB_clk>;
-                               };
+                       pioB: gpio@fffff400 {
+                               compatible = "atmel,at91rm9200-gpio";
+                               reg = <0xfffff400 0x200>;
+                               interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
+                               #gpio-cells = <2>;
+                               gpio-controller;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               clocks = <&pioB_clk>;
+                       };
 
-                               pioC: gpio@fffff600 {
-                                       compatible = "atmel,at91rm9200-gpio";
-                                       reg = <0xfffff600 0x200>;
-                                       interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
-                                       #gpio-cells = <2>;
-                                       gpio-controller;
-                                       interrupt-controller;
-                                       #interrupt-cells = <2>;
-                                       clocks = <&pioC_clk>;
-                               };
+                       pioC: gpio@fffff600 {
+                               compatible = "atmel,at91rm9200-gpio";
+                               reg = <0xfffff600 0x200>;
+                               interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
+                               #gpio-cells = <2>;
+                               gpio-controller;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               clocks = <&pioC_clk>;
+                       };
 
-                               pioD: gpio@fffff800 {
-                                       compatible = "atmel,at91rm9200-gpio";
-                                       reg = <0xfffff800 0x200>;
-                                       interrupts = <5 IRQ_TYPE_LEVEL_HIGH 1>;
-                                       #gpio-cells = <2>;
-                                       gpio-controller;
-                                       interrupt-controller;
-                                       #interrupt-cells = <2>;
-                                       clocks = <&pioDE_clk>;
-                               };
+                       pioD: gpio@fffff800 {
+                               compatible = "atmel,at91rm9200-gpio";
+                               reg = <0xfffff800 0x200>;
+                               interrupts = <5 IRQ_TYPE_LEVEL_HIGH 1>;
+                               #gpio-cells = <2>;
+                               gpio-controller;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               clocks = <&pioDE_clk>;
+                       };
 
-                               pioE: gpio@fffffa00 {
-                                       compatible = "atmel,at91rm9200-gpio";
-                                       reg = <0xfffffa00 0x200>;
-                                       interrupts = <5 IRQ_TYPE_LEVEL_HIGH 1>;
-                                       #gpio-cells = <2>;
-                                       gpio-controller;
-                                       interrupt-controller;
-                                       #interrupt-cells = <2>;
-                                       clocks = <&pioDE_clk>;
-                               };
+                       pioE: gpio@fffffa00 {
+                               compatible = "atmel,at91rm9200-gpio";
+                               reg = <0xfffffa00 0x200>;
+                               interrupts = <5 IRQ_TYPE_LEVEL_HIGH 1>;
+                               #gpio-cells = <2>;
+                               gpio-controller;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               clocks = <&pioDE_clk>;
                        };
 
                        dbgu: serial@ffffee00 {
 
                        trng@fffcc000 {
                                compatible = "atmel,at91sam9g45-trng";
-                               reg = <0xfffcc000 0x4000>;
+                               reg = <0xfffcc000 0x100>;
                                interrupts = <6 IRQ_TYPE_LEVEL_HIGH 0>;
                                clocks = <&trng_clk>;
                        };
                        };
 
                        adc0: adc@fffb0000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                                compatible = "atmel,at91sam9g45-adc";
                                reg = <0xfffb0000 0x100>;
                                interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
                                atmel,adc-res-names = "lowres", "highres";
                                atmel,adc-use-res = "highres";
 
-                               trigger@0 {
-                                       reg = <0>;
+                               trigger0 {
                                        trigger-name = "external-rising";
                                        trigger-value = <0x1>;
                                        trigger-external;
                                };
-                               trigger@1 {
-                                       reg = <1>;
+                               trigger1 {
                                        trigger-name = "external-falling";
                                        trigger-value = <0x2>;
                                        trigger-external;
                                };
 
-                               trigger@2 {
-                                       reg = <2>;
+                               trigger2 {
                                        trigger-name = "external-any";
                                        trigger-value = <0x3>;
                                        trigger-external;
                                };
 
-                               trigger@3 {
-                                       reg = <3>;
+                               trigger3 {
                                        trigger-name = "continuous";
                                        trigger-value = <0x6>;
                                };
                                clocks = <&isi_clk>;
                                clock-names = "isi_clk";
                                status = "disabled";
-                               port {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                               };
                        };
 
                        pwm0: pwm@fffb8000 {
                                clock-names = "pclk", "hclk";
                                status = "disabled";
 
-                               ep0 {
+                               ep@0 {
                                        reg = <0>;
                                        atmel,fifo-size = <64>;
                                        atmel,nb-banks = <1>;
                                };
 
-                               ep1 {
+                               ep@1 {
                                        reg = <1>;
                                        atmel,fifo-size = <1024>;
                                        atmel,nb-banks = <2>;
                                        atmel,can-isoc;
                                };
 
-                               ep2 {
+                               ep@2 {
                                        reg = <2>;
                                        atmel,fifo-size = <1024>;
                                        atmel,nb-banks = <2>;
                                        atmel,can-isoc;
                                };
 
-                               ep3 {
+                               ep@3 {
                                        reg = <3>;
                                        atmel,fifo-size = <1024>;
                                        atmel,nb-banks = <3>;
                                        atmel,can-dma;
                                };
 
-                               ep4 {
+                               ep@4 {
                                        reg = <4>;
                                        atmel,fifo-size = <1024>;
                                        atmel,nb-banks = <3>;
                                        atmel,can-dma;
                                };
 
-                               ep5 {
+                               ep@5 {
                                        reg = <5>;
                                        atmel,fifo-size = <1024>;
                                        atmel,nb-banks = <3>;
                                        atmel,can-isoc;
                                };
 
-                               ep6 {
+                               ep@6 {
                                        reg = <6>;
                                        atmel,fifo-size = <1024>;
                                        atmel,nb-banks = <3>;
                };
        };
 
-       i2c@0 {
+       i2c-gpio-0 {
                compatible = "i2c-gpio";
                gpios = <&pioA 20 GPIO_ACTIVE_HIGH /* sda */
                         &pioA 21 GPIO_ACTIVE_HIGH /* scl */