From: Zhaoyifeng <zyf@rock-chips.com>
Date: Sat, 12 Jul 2014 02:09:58 +0000 (+0800)
Subject:     nand driver:
X-Git-Tag: firefly_0821_release~4916^2~263^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3543ddb737056f638ab8be394c32a3266f01f0c3;p=firefly-linux-kernel-4.4.55.git

nand driver:
    add nand reg config for emmc read sn and verdor info.
---

diff --git a/arch/arm/boot/dts/rk3036-sdk.dts b/arch/arm/boot/dts/rk3036-sdk.dts
index 20f6df47752e..cf9eb8e0f38c 100755
--- a/arch/arm/boot/dts/rk3036-sdk.dts
+++ b/arch/arm/boot/dts/rk3036-sdk.dts
@@ -85,9 +85,13 @@
 };
 
 &nandc {
-	status = "okay"; // used nand set "disabled" ,used emmc set "okay"
+	status = "okay"; // used nand set "okay" ,used emmc set "disabled"
 };  
 
+&nandc0reg {
+	status = "disabled"; // used nand set "disabled" ,used emmc set "okay"
+};
+
 &emmc {
 	clock-frequency = <100000000>;
 	clock-freq-min-max = <400000 100000000>;
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index ab609658bd3b..851d2060bc20 100755
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -107,6 +107,11 @@
 		clocks = <&clk_nandc>, <&clk_gates5 9>, <&clk_gates10 4>;
 		clock-names = "clk_nandc", "g_clk_nandc", "hclk_nandc";
 	};
+	
+	nandc0reg: nandc0@10500000 {
+		compatible = "rockchip,rk-nandc";
+		reg = <0x10500000 0x4000>;
+	};
 
 	spi0: spi@20074000 {
 		compatible = "rockchip,rockchip-spi";