Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Rob Herring and committed by
Arnd Bergmann
5f8456b1 0bb80ecc

+5 -5
+5 -5
arch/arm64/boot/dts/mediatek/mt8195.dtsi
··· 2957 2957 clock-names = "merge","merge_async"; 2958 2958 power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; 2959 2959 mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xc000 0x1000>; 2960 - mediatek,merge-mute = <1>; 2960 + mediatek,merge-mute; 2961 2961 resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE0_DL_ASYNC>; 2962 2962 }; 2963 2963 ··· 2970 2970 clock-names = "merge","merge_async"; 2971 2971 power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; 2972 2972 mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xd000 0x1000>; 2973 - mediatek,merge-mute = <1>; 2973 + mediatek,merge-mute; 2974 2974 resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE1_DL_ASYNC>; 2975 2975 }; 2976 2976 ··· 2983 2983 clock-names = "merge","merge_async"; 2984 2984 power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; 2985 2985 mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xe000 0x1000>; 2986 - mediatek,merge-mute = <1>; 2986 + mediatek,merge-mute; 2987 2987 resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE2_DL_ASYNC>; 2988 2988 }; 2989 2989 ··· 2996 2996 clock-names = "merge","merge_async"; 2997 2997 power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; 2998 2998 mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xf000 0x1000>; 2999 - mediatek,merge-mute = <1>; 2999 + mediatek,merge-mute; 3000 3000 resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE3_DL_ASYNC>; 3001 3001 }; 3002 3002 ··· 3009 3009 clock-names = "merge","merge_async"; 3010 3010 power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; 3011 3011 mediatek,gce-client-reg = <&gce0 SUBSYS_1c11XXXX 0x0000 0x1000>; 3012 - mediatek,merge-fifo-en = <1>; 3012 + mediatek,merge-fifo-en; 3013 3013 resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE4_DL_ASYNC>; 3014 3014 }; 3015 3015