Merge origin/master into drm-misc-fixes

[karo-tx-linux.git] / arch / arm / boot / dts / at91sam9261.dtsi

diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
index 7e80acda8f69d4fb1a1c3ed6de21361f3291ba09..a05353f961515fdcf3f5aa4ccaabba743d914dab 100644 (file)
--- a/arch/arm/boot/dts/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/at91sam9261.dtsi
@@ -91,20 +91,31 @@
                        status = "disabled";
                };
 
-               nand0: nand@40000000 {
-                       compatible = "atmel,at91rm9200-nand";
-                       #address-cells = <1>;
+               ebi: ebi@10000000 {
+                       compatible = "atmel,at91sam9261-ebi";
+                       #address-cells = <2>;
                        #size-cells = <1>;
-                       reg = <0x40000000 0x10000000>;
-                       atmel,nand-addr-offset = <22>;
-                       atmel,nand-cmd-offset = <21>;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_nand>;
-
-                       gpios = <&pioC 15 GPIO_ACTIVE_HIGH>,
-                               <&pioC 14 GPIO_ACTIVE_HIGH>,
-                               <0>;
+                       atmel,smc = <&smc>;
+                       atmel,matrix = <&matrix>;
+                       reg = <0x10000000 0x80000000>;
+                       ranges = <0x0 0x0 0x10000000 0x10000000
+                                 0x1 0x0 0x20000000 0x10000000
+                                 0x2 0x0 0x30000000 0x10000000
+                                 0x3 0x0 0x40000000 0x10000000
+                                 0x4 0x0 0x50000000 0x10000000
+                                 0x5 0x0 0x60000000 0x10000000
+                                 0x6 0x0 0x70000000 0x10000000
+                                 0x7 0x0 0x80000000 0x10000000>;
+                       clocks = <&mck>;
                        status = "disabled";
+
+                       nand_controller: nand-controller {
+                               compatible = "atmel,at91sam9261-nand-controller";
+                               #address-cells = <2>;
+                               #size-cells = <1>;
+                               ranges;
+                               status = "disabled";
+                       };
                };
 
                apb {
@@ -262,6 +273,11 @@
                                reg = <0xffffea00 0x200>;
                        };
 
+                       smc: smc@ffffec00 {
+                               compatible = "atmel,at91sam9260-smc", "syscon";
+                               reg = <0xffffec00 0x200>;
+                       };
+
                        matrix: matrix@ffffee00 {
                                compatible = "atmel,at91sam9261-matrix", "syscon";
                                reg = <0xffffee00 0x200>;
@@ -362,9 +378,13 @@
                                };
 
                                nand {
-                                       pinctrl_nand: nand-0 {
+                                       pinctrl_nand_rb: nand-rb-0 {
+                                               atmel,pins =
+                                                       <AT91_PIOC 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;
+                                       };
+
+                                       pinctrl_nand_cs: nand-cs-0 {
                                                atmel,pins =
-                                                       <AT91_PIOC 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>,
                                                        <AT91_PIOC 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;
                                        };
                                };