From 9e93d2aa4d970713c5c5d24d845baf19d15adf7d Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Sat, 9 Aug 2014 08:25:50 -0700 Subject: ARM: dts: exynos5420: remove disp_pd This was caused by commit 5a8da524049c ("ARM: dts: exynos5420: add dsi node"), which conflicted with d51cad7df871 ("ARM: dts: remove display power domain for exynos5420"). The DTS addition should never have been merged through the DRM tree in the first place, and it lacked an ack from the platform maintainer (who would have known that the disp_pd reference got removed). Signed-off-by: Stephen Rothwell Signed-off-by: Olof Johansson --- arch/arm/boot/dts/exynos5420.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 95ec37dff3e..bfe056d9148 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -525,7 +525,6 @@ compatible = "samsung,exynos5410-mipi-dsi"; reg = <0x14500000 0x10000>; interrupts = <0 82 0>; - samsung,power-domain = <&disp_pd>; phys = <&mipi_phy 1>; phy-names = "dsim"; clocks = <&clock CLK_DSIM1>, <&clock CLK_SCLK_MIPI1>; -- cgit v1.2.3