mtd: hisilicon: add device tree node for NAND controller

This patch adds dts support for NAND flash controller of Hisilicon Soc Hip04.

Changes in v3:
- Change E-mail address in signed-off-by to "wangzhou1@hisilicon.com"
Changes in v2:
- Base on v3.19-rc1
- Use nand-ecc-strength, nand-ecc-step-size to replace hisi,nand-ecc-bits
Changes in v1:
- Move partition and other board related information into board dts file:
  hip04-d01.dts

Signed-off-by: Zhou Wang <wangzhou1@hisilicon.com>
Acked-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Reviewed-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>

diff --git a/arch/arm/boot/dts/hip04-d01.dts b/arch/arm/boot/dts/hip04-d01.dts
index 40a9e33c2654e3ab694d742328d2d8d4becfefff..ba04dd5fba8bb537b9a15dedd16c587a586e2ee7 100644 (file)
--- a/arch/arm/boot/dts/hip04-d01.dts
+++ b/arch/arm/boot/dts/hip04-d01.dts
@@ -28,5 +28,32 @@
                uart0: uart@4007000 {
                        status = "ok";
                };
+
+               nand: nand@4020000 {
+                       nand-bus-width = <8>;
+                       nand-ecc-mode = "hw";
+                       nand-ecc-strength = <16>;
+                       nand-ecc-step-size = <1024>;
+
+                       partition@0 {
+                               label = "nand_text";
+                               reg = <0x00000000 0x00400000>;
+                       };
+
+                       partition@00400000 {
+                               label = "nand_monitor";
+                               reg = <0x00400000 0x00400000>;
+                       };
+
+                       partition@00800000 {
+                               label = "nand_kernel";
+                               reg = <0x00800000 0x00800000>;
+                       };
+
+                       partition@01000000 {
+                               label = "nand_fs";
+                               reg = <0x01000000 0x1f000000>;
+                       };
+               };
        };
 };

diff --git a/arch/arm/boot/dts/hip04.dtsi b/arch/arm/boot/dts/hip04.dtsi
index 4201ddd7247706e03482444248167bbc3cca2097..027d06c063220c234101469d19a680180d47a971 100644 (file)
--- a/arch/arm/boot/dts/hip04.dtsi
+++ b/arch/arm/boot/dts/hip04.dtsi
@@ -344,6 +344,14 @@
                                interrupts = <0 389 4>;
                        };
                };
+
+               nand: nand@4020000 {
+                       compatible = "hisilicon,504-nfc";
+                       reg = <0x4020000 0x10000>, <0x5000000 0x1000>;
+                       interrupts = <0 379 4>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+               };
        };
 
        etb@0,e3c42000 {