arm: dts: rk3288-evb: resolve conflict between edp_panel and mipi_panel
authorxubilv <xbl@rock-chips.com>
Tue, 18 Apr 2017 07:28:16 +0000 (15:28 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Wed, 19 Apr 2017 09:23:41 +0000 (17:23 +0800)
commit8204e1bfecd6967a1f74c6e0848fc122bacf8245
treeb8eef9cdac88a70ae0238d92f4571fd23fed23f7
parent82412975aa616542273b78a5ca781a70dc5ec5ae
arm: dts: rk3288-evb: resolve conflict between edp_panel and mipi_panel

if edp_panel add disp_timings, it will conflict with mipi_panel.

Change-Id: Ic6d9bcb5f38670d203ca9c220354f1ac476ccbfb
Signed-off-by: xubilv <xbl@rock-chips.com>
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/rk3288-android.dtsi
arch/arm/boot/dts/rk3288-evb-rk818-edp.dts [new file with mode: 0644]
arch/arm/boot/dts/rk3288-evb-rk818-mipi.dts [new file with mode: 0644]
arch/arm/boot/dts/rk3288-evb-rk818.dts [deleted file]
arch/arm/boot/dts/rk3288-evb.dtsi