From: 陈亮 <cl@rock-chips.com>
Date: Fri, 25 Jul 2014 06:30:26 +0000 (-0700)
Subject: rk3126-sdk.dts: add pinctrl, fix syntax err
X-Git-Tag: firefly_0821_release~4916^2~154
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3841748ecf91fc649e8f63106905c033fb67bec7;p=firefly-linux-kernel-4.4.55.git

rk3126-sdk.dts: add pinctrl, fix syntax err

Signed-off-by: 陈亮 <cl@rock-chips.com>
---

diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts
index 9d4c7bfffb38..9e2a195c3396 100755
--- a/arch/arm/boot/dts/rk3126-sdk.dts
+++ b/arch/arm/boot/dts/rk3126-sdk.dts
@@ -1,58 +1,59 @@
 /dts-v1/;
 
-#include "rk3288.dtsi"
-#include "lcd-b101ew05.dtsi"
+#include "rk312x.dtsi"
+#include "rk312x-pinctrl.dtsi"
 
 / {
 	fiq-debugger {
 		status = "okay";
 	};
-	&nandc {
-		status = "okay"; // used nand set "okay" ,used emmc set "disabled"
-	};  
+};
 
-	&nandc0reg {
-		status = "disabled"; // used nand set "disabled" ,used emmc set "okay"
-	};
+&nandc {
+	status = "okay"; // used nand set "okay" ,used emmc set "disabled"
+}; 
 
-	&emmc {
-		clock-frequency = <100000000>;
-		clock-freq-min-max = <400000 100000000>;
-		supports-highspeed;
-		supports-emmc;
-		bootpart-no-access;
-		supports-DDR_MODE;
-		//caps2-mmc-hs200;
-		ignore-pm-notify;
-		keep-power-in-suspend;
-		//poll-hw-reset
-		status = "disabled";
-	};
+&nandc0reg {
+	status = "disabled"; // used nand set "disabled" ,used emmc set "okay"
+};
 
-	&sdmmc {
-		clock-frequency = <50000000>;
-		clock-freq-min-max = <400000 50000000>;
-		supports-highspeed;
-		supports-sd;
-		broken-cd;
-		card-detect-delay = <200>;
-		ignore-pm-notify;
-		keep-power-in-suspend;
-		//vmmc-supply = <&rk808_ldo5_reg>;
-		status = "disabled";
-	};
+&emmc {
+	clock-frequency = <100000000>;
+	clock-freq-min-max = <400000 100000000>;
+	supports-highspeed;
+	supports-emmc;
+	bootpart-no-access;
+	supports-DDR_MODE;
+	//caps2-mmc-hs200;
+	ignore-pm-notify;
+	keep-power-in-suspend;
+	//poll-hw-reset
+	status = "disabled";
+};
 
-	&sdio {
-		clock-frequency = <50000000>;
-		clock-freq-min-max = <200000 50000000>;
-		supports-highspeed;
-		supports-sdio;
-		ignore-pm-notify;
-		keep-power-in-suspend;
-		//cap-sdio-irq;
-		status = "disabled";
-	};
-    };
+&sdmmc {
+	clock-frequency = <50000000>;
+	clock-freq-min-max = <400000 50000000>;
+	supports-highspeed;
+	supports-sd;
+	broken-cd;
+	card-detect-delay = <200>;
+	ignore-pm-notify;
+	keep-power-in-suspend;
+	//vmmc-supply = <&rk808_ldo5_reg>;
+	status = "disabled";
+};
+
+&sdio {
+	clock-frequency = <50000000>;
+	clock-freq-min-max = <200000 50000000>;
+	supports-highspeed;
+	supports-sdio;
+	ignore-pm-notify;
+	keep-power-in-suspend;
+	//cap-sdio-irq;
+	status = "disabled";
+};
 
 &i2c0 {
 	status = "okay";