diff options
author | Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com> | 2017-06-09 11:53:57 +0200 |
---|---|---|
committer | Klaus Goger <klaus.goger@theobroma-systems.com> | 2017-06-13 07:51:22 +0200 |
commit | f1019da982cf67b81f99d35247ecaa2652cddc74 (patch) | |
tree | 48d92386a67fc0efbe94a2d9bc0d0c5ac71fe89d | |
parent | 076ef7b75cfea3a4200a787e53a98cab08fd4aa6 (diff) |
arm64: rk3399-puma-mipidsi.dts: drop duplicate assignemnts
These values have already been set in the parent dts.
Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
-rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399-puma-edp.dts | 1 | ||||
-rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399-puma-mipidsi.dts | 9 | ||||
-rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399-puma.dts | 1 |
3 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-edp.dts index 8f7531bb49da..484fcfda28b5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma-edp.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-edp.dts @@ -54,6 +54,7 @@ status = "okay"; }; +// TODO: test if this is really needed, then delete it. &edp_in_vopb { status = "enabled"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-mipidsi.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-mipidsi.dts index f30ff4d11c39..bb5eb399ebe1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma-mipidsi.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-mipidsi.dts @@ -9,10 +9,6 @@ }; }; -&vopl { - status = "disabled"; -}; - &hdmi { status = "disabled"; }; @@ -21,12 +17,9 @@ status = "disabled"; }; -&vopb { - status = "okay"; -}; - &route_mipi { status = "okay"; + // default in rk3399-linux.dtsi: connect = <&vopb_out_mipi>; }; &mipi_dsi { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma.dts index 773b74cd3355..f97fa56ae6ea 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dts @@ -402,6 +402,7 @@ &route_hdmi { status = "okay"; + // default in rk3399-linux.dtsi: connect = <&vopl_out_hdmi>; connect = <&vopb_out_hdmi>; }; |