From: wdc <wdc@rock-chips.com>
Date: Tue, 8 Jul 2014 07:33:03 +0000 (+0800)
Subject: 3036: update i2c gpio
X-Git-Tag: firefly_0821_release~4916^2~285
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c4c45b1e4610c1e7e2403ce41f331aeeac2bee93;p=firefly-linux-kernel-4.4.55.git

3036: update i2c gpio
---

diff --git a/arch/arm/boot/dts/rk3036-rk88.dts b/arch/arm/boot/dts/rk3036-rk88.dts
index bb5fd2f778d1..a4e063ddf16b 100755
--- a/arch/arm/boot/dts/rk3036-rk88.dts
+++ b/arch/arm/boot/dts/rk3036-rk88.dts
@@ -123,35 +123,6 @@
 		status = "okay";
 };
 
-&spi0 {
-	status = "okay";
-	max-freq = <48000000>;	
-	/*
-	spi_test@00 {
-     		compatible = "rockchip,spi_test_bus0_cs0";
-                reg = <0>;
-                spi-max-frequency = <24000000>;
-                //spi-cpha;
-		//spi-cpol;
-                poll_mode = <0>;
-	        type = <0>;
-		enable_dma = <0>;
-
-	};
-
-	spi_test@01 {
-	        compatible = "rockchip,spi_test_bus0_cs1";
-	        reg = <1>;
-	        spi-max-frequency = <24000000>;
-	        spi-cpha;
-		spi-cpol;
-	        poll_mode = <0>;
-	        type = <0>;
-		enable_dma = <0>;	        
-	};
-	*/
-};
-
 &uart0 {
         status = "okay";
         dma-names = "!tx", "!rx";
diff --git a/arch/arm/boot/dts/rk3036-sdk.dts b/arch/arm/boot/dts/rk3036-sdk.dts
index 5c7509af4615..38970e29a26f 100755
--- a/arch/arm/boot/dts/rk3036-sdk.dts
+++ b/arch/arm/boot/dts/rk3036-sdk.dts
@@ -123,35 +123,6 @@
 		status = "okay";
 };
 
-&spi0 {
-	status = "okay";
-	max-freq = <48000000>;	
-	/*
-	spi_test@00 {
-     		compatible = "rockchip,spi_test_bus0_cs0";
-                reg = <0>;
-                spi-max-frequency = <24000000>;
-                //spi-cpha;
-		//spi-cpol;
-                poll_mode = <0>;
-	        type = <0>;
-		enable_dma = <0>;
-
-	};
-
-	spi_test@01 {
-	        compatible = "rockchip,spi_test_bus0_cs1";
-	        reg = <1>;
-	        spi-max-frequency = <24000000>;
-	        spi-cpha;
-		spi-cpol;
-	        poll_mode = <0>;
-	        type = <0>;
-		enable_dma = <0>;	        
-	};
-	*/
-};
-
 &uart0 {
         status = "okay";
         dma-names = "!tx", "!rx";
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 43130a8d3521..8aa9102a1e89 100755
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -271,7 +271,7 @@
 		pinctrl-names = "default", "gpio";
 		pinctrl-0 = <&i2c0_sda &i2c0_scl>;
 		pinctrl-1 = <&i2c0_gpio>;
-		gpios = <&gpio0 GPIO_B7 GPIO_ACTIVE_LOW>, <&gpio0 GPIO_C0 GPIO_ACTIVE_LOW>;
+		gpios = <&gpio0 GPIO_A1 GPIO_ACTIVE_LOW>, <&gpio0 GPIO_A0 GPIO_ACTIVE_LOW>;
 		clocks = <&clk_gates8 4>;
 		rockchip,check-idle = <1>;
 		status = "disabled";
@@ -283,10 +283,10 @@
 		interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		//pinctrl-names = "default", "gpio";
-		//pinctrl-0 = <&i2c1_sda &i2c1_scl>;
-		//pinctrl-1 = <&i2c1_gpio>;
-		//gpios = <&gpio8 GPIO_A4 GPIO_ACTIVE_LOW>, <&gpio8 GPIO_A5 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "default", "gpio";
+		pinctrl-0 = <&i2c1_sda &i2c1_scl>;
+		pinctrl-1 = <&i2c1_gpio>;
+		gpios = <&gpio0 GPIO_A3 GPIO_ACTIVE_LOW>, <&gpio0 GPIO_A2 GPIO_ACTIVE_LOW>;
 		clocks = <&clk_gates8 5>;
 		rockchip,check-idle = <1>;
 		status = "disabled";
@@ -298,10 +298,10 @@
 		interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		//pinctrl-names = "default", "gpio";
-		//pinctrl-0 = <&i2c2_sda &i2c2_scl>;
-		//pinctrl-1 = <&i2c2_gpio>;
-		//gpios = <&gpio6 GPIO_B1 GPIO_ACTIVE_LOW>, <&gpio6 GPIO_B2 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "default", "gpio";
+		pinctrl-0 = <&i2c2_sda &i2c2_scl>;
+		pinctrl-1 = <&i2c2_gpio>;
+		gpios = <&gpio2 GPIO_C4 GPIO_ACTIVE_LOW>, <&gpio2 GPIO_C5 GPIO_ACTIVE_LOW>;
 		clocks = <&clk_gates8 6>;
 		rockchip,check-idle = <1>;
 		status = "disabled";