Skip to content

Commit

Permalink
ARM: dts: exynos5420: remove disp_pd
Browse files Browse the repository at this point in the history
This was caused by commit 5a8da52 ("ARM: dts: exynos5420: add dsi
node"), which conflicted with d51cad7 ("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 <[email protected]>
Signed-off-by: Olof Johansson <[email protected]>
  • Loading branch information
sfrothwell authored and olofj committed Aug 9, 2014
1 parent 01601b3 commit ee34fb9
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion arch/arm/boot/dts/exynos5420.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down

0 comments on commit ee34fb9

Please sign in to comment.