ARM: dts: exynos5420: remove disp_pd

This was caused by commit c69a14243647 ("ARM: dts: exynos5420: add dsi
node"), which conflicted with 0080fb0305c2 ("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 <sfr@canb.auug.org.au>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 95ec37dff3e85fca734a36061072d6ef07444224..bfe056d9148ce8d476b30c9fb54981154fefab5f 100644 (file)
--- 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>;