diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2017-09-15 11:11:23 +0200 |
---|---|---|
committer | Krzysztof Kozlowski <krzk@kernel.org> | 2017-09-19 19:52:35 +0200 |
commit | 1cb686c08d1213d4b0c2bfbafa5882450078c82e (patch) | |
tree | 4acc4d11a9e86de0cf370f71089a7159035e99c2 | |
parent | e96849e3ae73d20a00b44fe22b74b733fa2d89c1 (diff) | |
download | linux-1cb686c08d1213d4b0c2bfbafa5882450078c82e.tar.gz linux-1cb686c08d1213d4b0c2bfbafa5882450078c82e.tar.bz2 linux-1cb686c08d1213d4b0c2bfbafa5882450078c82e.zip |
ARM: dts: exynos: Add status property to Exynos 542x Mixer nodes
HDMI support requires some additional off-SoC logic, so Mixer device (part
of HDMI display path) should be disabled by default in SoC dtsi and enabled
then in each board dts. This patch unifies Mixer handling with other
Exynos SoCs.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
-rw-r--r-- | arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5420-smdk5420.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5420.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 4 |
5 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts index ee1bb9b8b366..b0ac10f124e6 100644 --- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts +++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts @@ -360,6 +360,10 @@ status = "okay"; }; +&mixer { + status = "okay"; +}; + &mmc_0 { status = "okay"; broken-cd; diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts index 683a4cfb4a23..38af8769711c 100644 --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts @@ -696,6 +696,10 @@ status = "okay"; }; +&mixer { + status = "okay"; +}; + /* eMMC flash */ &mmc_0 { status = "okay"; diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts index cc44dc60d81e..310d8637ce9f 100644 --- a/arch/arm/boot/dts/exynos5420-smdk5420.dts +++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts @@ -352,6 +352,10 @@ status = "okay"; }; +&mixer { + status = "okay"; +}; + &mmc_0 { status = "okay"; broken-cd; diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 6166730215db..88e5d6d3f901 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -646,6 +646,7 @@ clock-names = "mixer", "hdmi", "sclk_hdmi"; power-domains = <&disp_pd>; iommus = <&sysmmu_tv>; + status = "disabled"; }; rotator: rotator@11C00000 { diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi index 9b65d39c6b0e..305c2a2b728c 100644 --- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi +++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi @@ -729,6 +729,10 @@ status = "okay"; }; +&mixer { + status = "okay"; +}; + &mmc_0 { status = "okay"; mmc-pwrseq = <&emmc_pwrseq>; |