From c55af083a01ebd1c4b1b06931542e68872ada867 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Fri, 15 Sep 2017 11:11:20 +0200 Subject: ARM: dts: exynos: Move HDMI PHY node from boards to exynos5250.dtsi All Exynos 5250 SoCs have HDMI PHY connected via dedicated I2C bus (bus number 8), so HDMI PHY should be defined in exynos5250.dtsi instead of duplicating it in every board, which enables HDMI support. Signed-off-by: Marek Szyprowski Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/exynos5250-spring.dts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'arch/arm/boot/dts/exynos5250-spring.dts') diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts index d53bfcbeb39c..ebf0b2d5b363 100644 --- a/arch/arm/boot/dts/exynos5250-spring.dts +++ b/arch/arm/boot/dts/exynos5250-spring.dts @@ -94,7 +94,6 @@ hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&hdmi_hpd_irq>; - phy = <&hdmiphy>; ddc = <&i2c_2>; hdmi-en-supply = <&ldo8_reg>; vdd-supply = <&ldo8_reg>; @@ -412,13 +411,9 @@ &i2c_8 { status = "okay"; + /* used by HDMI PHY */ samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <378000>; - - hdmiphy: hdmiphy@38 { - compatible = "samsung,exynos4212-hdmiphy"; - reg = <0x38>; - }; }; &i2s0 { -- cgit From c9c51fd2536e708bbb65873afd3be2f3ac42e951 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Fri, 15 Sep 2017 11:11:21 +0200 Subject: ARM: dts: exynos: Cleanup HDMI DCC definitions on Exynos5250 and Exynos542x boards Commit 2b7681326dc2 ("drm/exynos: hdmi: remove the i2c drivers and use") merged to v3.15 kernel added a required 'ddc' property to Exynos HDMI device tree bindings, which should point to i2c bus used for handling DDC (mainly reading display's EDID information). It has been enough time to convert all boards to use new bindings, but sadly due to copy/paste design the old approach using separate node with 'samsung,exynos4210-hdmiddc' compatible was used also for many new boards. This patch finally converts all boards to the new approach and unifies HDMI DDC definition across all Exynos boards. Signed-off-by: Marek Szyprowski Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/exynos5250-spring.dts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'arch/arm/boot/dts/exynos5250-spring.dts') diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts index ebf0b2d5b363..b3cc22568033 100644 --- a/arch/arm/boot/dts/exynos5250-spring.dts +++ b/arch/arm/boot/dts/exynos5250-spring.dts @@ -361,13 +361,9 @@ &i2c_2 { status = "okay"; + /* used by HDMI DDC */ samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <66000>; - - hdmiddc@50 { - compatible = "samsung,exynos4210-hdmiddc"; - reg = <0x50>; - }; }; &i2c_3 { -- cgit From e96849e3ae73d20a00b44fe22b74b733fa2d89c1 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Fri, 15 Sep 2017 11:11:22 +0200 Subject: ARM: dts: exynos: Add status property to Exynos 5250 HDMI and Mixer nodes HDMI support requires some additional off-SoC logic, so HDMI and Mixer devices should be disabled by default in SoC dtsi and enabled then in each board dts. This patch unifies HDMI and Mixer handling with other Exynos SoCs. Signed-off-by: Marek Szyprowski Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/exynos5250-spring.dts | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'arch/arm/boot/dts/exynos5250-spring.dts') diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts index b3cc22568033..47dbc50546c1 100644 --- a/arch/arm/boot/dts/exynos5250-spring.dts +++ b/arch/arm/boot/dts/exynos5250-spring.dts @@ -91,6 +91,7 @@ }; &hdmi { + status = "okay"; hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&hdmi_hpd_irq>; @@ -416,6 +417,10 @@ status = "okay"; }; +&mixer { + status = "okay"; +}; + &mmc_0 { status = "okay"; broken-cd; -- cgit