summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2014-08-09 15:25:50 (GMT)
committerHyungwon Hwang <human.hwang@samsung.com>2014-12-17 07:18:12 (GMT)
commit9e93d2aa4d970713c5c5d24d845baf19d15adf7d (patch)
treebbab0fa4cb5856230fb4e895a60530ba01675651
parent765f8c696a190d0a807693aa9628b9d9dbd09088 (diff)
downloadlinux-3.10-9e93d2aa4d970713c5c5d24d845baf19d15adf7d.zip
linux-3.10-9e93d2aa4d970713c5c5d24d845baf19d15adf7d.tar.gz
linux-3.10-9e93d2aa4d970713c5c5d24d845baf19d15adf7d.tar.bz2
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 <sfr@canb.auug.org.au> Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/boot/dts/exynos5420.dtsi1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 95ec37d..bfe056d 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>;