mediatek: filogic: fix wm8960 dtc warnings

Add missing #address-cells, #size-cells and #sound-dai-cells to
fix the following dtc warnings:

mt7986a-bananapi-bpi-r3-respeaker-2mics.dtso:46.5-18: Warning (reg_format): /fragment@1/__overlay__/wm8960@1a:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1)
mt7986a-bananapi-bpi-r3-respeaker-2mics.dtso:29.11-31.7: Warning (sound_dai_property): /fragment@0/__overlay__/sound_wm8960/codec: Missing property '#sound-dai-cells' in node /fragment@1/__overlay__/wm8960@1a or bad phandle (referred from sound-dai[0])
mt7986a-rfb-spim-nand.dts:17.12-19.5: Warning (sound_dai_property): /sound_wm8960/platform: Missing property '#sound-dai-cells' in node /soc/audio-controller@11210000 or bad phandle (referred from sound-dai[0])
mt7986a-rfb-spim-nand.dts:21.9-23.5: Warning (sound_dai_property): /sound_wm8960/codec: Missing property '#sound-dai-cells' in node /soc/i2c@11008000/wm8960@1a or bad phandle (referred from sound-dai[0])

Signed-off-by: Shiji Yang <yangshiji66@outlook.com>

diff --git a/target/linux/mediatek/patches-6.6/862-arm64-dts-mt7986-add-afe.patch b/target/linux/mediatek/patches-6.6/862-arm64-dts-mt7986-add-afe.patch
index 29de7851d3f4555103ad52dee487766eff641b82..1b768f652c527125d1862e9f8c1c659541f085fe 100644 (file)
--- a/target/linux/mediatek/patches-6.6/862-arm64-dts-mt7986-add-afe.patch
+++ b/target/linux/mediatek/patches-6.6/862-arm64-dts-mt7986-add-afe.patch
@@ -9,13 +9,14 @@ Subject: [PATCH] arm64: dts: mt7986: add afe
 
 --- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
 +++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
-@@ -202,6 +202,28 @@
+@@ -202,6 +202,29 @@
                        #interrupt-cells = <2>;
                };
  
 +              afe: audio-controller@11210000 {
 +                      compatible = "mediatek,mt7986-afe";
 +                      reg = <0 0x11210000 0 0x9000>;
++                      #sound-dai-cells = <0>;
 +                      interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
 +                      clocks = <&infracfg CLK_INFRA_AUD_BUS_CK>,
 +                               <&infracfg CLK_INFRA_AUD_26M_CK>,

diff --git a/target/linux/mediatek/patches-6.6/863-arm64-dts-mt7986-add-sound-wm8960.patch b/target/linux/mediatek/patches-6.6/863-arm64-dts-mt7986-add-sound-wm8960.patch
index 15e30dec56cf426757d3585654f8dd550cc2b0b4..b16a63ada9d9bb7cfb5c55d17cb83e8b23b6cceb 100644 (file)
--- a/target/linux/mediatek/patches-6.6/863-arm64-dts-mt7986-add-sound-wm8960.patch
+++ b/target/linux/mediatek/patches-6.6/863-arm64-dts-mt7986-add-sound-wm8960.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] arm64: dts: mt7986: add sound wm8960
 
 --- a/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nand.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nand.dts
-@@ -4,6 +4,35 @@
+@@ -4,6 +4,36 @@
  
  / {
        compatible = "mediatek,mt7986a-rfb-snand";
@@ -40,12 +40,13 @@ Subject: [PATCH] arm64: dts: mt7986: add sound wm8960
 +
 +      wm8960: wm8960@1a {
 +              compatible = "wlf,wm8960";
++              #sound-dai-cells = <0>;
 +              reg = <0x1a>;
 +      };
  };
  
  &spi0 {
-@@ -50,3 +79,13 @@
+@@ -50,3 +80,13 @@
  &wifi {
        mediatek,mtd-eeprom = <&factory 0>;
  };

diff --git a/target/linux/mediatek/patches-6.6/864-arm64-dts-mt7986-add-sound-overlay-for-bpi-r3.patch b/target/linux/mediatek/patches-6.6/864-arm64-dts-mt7986-add-sound-overlay-for-bpi-r3.patch
index 784ae5b6139e1cb3949e58e242a3db1afeffb5bf..3ce6fdd4ade29b4a4b12f387fd98e9d9326d2c70 100644 (file)
--- a/target/linux/mediatek/patches-6.6/864-arm64-dts-mt7986-add-sound-overlay-for-bpi-r3.patch
+++ b/target/linux/mediatek/patches-6.6/864-arm64-dts-mt7986-add-sound-overlay-for-bpi-r3.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-respeaker-2mics.dtso
-@@ -0,0 +1,62 @@
+@@ -0,0 +1,65 @@
 +// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 +/*
 + * Copyright (C) 2023 MediaTek Inc.
@@ -39,6 +39,8 @@
 +      fragment@1 {
 +              target = <&i2c0>;
 +              __overlay__ {
++                      #address-cells = <1>;
++                      #size-cells = <0>;
 +                      pinctrl-names = "default";
 +                      pinctrl-0 = <&i2c_pins>;
 +                      clock-frequency = <400000>;
@@ -46,6 +48,7 @@
 +
 +                      wm8960: wm8960@1a {
 +                              compatible = "wlf,wm8960";
++                              #sound-dai-cells = <0>;
 +                              reg = <0x1a>;
 +                      };
 +              };

diff --git a/target/linux/mediatek/patches-6.6/941-arm64-dts-mt7986-move-cpuboot-in-a-dedicated-node.patch b/target/linux/mediatek/patches-6.6/941-arm64-dts-mt7986-move-cpuboot-in-a-dedicated-node.patch
index 73714fbd6fd620c8bd296e93ad853a44b62e21e4..a75a297e04878510a26da6dd5af75ee32e735479 100644 (file)
--- a/target/linux/mediatek/patches-6.6/941-arm64-dts-mt7986-move-cpuboot-in-a-dedicated-node.patch
+++ b/target/linux/mediatek/patches-6.6/941-arm64-dts-mt7986-move-cpuboot-in-a-dedicated-node.patch
@@ -24,7 +24,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
        };
  
        soc {
-@@ -532,10 +526,11 @@
+@@ -533,10 +527,11 @@
                        interrupt-parent = <&gic>;
                        interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>;
                        memory-region = <&wo_emi0>, <&wo_ilm0>, <&wo_dlm0>,
@@ -38,7 +38,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
                };
  
                wed1: wed@15011000 {
-@@ -545,10 +540,11 @@
+@@ -546,10 +541,11 @@
                        interrupt-parent = <&gic>;
                        interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>;
                        memory-region = <&wo_emi1>, <&wo_ilm1>, <&wo_dlm1>,
@@ -52,7 +52,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
                };
  
                eth: ethernet@15100000 {
-@@ -606,6 +602,11 @@
+@@ -607,6 +603,11 @@
                        interrupts = <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>;
                };
  

diff --git a/target/linux/mediatek/patches-6.6/945-arm64-dts-mt7986-move-ilm-in-a-dedicated-node.patch b/target/linux/mediatek/patches-6.6/945-arm64-dts-mt7986-move-ilm-in-a-dedicated-node.patch
index e2dce9ffa313aec5e567752092d91d8d098062ad..c64b3b37c3bd7c7bf42a677c67ec211903420794 100644 (file)
--- a/target/linux/mediatek/patches-6.6/945-arm64-dts-mt7986-move-ilm-in-a-dedicated-node.patch
+++ b/target/linux/mediatek/patches-6.6/945-arm64-dts-mt7986-move-ilm-in-a-dedicated-node.patch
@@ -34,7 +34,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
                wo_data: wo-data@4fd80000 {
                        reg = <0 0x4fd80000 0 0x240000>;
                        no-map;
-@@ -525,11 +515,10 @@
+@@ -526,11 +516,10 @@
                        reg = <0 0x15010000 0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>;
@@ -49,7 +49,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
                        mediatek,wo-cpuboot = <&wo_cpuboot>;
                };
  
-@@ -539,11 +528,10 @@
+@@ -540,11 +529,10 @@
                        reg = <0 0x15011000 0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>;
@@ -64,7 +64,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
                        mediatek,wo-cpuboot = <&wo_cpuboot>;
                };
  
-@@ -602,6 +590,16 @@
+@@ -603,6 +591,16 @@
                        interrupts = <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>;
                };
  

diff --git a/target/linux/mediatek/patches-6.6/946-arm64-dts-mt7986-move-dlm-in-a-dedicated-node.patch b/target/linux/mediatek/patches-6.6/946-arm64-dts-mt7986-move-dlm-in-a-dedicated-node.patch
index a972f235f2535b77a6ad52400e1074e382476598..13fe1f792c41901a95422e4b6ff7a0bc4c38c1ad 100644 (file)
--- a/target/linux/mediatek/patches-6.6/946-arm64-dts-mt7986-move-dlm-in-a-dedicated-node.patch
+++ b/target/linux/mediatek/patches-6.6/946-arm64-dts-mt7986-move-dlm-in-a-dedicated-node.patch
@@ -34,7 +34,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
        };
  
        soc {
-@@ -515,10 +505,11 @@
+@@ -516,10 +506,11 @@
                        reg = <0 0x15010000 0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>;
@@ -48,7 +48,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
                        mediatek,wo-cpuboot = <&wo_cpuboot>;
                };
  
-@@ -528,10 +519,11 @@
+@@ -529,10 +520,11 @@
                        reg = <0 0x15011000 0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>;
@@ -62,7 +62,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
                        mediatek,wo-cpuboot = <&wo_cpuboot>;
                };
  
-@@ -600,6 +592,16 @@
+@@ -601,6 +593,16 @@
                        reg = <0 0x151f0000 0 0x8000>;
                };