ARM: dts: exynos: Add HDMI CEC device to Exynos5 SoC family

Exynos5250 and Exynos542x SoCs have the same CEC hardware module as
Exynos4 SoC series, so enable support for it using the same compatible
string.

Tested on Odroid XU3 (Exynos5422) and Google Snow (Exynos5250) boards.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
index 2f6ab32b59548cd29a618db65d14f643cdaa2001..1fd122db18e6cc0a8404228d3bf8fde539ed255a 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
@@ -589,6 +589,13 @@
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
+
+       hdmi_cec: hdmi-cec {
+               samsung,pins = "gpx3-6";
+               samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+               samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+       };
 };
 
 &pinctrl_1 {

diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index 8f3a804307488575fbf6b98e8252a7b0a92306ee..e1d293dbbe5d95623ddd8b26a951c5e3360afb24 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -272,6 +272,10 @@
        vdd_pll-supply = <&ldo8_reg>;
 };
 
+&hdmicec {
+       status = "okay";
+};
+
 &i2c_0 {
        status = "okay";
        samsung,i2c-sda-delay = <100>;

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 79c9c885613afb4ddaa434a1b5d5c40565e537e9..fbdc1d53a2ce6685ad38533309b873a7910ecb83 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -689,6 +689,19 @@
                        samsung,syscon-phandle = <&pmu_system_controller>;
                };
 
+               hdmicec: cec@101B0000 {
+                       compatible = "samsung,s5p-cec";
+                       reg = <0x101B0000 0x200>;
+                       interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&clock CLK_HDMI_CEC>;
+                       clock-names = "hdmicec";
+                       samsung,syscon-phandle = <&pmu_system_controller>;
+                       hdmi-phandle = <&hdmi>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&hdmi_cec>;
+                       status = "disabled";
+               };
+
                mixer@14450000 {
                        compatible = "samsung,exynos5250-mixer";
                        reg = <0x14450000 0x10000>;

diff --git a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
index 3924b4fafe727189c9dea017a0607bb32b264d44..65aa0e300c23b28b2d216f70afb404cde676b3fe 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
@@ -67,6 +67,13 @@
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
        };
+
+       hdmi_cec: hdmi-cec {
+               samsung,pins = "gpx3-6";
+               samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+               samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
+       };
 };
 
 &pinctrl_1 {

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 0db0bcf8da3652a3cf5662b38cfcfb89118732c7..acd77b10b3df23e3f415e184a6c057431488da55 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -624,6 +624,19 @@
                        reg = <0x145D0000 0x20>;
                };
 
+               hdmicec: cec@101B0000 {
+                       compatible = "samsung,s5p-cec";
+                       reg = <0x101B0000 0x200>;
+                       interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&clock CLK_HDMI_CEC>;
+                       clock-names = "hdmicec";
+                       samsung,syscon-phandle = <&pmu_system_controller>;
+                       hdmi-phandle = <&hdmi>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&hdmi_cec>;
+                       status = "disabled";
+               };
+
                mixer: mixer@14450000 {
                        compatible = "samsung,exynos5420-mixer";
                        reg = <0x14450000 0x10000>;

diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 657535e2e3cc80bfd56fdb10f7cfcfecb2c1f3b7..f92f957412073279a3be9713794bb2336dbf4752 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -264,6 +264,10 @@
        vdd-supply = <&ldo6_reg>;
 };
 
+&hdmicec {
+       status = "okay";
+};
+
 &hsi2c_4 {
        status = "okay";