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>

diff --git a/arch/arm64/boot/dts/mediatek/mt8195.dtsi b/arch/arm64/boot/dts/mediatek/mt8195.dtsi
index 4dbbf8f..a9e52b5 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8195.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8195.dtsi
@@ -2957,7 +2957,7 @@
                        clock-names = "merge","merge_async";
                        power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>;
                        mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xc000 0x1000>;
-                       mediatek,merge-mute = <1>;
+                       mediatek,merge-mute;
                        resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE0_DL_ASYNC>;
                };
 
@@ -2970,7 +2970,7 @@
                        clock-names = "merge","merge_async";
                        power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>;
                        mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xd000 0x1000>;
-                       mediatek,merge-mute = <1>;
+                       mediatek,merge-mute;
                        resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE1_DL_ASYNC>;
                };
 
@@ -2983,7 +2983,7 @@
                        clock-names = "merge","merge_async";
                        power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>;
                        mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xe000 0x1000>;
-                       mediatek,merge-mute = <1>;
+                       mediatek,merge-mute;
                        resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE2_DL_ASYNC>;
                };
 
@@ -2996,7 +2996,7 @@
                        clock-names = "merge","merge_async";
                        power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>;
                        mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xf000 0x1000>;
-                       mediatek,merge-mute = <1>;
+                       mediatek,merge-mute;
                        resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE3_DL_ASYNC>;
                };
 
@@ -3009,7 +3009,7 @@
                        clock-names = "merge","merge_async";
                        power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>;
                        mediatek,gce-client-reg = <&gce0 SUBSYS_1c11XXXX 0x0000 0x1000>;
-                       mediatek,merge-fifo-en = <1>;
+                       mediatek,merge-fifo-en;
                        resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE4_DL_ASYNC>;
                };