mtd: fsmc_nand: pass the ale and cmd resource via resource

Do not use the platform_data to pass resource and be smart in the drivers.
Just pass it via resource

Switch to devm_request_and_ioremap at the sametime

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-By: Vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

5 files changed, 21 insertions, 21 deletions

diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi
index f7b84aced654..14a6d15c2a81 100644
--- a/arch/arm/boot/dts/spear13xx.dtsi
+++ b/arch/arm/boot/dts/spear13xx.dtsi
@@ -104,15 +104,15 @@
                         compatible = "st,spear600-fsmc-nand";
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        reg = <0xb0000000 0x1000        /* FSMC Register */
-                               0xb0800000 0x0010>;      /* NAND Base */
-                        reg-names = "fsmc_regs", "nand_data";
+                        reg = <0xb0000000 0x1000        /* FSMC Register*/
+                               0xb0800000 0x0010        /* NAND Base DATA */
+                               0xb0820000 0x0010        /* NAND Base ADDR */
+                               0xb0810000 0x0010>;      /* NAND Base CMD */
+                        reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd";
                         interrupts = <0 20 0x4
                                       0 21 0x4
                                       0 22 0x4
                                       0 23 0x4>;
-                        st,ale-off = <0x20000>;
-                        st,cle-off = <0x10000>;
                         status = "disabled";
                 };
 
diff --git a/arch/arm/boot/dts/spear300.dtsi b/arch/arm/boot/dts/spear300.dtsi
index ed3627c116cc..bc436387d7f9 100644
--- a/arch/arm/boot/dts/spear300.dtsi
+++ b/arch/arm/boot/dts/spear300.dtsi
@@ -38,10 +38,10 @@
                         #address-cells = <1>;
                         #size-cells = <1>;
                         reg = <0x94000000 0x1000        /* FSMC Register */
-                               0x80000000 0x0010>;      /* NAND Base */
-                        reg-names = "fsmc_regs", "nand_data";
-                        st,ale-off = <0x20000>;
-                        st,cle-off = <0x10000>;
+                               0x80000000 0x0010        /* NAND Base DATA */
+                               0x80020000 0x0010        /* NAND Base ADDR */
+                               0x80010000 0x0010>;      /* NAND Base CMD */
+                        reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd";
                         status = "disabled";
                 };
 
diff --git a/arch/arm/boot/dts/spear310.dtsi b/arch/arm/boot/dts/spear310.dtsi
index 62fc4fb3e5f9..7840e529aba2 100644
--- a/arch/arm/boot/dts/spear310.dtsi
+++ b/arch/arm/boot/dts/spear310.dtsi
@@ -32,10 +32,10 @@
                         #address-cells = <1>;
                         #size-cells = <1>;
                         reg = <0x44000000 0x1000        /* FSMC Register */
-                               0x40000000 0x0010>;      /* NAND Base */
-                        reg-names = "fsmc_regs", "nand_data";
-                        st,ale-off = <0x10000>;
-                        st,cle-off = <0x20000>;
+                               0x40000000 0x0010        /* NAND Base DATA */
+                               0x40020000 0x0010        /* NAND Base ADDR */
+                               0x40010000 0x0010>;      /* NAND Base CMD */
+                        reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd";
                         status = "disabled";
                 };
 
diff --git a/arch/arm/boot/dts/spear320.dtsi b/arch/arm/boot/dts/spear320.dtsi
index 1f49d69595a0..5ad820641ac0 100644
--- a/arch/arm/boot/dts/spear320.dtsi
+++ b/arch/arm/boot/dts/spear320.dtsi
@@ -38,10 +38,10 @@
                         #address-cells = <1>;
                         #size-cells = <1>;
                         reg = <0x4c000000 0x1000        /* FSMC Register */
-                               0x50000000 0x0010>;      /* NAND Base */
-                        reg-names = "fsmc_regs", "nand_data";
-                        st,ale-off = <0x20000>;
-                        st,cle-off = <0x10000>;
+                               0x50000000 0x0010        /* NAND Base DATA */
+                               0x50020000 0x0010        /* NAND Base ADDR */
+                               0x50010000 0x0010>;      /* NAND Base CMD */
+                        reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd";
                         status = "disabled";
                 };
 
diff --git a/arch/arm/boot/dts/spear600.dtsi b/arch/arm/boot/dts/spear600.dtsi
index a3c36e47d7ef..4ecc66f5ac88 100644
--- a/arch/arm/boot/dts/spear600.dtsi
+++ b/arch/arm/boot/dts/spear600.dtsi
@@ -67,10 +67,10 @@
                         #address-cells = <1>;
                         #size-cells = <1>;
                         reg = <0xd1800000 0x1000        /* FSMC Register */
-                               0xd2000000 0x4000>;      /* NAND Base */
-                        reg-names = "fsmc_regs", "nand_data";
-                        st,ale-off = <0x20000>;
-                        st,cle-off = <0x10000>;
+                               0xd2000000 0x0010        /* NAND Base DATA */
+                               0xd2020000 0x0010        /* NAND Base ADDR */
+                               0xd2010000 0x0010>;      /* NAND Base CMD */
+                        reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd";
                         status = "disabled";
                 };