Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / sama5d3.dtsi

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 5956f9be3e8ff026d5af8b4229455141926bda2b..a1d5e25a66986492e3d44f5348102c64a6b3658a 100644 (file)
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -39,8 +39,12 @@
                ssc1 = &ssc1;
        };
        cpus {
+               #address-cells = <1>;
+               #size-cells = <0>;
                cpu@0 {
+                       device_type = "cpu";
                        compatible = "arm,cortex-a5";
+                       reg = <0x0>;
                };
        };
 
@@ -79,11 +83,6 @@
                                compatible = "atmel,at91rm9200-spi";
                                reg = <0xf0004000 0x100>;
                                interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;
-                               cs-gpios = <&pioD 13 0
-                                           &pioD 14 0 /* conflicts with SCK0 and CANRX0 */
-                                           &pioD 15 0 /* conflicts with CTS0 and CANTX0 */
-                                           &pioD 16 0 /* conflicts with RTS0 and PWMFI3 */
-                                          >;
                                dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(1)>,
                                       <&dma0 2 AT91_DMA_CFG_PER_ID(2)>;
                                dma-names = "tx", "rx";
@@ -163,7 +162,7 @@
                        };
 
                        macb0: ethernet@f0028000 {
-                               compatible = "cnds,pc302-gem", "cdns,gem";
+                               compatible = "cdns,pc302-gem", "cdns,gem";
                                reg = <0xf0028000 0x100>;
                                interrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
@@ -210,11 +209,6 @@
                                compatible = "atmel,at91rm9200-spi";
                                reg = <0xf8008000 0x100>;
                                interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>;
-                               cs-gpios = <&pioC 25 0
-                                           &pioC 26 0 /* conflitcs with TWD1 and ISI_D11 */
-                                           &pioC 27 0 /* conflitcs with TWCK1 and ISI_D10 */
-                                           &pioC 28 0 /* conflitcs with PWMFI0 and ISI_D9 */
-                                          >;
                                dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(15)>,
                                       <&dma1 2 AT91_DMA_CFG_PER_ID(16)>;
                                dma-names = "tx", "rx";