Merge tag 'sound-fix-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

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

diff --git a/arch/arm/boot/dts/pm9g45.dts b/arch/arm/boot/dts/pm9g45.dts
index 0abd7bf17568bdf5a040fe9f8918aea092fbbbca..3139221737eeba04f3926b544225680a425ccb04 100644 (file)
--- a/arch/arm/boot/dts/pm9g45.dts
+++ b/arch/arm/boot/dts/pm9g45.dts
@@ -37,12 +37,10 @@
                        };
 
                        pinctrl@fffff200 {
-
-                               board {
-                                       pinctrl_board_nand: nand0-board {
+                               nand {
+                                       pinctrl_nand_rb: nand-rb-0 {
                                                atmel,pins =
-                                                       <AT91_PIOD 3 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP      /* PD3 gpio RDY pin pull_up*/
-                                                        AT91_PIOC 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;   /* PC14 gpio enable pin pull_up */
+                                                       <AT91_PIOD 3 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;
                                        };
                                };
 
@@ -71,50 +69,61 @@
                                phy-mode = "rmii";
                                status = "okay";
                        };
-
                };
 
-               nand0: nand@40000000 {
-                       nand-bus-width = <8>;
-                       nand-ecc-mode = "soft";
-                       nand-on-flash-bbt;
-                       pinctrl-0 = <&pinctrl_board_nand>;
-
-                       gpios = <&pioD 3 GPIO_ACTIVE_HIGH
-                                &pioC 14 GPIO_ACTIVE_HIGH
-                                0
-                               >;
-
+               ebi: ebi@10000000 {
                        status = "okay";
 
-                       at91bootstrap@0 {
-                               label = "at91bootstrap";
-                               reg = <0x0 0x20000>;
-                       };
-
-                       barebox@20000 {
-                               label = "barebox";
-                               reg = <0x20000 0x40000>;
-                       };
-
-                       bareboxenv@60000 {
-                               label = "bareboxenv";
-                               reg = <0x60000 0x1A0000>;
-                       };
-
-                       kernel@200000 {
-                               label = "bareboxenv2";
-                               reg = <0x200000 0x300000>;
-                       };
-
-                       kernel@500000 {
-                               label = "root";
-                               reg = <0x500000 0x400000>;
-                       };
-
-                       data@900000 {
-                               label = "data";
-                               reg = <0x900000 0x8340000>;
+                       nand_controller: nand-controller {
+                               status = "okay";
+                               pinctrl-0 = <&pinctrl_nand_cs &pinctrl_nand_rb>;
+                               pinctrl-names = "default";
+
+                               nand@3 {
+                                       reg = <0x3 0x0 0x800000>;
+                                       rb-gpios = <&pioD 3 GPIO_ACTIVE_HIGH>;
+                                       cs-gpios = <&pioC 14 GPIO_ACTIVE_HIGH>;
+                                       nand-bus-width = <8>;
+                                       nand-ecc-mode = "soft";
+                                       nand-on-flash-bbt;
+                                       label = "atmel_nand";
+
+                                       partitions {
+                                               compatible = "fixed-partitions";
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+
+                                               at91bootstrap@0 {
+                                                       label = "at91bootstrap";
+                                                       reg = <0x0 0x20000>;
+                                               };
+
+                                               barebox@20000 {
+                                                       label = "barebox";
+                                                       reg = <0x20000 0x40000>;
+                                               };
+
+                                               bareboxenv@60000 {
+                                                       label = "bareboxenv";
+                                                       reg = <0x60000 0x1A0000>;
+                                               };
+
+                                               kernel@200000 {
+                                                       label = "bareboxenv2";
+                                                       reg = <0x200000 0x300000>;
+                                               };
+
+                                               kernel@500000 {
+                                                       label = "root";
+                                                       reg = <0x500000 0x400000>;
+                                               };
+
+                                               data@900000 {
+                                                       label = "data";
+                                                       reg = <0x900000 0x8340000>;
+                                               };
+                                       };
+                               };
                        };
                };