aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhou Wang <wangzhou1@hisilicon.com>2015-03-25 15:04:51 +0800
committerWei Xu <xuwei5@hisilicon.com>2015-05-08 01:48:48 +0100
commite42536140889eaf62a794c926cfb7c0f918bf788 (patch)
tree2f33175ce483bbb15223a9cae58f640669519898
parentARM: dts: hip04: add GPIO pieces (diff)
downloadlinux-dev-e42536140889eaf62a794c926cfb7c0f918bf788.tar.xz
linux-dev-e42536140889eaf62a794c926cfb7c0f918bf788.zip
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>
-rw-r--r--arch/arm/boot/dts/hip04-d01.dts27
-rw-r--r--arch/arm/boot/dts/hip04.dtsi8
2 files changed, 35 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/hip04-d01.dts b/arch/arm/boot/dts/hip04-d01.dts
index 40a9e33c2654..ba04dd5fba8b 100644
--- 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 4201ddd72477..027d06c06322 100644
--- 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 {