};
 
                        usb2: gadget@fff78000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                                compatible = "atmel,at91sam9g45-udc";
                                reg = <0x00600000 0x80000
                                       0xfff78000 0x400>;
                                clocks = <&udphs_clk>, <&utmi>;
                                clock-names = "pclk", "hclk";
                                status = "disabled";
-
-                               ep@0 {
-                                       reg = <0>;
-                                       atmel,fifo-size = <64>;
-                                       atmel,nb-banks = <1>;
-                               };
-
-                               ep@1 {
-                                       reg = <1>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <2>;
-                                       atmel,can-dma;
-                                       atmel,can-isoc;
-                               };
-
-                               ep@2 {
-                                       reg = <2>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <2>;
-                                       atmel,can-dma;
-                                       atmel,can-isoc;
-                               };
-
-                               ep@3 {
-                                       reg = <3>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <3>;
-                                       atmel,can-dma;
-                               };
-
-                               ep@4 {
-                                       reg = <4>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <3>;
-                                       atmel,can-dma;
-                               };
-
-                               ep@5 {
-                                       reg = <5>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <3>;
-                                       atmel,can-dma;
-                                       atmel,can-isoc;
-                               };
-
-                               ep@6 {
-                                       reg = <6>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <3>;
-                                       atmel,can-dma;
-                                       atmel,can-isoc;
-                               };
                        };
 
                        clk32k: sckc@fffffd50 {
 
                        };
 
                        usb0: gadget@fffd4000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                                compatible = "atmel,at91sam9rl-udc";
                                reg = <0x00600000 0x100000>,
                                      <0xfffd4000 0x4000>;
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_CORE PMC_UTMI>;
                                clock-names = "pclk", "hclk";
                                status = "disabled";
-
-                               ep@0 {
-                                       reg = <0>;
-                                       atmel,fifo-size = <64>;
-                                       atmel,nb-banks = <1>;
-                               };
-
-                               ep@1 {
-                                       reg = <1>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <2>;
-                                       atmel,can-dma;
-                                       atmel,can-isoc;
-                               };
-
-                               ep@2 {
-                                       reg = <2>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <2>;
-                                       atmel,can-dma;
-                                       atmel,can-isoc;
-                               };
-
-                               ep@3 {
-                                       reg = <3>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <3>;
-                                       atmel,can-dma;
-                               };
-
-                               ep@4 {
-                                       reg = <4>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <3>;
-                                       atmel,can-dma;
-                               };
-
-                               ep@5 {
-                                       reg = <5>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <3>;
-                                       atmel,can-dma;
-                                       atmel,can-isoc;
-                               };
-
-                               ep@6 {
-                                       reg = <6>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <3>;
-                                       atmel,can-dma;
-                                       atmel,can-isoc;
-                               };
                        };
 
                        dma0: dma-controller@ffffe600 {
 
                        };
 
                        usb2: gadget@f803c000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                                compatible = "atmel,at91sam9g45-udc";
                                reg = <0x00500000 0x80000
                                       0xf803c000 0x400>;
                                clocks = <&pmc PMC_TYPE_CORE PMC_UTMI>, <&pmc PMC_TYPE_PERIPHERAL 23>;
                                clock-names = "hclk", "pclk";
                                status = "disabled";
-
-                               ep@0 {
-                                       reg = <0>;
-                                       atmel,fifo-size = <64>;
-                                       atmel,nb-banks = <1>;
-                               };
-
-                               ep@1 {
-                                       reg = <1>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <2>;
-                                       atmel,can-dma;
-                                       atmel,can-isoc;
-                               };
-
-                               ep@2 {
-                                       reg = <2>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <2>;
-                                       atmel,can-dma;
-                                       atmel,can-isoc;
-                               };
-
-                               ep@3 {
-                                       reg = <3>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <3>;
-                                       atmel,can-dma;
-                               };
-
-                               ep@4 {
-                                       reg = <4>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <3>;
-                                       atmel,can-dma;
-                               };
-
-                               ep@5 {
-                                       reg = <5>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <3>;
-                                       atmel,can-dma;
-                                       atmel,can-isoc;
-                               };
-
-                               ep@6 {
-                                       reg = <6>;
-                                       atmel,fifo-size = <1024>;
-                                       atmel,nb-banks = <3>;
-                                       atmel,can-dma;
-                                       atmel,can-isoc;
-                               };
                        };
 
                        watchdog: watchdog@fffffe40 {
 
                };
 
                usb0: gadget@300000 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
                        compatible = "atmel,sama5d3-udc";
                        reg = <0x00300000 0x100000
                               0xfc02c000 0x400>;
                        clocks = <&pmc PMC_TYPE_PERIPHERAL 42>, <&pmc PMC_TYPE_CORE PMC_UTMI>;
                        clock-names = "pclk", "hclk";
                        status = "disabled";
-
-                       ep@0 {
-                               reg = <0>;
-                               atmel,fifo-size = <64>;
-                               atmel,nb-banks = <1>;
-                       };
-
-                       ep@1 {
-                               reg = <1>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <3>;
-                               atmel,can-dma;
-                               atmel,can-isoc;
-                       };
-
-                       ep@2 {
-                               reg = <2>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <3>;
-                               atmel,can-dma;
-                               atmel,can-isoc;
-                       };
-
-                       ep@3 {
-                               reg = <3>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-dma;
-                               atmel,can-isoc;
-                       };
-
-                       ep@4 {
-                               reg = <4>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-dma;
-                               atmel,can-isoc;
-                       };
-
-                       ep@5 {
-                               reg = <5>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-dma;
-                               atmel,can-isoc;
-                       };
-
-                       ep@6 {
-                               reg = <6>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-dma;
-                               atmel,can-isoc;
-                       };
-
-                       ep@7 {
-                               reg = <7>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-dma;
-                               atmel,can-isoc;
-                       };
-
-                       ep@8 {
-                               reg = <8>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-isoc;
-                       };
-
-                       ep@9 {
-                               reg = <9>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-isoc;
-                       };
-
-                       ep@10 {
-                               reg = <10>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-isoc;
-                       };
-
-                       ep@11 {
-                               reg = <11>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-isoc;
-                       };
-
-                       ep@12 {
-                               reg = <12>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-isoc;
-                       };
-
-                       ep@13 {
-                               reg = <13>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-isoc;
-                       };
-
-                       ep@14 {
-                               reg = <14>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-isoc;
-                       };
-
-                       ep@15 {
-                               reg = <15>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-isoc;
-                       };
                };
 
                usb1: ohci@400000 {
 
                };
 
                usb0: gadget@500000 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
                        compatible = "atmel,sama5d3-udc";
                        reg = <0x00500000 0x100000
                               0xf8030000 0x4000>;
                        clocks = <&udphs_clk>, <&utmi>;
                        clock-names = "pclk", "hclk";
                        status = "disabled";
-
-                       ep@0 {
-                               reg = <0>;
-                               atmel,fifo-size = <64>;
-                               atmel,nb-banks = <1>;
-                       };
-
-                       ep@1 {
-                               reg = <1>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <3>;
-                               atmel,can-dma;
-                               atmel,can-isoc;
-                       };
-
-                       ep@2 {
-                               reg = <2>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <3>;
-                               atmel,can-dma;
-                               atmel,can-isoc;
-                       };
-
-                       ep@3 {
-                               reg = <3>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-dma;
-                       };
-
-                       ep@4 {
-                               reg = <4>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-dma;
-                       };
-
-                       ep@5 {
-                               reg = <5>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-dma;
-                       };
-
-                       ep@6 {
-                               reg = <6>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-dma;
-                       };
-
-                       ep@7 {
-                               reg = <7>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-dma;
-                       };
-
-                       ep@8 {
-                               reg = <8>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                       };
-
-                       ep@9 {
-                               reg = <9>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                       };
-
-                       ep@10 {
-                               reg = <10>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                       };
-
-                       ep@11 {
-                               reg = <11>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                       };
-
-                       ep@12 {
-                               reg = <12>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                       };
-
-                       ep@13 {
-                               reg = <13>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                       };
-
-                       ep@14 {
-                               reg = <14>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                       };
-
-                       ep@15 {
-                               reg = <15>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                       };
                };
 
                usb1: ohci@600000 {
 
                };
 
                usb0: gadget@400000 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
                        compatible = "atmel,sama5d3-udc";
                        reg = <0x00400000 0x100000
                               0xfc02c000 0x4000>;
                        clocks = <&pmc PMC_TYPE_PERIPHERAL 47>, <&pmc PMC_TYPE_CORE PMC_UTMI>;
                        clock-names = "pclk", "hclk";
                        status = "disabled";
-
-                       ep@0 {
-                               reg = <0>;
-                               atmel,fifo-size = <64>;
-                               atmel,nb-banks = <1>;
-                       };
-
-                       ep@1 {
-                               reg = <1>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <3>;
-                               atmel,can-dma;
-                               atmel,can-isoc;
-                       };
-
-                       ep@2 {
-                               reg = <2>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <3>;
-                               atmel,can-dma;
-                               atmel,can-isoc;
-                       };
-
-                       ep@3 {
-                               reg = <3>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-dma;
-                               atmel,can-isoc;
-                       };
-
-                       ep@4 {
-                               reg = <4>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-dma;
-                               atmel,can-isoc;
-                       };
-
-                       ep@5 {
-                               reg = <5>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-dma;
-                               atmel,can-isoc;
-                       };
-
-                       ep@6 {
-                               reg = <6>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-dma;
-                               atmel,can-isoc;
-                       };
-
-                       ep@7 {
-                               reg = <7>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-dma;
-                               atmel,can-isoc;
-                       };
-
-                       ep@8 {
-                               reg = <8>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-isoc;
-                       };
-
-                       ep@9 {
-                               reg = <9>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-isoc;
-                       };
-
-                       ep@10 {
-                               reg = <10>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-isoc;
-                       };
-
-                       ep@11 {
-                               reg = <11>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-isoc;
-                       };
-
-                       ep@12 {
-                               reg = <12>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-isoc;
-                       };
-
-                       ep@13 {
-                               reg = <13>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-isoc;
-                       };
-
-                       ep@14 {
-                               reg = <14>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-isoc;
-                       };
-
-                       ep@15 {
-                               reg = <15>;
-                               atmel,fifo-size = <1024>;
-                               atmel,nb-banks = <2>;
-                               atmel,can-isoc;
-                       };
                };
 
                usb1: ohci@500000 {