Skip to content

Commit 5f8456b

Browse files
robherringarndb
authored andcommitted
arm64: dts: mediatek: Fix "mediatek,merge-mute" and "mediatek,merge-fifo-en" types
"mediatek,merge-mute" and "mediatek,merge-fifo-en" properties are defined and used as boolean properties which in DT have no value. Signed-off-by: Rob Herring <robh@kernel.org> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://lore.kernel.org/r/20230830195650.704737-1-robh@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 0bb80ec commit 5f8456b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

arch/arm64/boot/dts/mediatek/mt8195.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2957,7 +2957,7 @@
29572957
clock-names = "merge","merge_async";
29582958
power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>;
29592959
mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xc000 0x1000>;
2960-
mediatek,merge-mute = <1>;
2960+
mediatek,merge-mute;
29612961
resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE0_DL_ASYNC>;
29622962
};
29632963

@@ -2970,7 +2970,7 @@
29702970
clock-names = "merge","merge_async";
29712971
power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>;
29722972
mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xd000 0x1000>;
2973-
mediatek,merge-mute = <1>;
2973+
mediatek,merge-mute;
29742974
resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE1_DL_ASYNC>;
29752975
};
29762976

@@ -2983,7 +2983,7 @@
29832983
clock-names = "merge","merge_async";
29842984
power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>;
29852985
mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xe000 0x1000>;
2986-
mediatek,merge-mute = <1>;
2986+
mediatek,merge-mute;
29872987
resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE2_DL_ASYNC>;
29882988
};
29892989

@@ -2996,7 +2996,7 @@
29962996
clock-names = "merge","merge_async";
29972997
power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>;
29982998
mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xf000 0x1000>;
2999-
mediatek,merge-mute = <1>;
2999+
mediatek,merge-mute;
30003000
resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE3_DL_ASYNC>;
30013001
};
30023002

@@ -3009,7 +3009,7 @@
30093009
clock-names = "merge","merge_async";
30103010
power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>;
30113011
mediatek,gce-client-reg = <&gce0 SUBSYS_1c11XXXX 0x0000 0x1000>;
3012-
mediatek,merge-fifo-en = <1>;
3012+
mediatek,merge-fifo-en;
30133013
resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE4_DL_ASYNC>;
30143014
};
30153015

0 commit comments

Comments
 (0)