diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-09 11:25:50 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-08-09 11:25:50 -0400 |
| commit | ee34fb97a96ceac3334705ebab8b541ca291699f (patch) | |
| tree | d36666f05a61ae37b307ba98d1844391463e2254 /arch/arm | |
| parent | 01601b349582caa617618b5fa7d9b08bd328626a (diff) | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/exynos5420.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 95ec37dff3e8..bfe056d9148c 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi | |||
| @@ -525,7 +525,6 @@ | |||
| 525 | compatible = "samsung,exynos5410-mipi-dsi"; | 525 | compatible = "samsung,exynos5410-mipi-dsi"; |
| 526 | reg = <0x14500000 0x10000>; | 526 | reg = <0x14500000 0x10000>; |
| 527 | interrupts = <0 82 0>; | 527 | interrupts = <0 82 0>; |
| 528 | samsung,power-domain = <&disp_pd>; | ||
| 529 | phys = <&mipi_phy 1>; | 528 | phys = <&mipi_phy 1>; |
| 530 | phy-names = "dsim"; | 529 | phy-names = "dsim"; |
| 531 | clocks = <&clock CLK_DSIM1>, <&clock CLK_SCLK_MIPI1>; | 530 | clocks = <&clock CLK_DSIM1>, <&clock CLK_SCLK_MIPI1>; |