From: xbw <xbw@rock-chips.com>
Date: Mon, 17 Mar 2014 09:29:41 +0000 (+0800)
Subject: SDMMC: use aliases of sdmmc in rk3188-tb.dts file.
X-Git-Tag: firefly_0821_release~6053
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3d9b15007a2911bdcc3192140da3a2adc24267e2;p=firefly-linux-kernel-4.4.55.git

SDMMC: use aliases of sdmmc in rk3188-tb.dts file.
---

diff --git a/arch/arm/boot/dts/rk3188-tb.dts b/arch/arm/boot/dts/rk3188-tb.dts
index 4bdbc44b5855..288e1cf90c50 100755
--- a/arch/arm/boot/dts/rk3188-tb.dts
+++ b/arch/arm/boot/dts/rk3188-tb.dts
@@ -17,46 +17,6 @@
 		status = "okay";
 	};
 
-	
-	sdmmc2: emmc@1021C000 {
-    		compatible = "rockchip,rk_mmc";
-  	  	clock-frequency = <50000000>;
-        	clock-freq-min-max = <400000 50000000>;
-
-        	supports-highspeed;
-		supports-emmc;
-        	bootpart-no-access;
-        
-    		status = "okay";
-    	};
-    
-	sdmmc0: sdmmc@10214000 {
-	    	compatible = "rockchip,rk_mmc";
-		clock-frequency = <50000000>;
-		clock-freq-min-max = <400000 50000000>;	            
-	    
-		supports-highspeed;
-	    	supports-sd;
-	    	broken-cd;
-	    	card-detect-delay = <200>;
-
-	    	pwr-gpios = <&gpio3 GPIO_A1 GPIO_ACTIVE_LOW>; /*pwr_en = GPIO3_A1*/
-	    
-	    	status = "okay";
-	};
-	
-	
-	sdmmc1: sdio@10218000 {
-	    	compatible = "rockchip,rk_mmc";
-		clock-frequency = <50000000>;
-        	clock-freq-min-max = <200000 50000000>;
-		
-  		supports-highspeed;		
-		supports-sdio;
-
-		status = "diabled";
-	};
-
 
 	wireless-wlan {
 		compatible = "wlan-platdata";
@@ -190,6 +150,43 @@
 	};
 };
 
+
+&emmc {
+	clock-frequency = <50000000>;
+        clock-freq-min-max = <400000 50000000>;
+
+        supports-highspeed;
+	supports-emmc;
+        bootpart-no-access;
+        
+    	status = "okay";
+};
+    
+&sdmmc {
+	clock-frequency = <50000000>;
+	lock-freq-min-max = <400000 50000000>;	            
+	    
+	supports-highspeed;
+	supports-sd;
+	broken-cd;
+	card-detect-delay = <200>;
+
+	pwr-gpios = <&gpio3 GPIO_A1 GPIO_ACTIVE_LOW>; /*pwr_en = GPIO3_A1*/
+
+	status = "okay";
+};
+		
+&sdio {
+	clock-frequency = <50000000>;
+        clock-freq-min-max = <200000 50000000>;
+		
+  	supports-highspeed;		
+	supports-sdio;
+
+	status = "diabled";
+};
+
+
 &uart0 {
 	status = "okay";
 	dma-names = "!tx", "!rx";
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 10f0069c6707..d6421bdf9cd3 100755
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -14,6 +14,9 @@
 	rockchip,sram = <&sram>;
 
 	aliases {
+		emmc = &emmc;
+		sdmmc = &sdmmc;
+		sdio = &sdio;
 		serial0 = &uart0;
 		serial1 = &uart1;
 		serial2 = &uart2;
@@ -259,7 +262,7 @@
 		};
 	};
 
-	sdmmc2: emmc@1021C000 {
+	emmc: rksdmmc@1021C000 {
 		compatible = "rockchip,rk_mmc";
 		reg = <0x1021C000 0x4000>;
 		interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;/*irq=57*/
@@ -268,40 +271,41 @@
 		//pinctrl-names = "default",,"suspend";
 		//pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_wp &sd0_pwr &sd0_bus1 &sd0_bus4>;
 		clocks = <&clk_gates2 14>;
-		num-slots = <1>;	  	
-  	  	fifo-depth = <0x80>;
+		num-slots = <1>;
+	  	
+  	 	fifo-depth = <0x80>;
 		bus-width = <4>;
 	};
 
-	sdmmc0: sdmmc@10214000 {
-	    compatible = "rockchip,rk_mmc";
-	    reg = <0x10214000 0x4000>;
-	    interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; /*irq=55*/
-	    #address-cells = <1>;
-	    #size-cells = <0>;
-	    pinctrl-names = "default","suspend";
-	    pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_wp &sd0_pwr &sd0_bus1 &sd0_bus4>;
-	    pinctrl-1 = <&sd0_cd_gpio>; //for int gpio?
-	    clocks = <&clk_gates2 11>;
-   	    num-slots = <1>;    
-	    fifo-depth = <0x100>;
-	    bus-width = <4>;
-	    
-	};
-
-	sdmmc1: sdio@10218000 {
-	    compatible = "rockchip,rk_mmc";
-	    reg = <0x10218000 0x4000>;
-	    interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
-	    #address-cells = <1>;
-	    #size-cells = <0>;
-	    pinctrl-names = "default","suspend";
-	    pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_cd &sd1_wp &sd1_bus1 &sd1_bus4>;
-            clocks = <&clk_gates2 13>;        
-            num-slots = <1>;
-
-	    fifo-depth = <0x100>;
-	    bus-width = <4>;
+	sdmmc: rksdmmc@10214000 {
+		compatible = "rockchip,rk_mmc";
+	    	reg = <0x10214000 0x4000>;
+	    	interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; /*irq=55*/
+	    	#address-cells = <1>;
+	    	#size-cells = <0>;
+	    	pinctrl-names = "default","suspend";
+	    	pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_wp &sd0_pwr &sd0_bus1 &sd0_bus4>;
+	    	pinctrl-1 = <&sd0_cd_gpio>; //for int gpio?
+	    	clocks = <&clk_gates2 11>;
+   	    	num-slots = <1>; 
+   
+	    	fifo-depth = <0x100>;
+	    	bus-width = <4>;
+	};
+
+	sdio: rksdmmc@10218000 {
+	    	compatible = "rockchip,rk_mmc";
+	    	reg = <0x10218000 0x4000>;
+	    	interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+	    	#address-cells = <1>;
+	    	#size-cells = <0>;
+	    	pinctrl-names = "default","suspend";
+	    	pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_cd &sd1_wp &sd1_bus1 &sd1_bus4>;
+            	clocks = <&clk_gates2 13>;        
+            	num-slots = <1>;
+
+	    	fifo-depth = <0x100>;
+	    	bus-width = <4>;
 	};
 
 	uart0: serial@10124000 {