Broadcom driver need to check "brcm,bcm4329-fmac" compatible. Before
PCIe devices used PCI ID as base compabile so add it as fallback
compatible to pass the check.

Signed-off-by: Jacobe Zang <jacobe.zang@wesion.com>
---
 arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 2 +-
 arch/arm64/boot/dts/apple/t8112-j413.dts  | 2 +-
 arch/arm64/boot/dts/apple/t8112-j493.dts  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
index 5988a4eb6efaa..4b021626d4692 100644
--- a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
+++ b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
@@ -72,7 +72,7 @@ hpm1: usb-pd@3f {
 &port00 {
 	bus-range = <1 1>;
 	wifi0: network@0,0 {
-		compatible = "pci14e4,4425";
+		compatible = "pci14e4,4425", "brcm,bcm4329-fmac";
 		reg = <0x10000 0x0 0x0 0x0 0x0>;
 		/* To be filled by the loader */
 		local-mac-address = [00 00 00 00 00 00];
diff --git a/arch/arm64/boot/dts/apple/t8112-j413.dts b/arch/arm64/boot/dts/apple/t8112-j413.dts
index 6f69658623bf8..df2a63d8dd5e9 100644
--- a/arch/arm64/boot/dts/apple/t8112-j413.dts
+++ b/arch/arm64/boot/dts/apple/t8112-j413.dts
@@ -43,7 +43,7 @@ led-0 {
 &port00 {
 	bus-range = <1 1>;
 	wifi0: wifi@0,0 {
-		compatible = "pci14e4,4433";
+		compatible = "pci14e4,4433", "brcm,bcm4329-fmac";
 		reg = <0x10000 0x0 0x0 0x0 0x0>;
 		/* To be filled by the loader */
 		local-mac-address = [00 10 18 00 00 10];
diff --git a/arch/arm64/boot/dts/apple/t8112-j493.dts b/arch/arm64/boot/dts/apple/t8112-j493.dts
index 0ad908349f554..5f3453e109b85 100644
--- a/arch/arm64/boot/dts/apple/t8112-j493.dts
+++ b/arch/arm64/boot/dts/apple/t8112-j493.dts
@@ -43,7 +43,7 @@ led-0 {
 &port00 {
 	bus-range = <1 1>;
 	wifi0: wifi@0,0 {
-		compatible = "pci14e4,4425";
+		compatible = "pci14e4,4425", "brcm,bcm4329-fmac";
 		reg = <0x10000 0x0 0x0 0x0 0x0>;
 		/* To be filled by the loader */
 		local-mac-address = [00 00 00 00 00 00];
-- 
2.34.1

On 28/08/2024 05:39, Jacobe Zang wrote:
> Broadcom driver need to check "brcm,bcm4329-fmac" compatible. Before

What for?

> PCIe devices used PCI ID as base compabile so add it as fallback
> compatible to pass the check.
> 
> Signed-off-by: Jacobe Zang <jacobe.zang@wesion.com>
> ---
>  arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 2 +-
>  arch/arm64/boot/dts/apple/t8112-j413.dts  | 2 +-
>  arch/arm64/boot/dts/apple/t8112-j493.dts  | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
> index 5988a4eb6efaa..4b021626d4692 100644
> --- a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
> +++ b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
> @@ -72,7 +72,7 @@ hpm1: usb-pd@3f {
>  &port00 {
>  	bus-range = <1 1>;
>  	wifi0: network@0,0 {
> -		compatible = "pci14e4,4425";
> +		compatible = "pci14e4,4425", "brcm,bcm4329-fmac";

So devices are not compatible, but your argument is that driver needs to
do something here? That's not enough.

Best regards,
Krzysztof

On 2024/8/28 13:56, Krzysztof Kozlowski wrote:
> On 28/08/2024 05:39, Jacobe Zang wrote:
>> Broadcom driver need to check "brcm,bcm4329-fmac" compatible. Before
> 
> What for?
> 

It matches the changes in the other series that I sent.

>> PCIe devices used PCI ID as base compabile so add it as fallback
>> compatible to pass the check.
>>
>> Signed-off-by: Jacobe Zang <jacobe.zang@wesion.com>
>> ---
>>   arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 2 +-
>>   arch/arm64/boot/dts/apple/t8112-j413.dts  | 2 +-
>>   arch/arm64/boot/dts/apple/t8112-j493.dts  | 2 +-
>>   3 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
>> index 5988a4eb6efaa..4b021626d4692 100644
>> --- a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
>> +++ b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
>> @@ -72,7 +72,7 @@ hpm1: usb-pd@3f {
>>   &port00 {
>>   	bus-range = <1 1>;
>>   	wifi0: network@0,0 {
>> -		compatible = "pci14e4,4425";
>> +		compatible = "pci14e4,4425", "brcm,bcm4329-fmac";
> 
> So devices are not compatible, but your argument is that driver needs to
> do something here? That's not enough.
> 
Before this change, the check of "brcm,bcm4329-fmac" compatible is set 
at the end of probe function for SDIO devices which need IRQ. But after 
this change I set it to the top as the first check. So I add this 
fallback compatible to the Apple's DTS.

Oh..I got what you mean. Maybe my commit message is not clearly. It is 
no need to mention driver in it. Because the intent of adding the 
"brcm,bcm4329-fmac" compatible is to conform to the bindings.

-- 
Best Regards
Jacobe

On 28/08/2024 08:13, Jacobe Zang wrote:
> 
> 
> On 2024/8/28 13:56, Krzysztof Kozlowski wrote:
>> On 28/08/2024 05:39, Jacobe Zang wrote:
>>> Broadcom driver need to check "brcm,bcm4329-fmac" compatible. Before
>>
>> What for?
>>
> 
> It matches the changes in the other series that I sent.

Commit msg did not explain this at all. Anyway, then bindings should
provide proper rationale without referring to "driver" as the reason.

> 
>>> PCIe devices used PCI ID as base compabile so add it as fallback
>>> compatible to pass the check.
>>>
>>> Signed-off-by: Jacobe Zang <jacobe.zang@wesion.com>
>>> ---
>>>   arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 2 +-
>>>   arch/arm64/boot/dts/apple/t8112-j413.dts  | 2 +-
>>>   arch/arm64/boot/dts/apple/t8112-j493.dts  | 2 +-
>>>   3 files changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
>>> index 5988a4eb6efaa..4b021626d4692 100644
>>> --- a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
>>> +++ b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
>>> @@ -72,7 +72,7 @@ hpm1: usb-pd@3f {
>>>   &port00 {
>>>   	bus-range = <1 1>;
>>>   	wifi0: network@0,0 {
>>> -		compatible = "pci14e4,4425";
>>> +		compatible = "pci14e4,4425", "brcm,bcm4329-fmac";
>>
>> So devices are not compatible, but your argument is that driver needs to
>> do something here? That's not enough.
>>
> Before this change, the check of "brcm,bcm4329-fmac" compatible is set 
> at the end of probe function for SDIO devices which need IRQ. But after 
> this change I set it to the top as the first check. So I add this 
> fallback compatible to the Apple's DTS.

You are not listening, I think, and still keep talking about driver. It
has nothing to do. Fix your driver.

> 
> Oh..I got what you mean. Maybe my commit message is not clearly. It is 
> no need to mention driver in it. Because the intent of adding the 
> "brcm,bcm4329-fmac" compatible is to conform to the bindings.

Explain the hardware, not the driver. DTS represents hardware, not drivers.

Best regards,
Krzysztof