Add "brcm,bcm4329-fmac" as fallback compatible for wireless devices that
used PCI ID based compatible. So that can pass the compatible check in
driver.

Signed-off-by: Jacobe Zang <jacobe.zang@wesion.com>
---
 .../bindings/net/wireless/brcm,bcm4329-fmac.yaml     | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml b/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml
index a3607d55ef367..4870caed5f75e 100644
--- a/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml
+++ b/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml
@@ -27,7 +27,6 @@ properties:
               - brcm,bcm4341b0-fmac
               - brcm,bcm4341b4-fmac
               - brcm,bcm4341b5-fmac
-              - brcm,bcm4329-fmac
               - brcm,bcm4330-fmac
               - brcm,bcm4334-fmac
               - brcm,bcm43340-fmac
@@ -46,14 +45,17 @@ properties:
               - cypress,cyw43012-fmac
               - infineon,cyw43439-fmac
           - const: brcm,bcm4329-fmac
-      - enum:
-          - brcm,bcm4329-fmac
-          - pci14e4,43dc  # BCM4355
-          - pci14e4,4464  # BCM4364
-          - pci14e4,4488  # BCM4377
-          - pci14e4,4425  # BCM4378
-          - pci14e4,4433  # BCM4387
-          - pci14e4,449d  # BCM43752
+      - items:
+          - enum:
+              - brcm,bcm4329-fmac
+              - pci14e4,43dc  # BCM4355
+              - pci14e4,4464  # BCM4364
+              - pci14e4,4488  # BCM4377
+              - pci14e4,4425  # BCM4378
+              - pci14e4,4433  # BCM4387
+              - pci14e4,449d  # BCM43752
+          - const: brcm,bcm4329-fmac
+      - const: brcm,bcm4329-fmac
 
   reg:
     description: SDIO function number for the device (for most cases

-- 
2.34.1

On 8/28/2024 9:40 AM, Jacobe Zang wrote:
> Add "brcm,bcm4329-fmac" as fallback compatible for wireless devices that
> used PCI ID based compatible. So that can pass the compatible check in
> driver.

Hi Jacobe,

Using the driver implementation as an argument for adding the fallback 
compatible to the bindings does sound wrong. The most importants rule 
about the bindings is that it is independent of kernel and/or driver 
implementation.

Now this actually overlaps my patch series from couple of weeks ago 
which also covered some other existing DTS files for Apple platforms. So 
my proposal here is to drop this patch for now. I will give it another 
shot in v2 of my series after yours is (finally) applied. We can always 
hope ;-) That does also mean the compatible check in the driver should 
not be moved in brcmf_of_probe(). Also the Khadas Edge2 DTS file should 
not use the fallback compatible yet. I can include it in my series later.

Regards,
Arend

> Signed-off-by: Jacobe Zang <jacobe.zang@wesion.com>
> ---
>   .../bindings/net/wireless/brcm,bcm4329-fmac.yaml     | 20 +++++++++++---------
>   1 file changed, 11 insertions(+), 9 deletions(-)

On 2024/8/28 16:50, Arend van Spriel wrote:
> On 8/28/2024 9:40 AM, Jacobe Zang wrote:
>> Add "brcm,bcm4329-fmac" as fallback compatible for wireless devices that
>> used PCI ID based compatible. So that can pass the compatible check in
>> driver.
> 
> Hi Jacobe,
> 
> Using the driver implementation as an argument for adding the fallback 

Yes, so I changed the argument in v13 which seemed doesn't matter now ;-)

> compatible to the bindings does sound wrong. The most importants rule 
> about the bindings is that it is independent of kernel and/or driver 
> implementation.
> 
> Now this actually overlaps my patch series from couple of weeks ago 
> which also covered some other existing DTS files for Apple platforms. So 
> my proposal here is to drop this patch for now. I will give it another 

Okay ;-)

> shot in v2 of my series after yours is (finally) applied. We can always 
> hope ;-) That does also mean the compatible check in the driver should 
> not be moved in brcmf_of_probe(). Also the Khadas Edge2 DTS file should 

I see. Thanks for your information.

> not use the fallback compatible yet. I can include it in my series later.
> 
> Regards,
> Arend
> 
>> Signed-off-by: Jacobe Zang <jacobe.zang@wesion.com>
>> ---
>>   .../bindings/net/wireless/brcm,bcm4329-fmac.yaml     | 20 ++++++++++ 
>> +---------
>>   1 file changed, 11 insertions(+), 9 deletions(-)

-- 
Best Regards
Jacobe