summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>2017-06-13 07:47:50 +0200
committerKlaus Goger <klaus.goger@theobroma-systems.com>2017-06-13 07:51:45 +0200
commit8f829fc3095ad2e730ffb7dab142cc25fa49dd92 (patch)
tree07ae9f1d71c08d204ac9e6a25dee15536f6c19b5
parent59d768542ca113e808ca78038224d80a290ae9c6 (diff)
arm64: dts: puma: add hdmi+mipidsi variant
The dts "rk3399-puma-hdmi+mipidsi.dts" enables both the MIPI-DSI and the HDMI display output. Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
-rw-r--r--arch/arm64/boot/dts/rockchip/Makefile1
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-puma-hdmi+mipidsi.dts25
2 files changed, 26 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 1df41201905f..ce42fa15bb55 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -37,6 +37,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-edp.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-hdmi+edp.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-mipidsi.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-hdmi+mipidsi.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rv1-android.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator-box-android-6.0.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator-box.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-hdmi+mipidsi.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-hdmi+mipidsi.dts
new file mode 100644
index 000000000000..549151986219
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-hdmi+mipidsi.dts
@@ -0,0 +1,25 @@
+/*
+ * Theobroma Systems RK3399-Q7 "Puma" with MIPI-DSI and HDMI enabled
+ */
+#include "rk3399-puma-mipidsi.dts"
+
+// Enable HDMI on VOPB
+&hdmi {
+ status = "okay";
+};
+&route_hdmi {
+ // defined in rk3399-puma.dts: connect = <&vopb_out_hdmi>;
+ status = "okay";
+};
+
+// Enable VOPL and move MIPI-DSI there
+&vopl {
+ status = "okay";
+};
+&vopl_mmu {
+ status = "okay";
+};
+&route_mipi {
+ // default in rk3399-linux.dtsi: connect = <&vopb_out_mipi>;
+ connect = <&vopl_out_mipi>;
+};