From a3b45c8938bc8b0e51b0c971fb79f74cf1501a5e Mon Sep 17 00:00:00 2001
From: hjc <hjc@rock-chips.com>
Date: Mon, 7 Jul 2014 11:12:06 +0800
Subject: [PATCH] rk3036 hdmi: add pinctrl for hdmi

---
 arch/arm/boot/dts/rk3036-pinctrl.dtsi | 34 +++++++++++++++++++++++++++
 arch/arm/boot/dts/rk3036.dtsi         |  7 +++---
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/rk3036-pinctrl.dtsi b/arch/arm/boot/dts/rk3036-pinctrl.dtsi
index ed83553c5c15..d1d9d3b1c16d 100755
--- a/arch/arm/boot/dts/rk3036-pinctrl.dtsi
+++ b/arch/arm/boot/dts/rk3036-pinctrl.dtsi
@@ -252,6 +252,40 @@
 
 		};
 
+		gpio1_hdmi {
+			hdmi_cec:hdmi-cec {
+				rockchip,pins = <HDMI_CEC>;
+				rockchip,pull = <VALUE_PULL_DISABLE>;
+				//rockchip,voltage = <VALUE_VOL_DEFAULT>;
+				rockchip,drive = <VALUE_DRV_8MA>;
+			};
+
+			hdmi_sda:hdmi-sda {
+				rockchip,pins = <HDMI_SDA>;
+				rockchip,pull = <VALUE_PULL_DISABLE>;
+				//rockchip,voltage = <VALUE_VOL_DEFAULT>;
+				rockchip,drive = <VALUE_DRV_8MA>;
+			};
+
+			hdmi_scl:hdmi-scl {
+				rockchip,pins = <HDMI_SCL>;
+				rockchip,pull = <VALUE_PULL_DISABLE>;
+				//rockchip,voltage = <VALUE_VOL_DEFAULT>;
+				rockchip,drive = <VALUE_DRV_8MA>;
+			};
+
+			hdmi_hpd:hdmi-hpd {
+				rockchip,pins = <HDMI_HPD>;
+				rockchip,pull = <VALUE_PULL_DISABLE>;
+				//rockchip,voltage = <VALUE_VOL_DEFAULT>;
+				rockchip,drive = <VALUE_DRV_8MA>;
+			};
+
+			hdmi_gpio: hdmi-gpio {
+				rockchip,pins = <FUNC_TO_GPIO(HDMI_CEC)>, <FUNC_TO_GPIO(HDMI_SDA)>, <FUNC_TO_GPIO(HDMI_SCL)>, <FUNC_TO_GPIO(HDMI_HPD)>;
+				rockchip,drive = <VALUE_DRV_DEFAULT>;
+			};
+		};
 
 		gpio1_i2s0 {
 
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 60a5ba881d32..591da87ea3c6 100755
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -2,6 +2,7 @@
 
 #include "skeleton.dtsi"
 #include "rk3036-clocks.dtsi"
+#include "rk3036-pinctrl.dtsi"
 
 / {
 	compatible = "rockchip,rk3036";
@@ -405,9 +406,9 @@
 		reg = <0x20034000 0x4000>;
 		interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
 		rockchip,hdmi_lcdc_source = <0>;
-		//pinctrl-names = "default", "gpio";
-		//pinctrl-0 = <&i2c5_sda &i2c5_scl>;
-		//pinctrl-1 = <&i2c5_gpio>;
+		pinctrl-names = "default", "gpio";
+		pinctrl-0 = <&hdmi_cec &hdmi_sda &hdmi_scl &hdmi_hpd>;
+		pinctrl-1 = <&hdmi_gpio>;
 		clocks = <&clk_gates3 8>;
 		clock-names = "pclk_hdmi";	
 		status = "disabled";
-- 
2.34.1