From 1dd40af1d488422eeb445ab570ac13d5599a4c05 Mon Sep 17 00:00:00 2001
From: Zheng Yang <zhengyang@rock-chips.com>
Date: Sun, 1 Feb 2015 16:28:03 +0800
Subject: [PATCH] rk3288 hdmi: add cec clk and pinctrl.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
---
 arch/arm/boot/dts/rk3288-pinctrl.dtsi | 14 ++++++++++++++
 arch/arm/boot/dts/rk3288.dtsi         |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/rk3288-pinctrl.dtsi b/arch/arm/boot/dts/rk3288-pinctrl.dtsi
index 32d91feedde5..8046018785ad 100755
--- a/arch/arm/boot/dts/rk3288-pinctrl.dtsi
+++ b/arch/arm/boot/dts/rk3288-pinctrl.dtsi
@@ -951,6 +951,20 @@
 				rockchip,pull = <VALUE_PULL_DISABLE>;
 			};
 		};
+
+		gpio7_cec {
+			hdmi_cec: hdmi-cec {
+				rockchip,pins = <EDPHDMI_CECINOUTRESERVED>;
+				rockchip,pull = <VALUE_PULL_NORMAL>;
+				rockchip,drive = <VALUE_DRV_DEFAULT>;
+			};
+
+			hdmi_cec_gpio: hdmi-cec-gpio {
+				rockchip,pins = <FUNC_TO_GPIO(EDPHDMI_CECINOUTRESERVED)>;
+				rockchip,pull = <VALUE_PULL_DISABLE>;
+				rockchip,drive = <VALUE_DRV_DEFAULT>;
+			};
+		};
 		//to add
 
 
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 621110a49a67..a122e61efd9f 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -731,10 +731,10 @@
 		reg = <0xff980000 0x20000>;
 		interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
 		pinctrl-names = "default", "sleep";
-		pinctrl-0 = <&i2c5_sda &i2c5_scl>;
+		pinctrl-0 = <&i2c5_sda &i2c5_scl &hdmi_cec>;
 		pinctrl-1 = <&i2c5_gpio>;
-		clocks = <&clk_gates16 9>, <&clk_gates5 12>;
-		clock-names = "pclk_hdmi", "hdcp_clk_hdmi";
+		clocks = <&clk_gates16 9>, <&clk_gates5 12>, <&clk_gates5 11>;
+		clock-names = "pclk_hdmi", "hdcp_clk_hdmi", "cec_clk_hdmi";
 		status = "disabled";
 	};
 
-- 
2.34.1