[PATCH 17/27] arm64: dts: mt8195: add merge node

From: Tinghan Shen
Date: Tue Jun 15 2021 - 13:33:21 EST


From: Jason-JH Lin <jason-jh.lin@xxxxxxxxxxxx>

add merge node

Signed-off-by: Jason-JH Lin <jason-jh.lin@xxxxxxxxxxxx>
---
arch/arm64/boot/dts/mediatek/mt8195.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/arch/arm64/boot/dts/mediatek/mt8195.dtsi b/arch/arm64/boot/dts/mediatek/mt8195.dtsi
index f362288ad828..34f7e99d1fd2 100644
--- a/arch/arm64/boot/dts/mediatek/mt8195.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8195.dtsi
@@ -1987,6 +1987,14 @@
power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS0>;
};

+ merge0: disp_vpp_merge0@1c014000 {
+ compatible = "mediatek,mt8195-disp-merge";
+ reg = <0 0x1c014000 0 0x1000>;
+ interrupts = <GIC_SPI 656 IRQ_TYPE_LEVEL_HIGH 0>;
+ clocks = <&vdosys0 CLK_VDO0_VPP_MERGE0>;
+ power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS0>;
+ };
+
smi_common0: smi@1c01b000 {
compatible = "mediatek,mt8195-smi-common";
mediatek,common-id = <0>;
--
2.18.0