| Message ID | 20220711123005.3055300-2-alvin@pqrs.dk (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8406993a891f39a0c7062bf071f7591bacb800bc |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: brcmfmac: add DT property for trivial ccode mapping | expand |
On 11.07.22 14:30, Alvin Šipraga wrote: > From: Alvin Šipraga <alsi@bang-olufsen.dk> > > The bindings already offer a brcm,ccode-map property to describe the > mapping between the kernel's ISO3166 alpha 2 country code string and the > firmware's country code string and revision number. This is a > board-specific property and determined by the CLM blob firmware provided > by the hardware vendor. > > However, in some cases the firmware will also use ISO3166 country codes > internally, and the revision will always be zero. This implies a trivial > mapping: cc -> { cc, 0 }. > > For such cases, add an optional property brcm,ccode-map-trivial which > obviates the need to describe every trivial country code mapping in the > device tree with the existing brcm,ccode-map property. The new property > is subordinate to the more explicit brcm,ccode-map property. > > Signed-off-by: Alvin Šipraga <alsi@bang-olufsen.dk> Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de> > --- > .../bindings/net/wireless/brcm,bcm4329-fmac.yaml | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml b/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml > index c11f23b20c4c..53b4153d9bfc 100644 > --- a/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml > +++ b/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml > @@ -75,6 +75,16 @@ properties: > items: > pattern: '^[A-Z][A-Z]-[A-Z][0-9A-Z]-[0-9]+$' > > + brcm,ccode-map-trivial: > + description: | > + Use a trivial mapping of ISO3166 country codes to brcmfmac firmware > + country code and revision: cc -> { cc, 0 }. In other words, assume that > + the CLM blob firmware uses ISO3166 country codes as well, and that all > + revisions are zero. This property is mutually exclusive with > + brcm,ccode-map. If both properties are specified, then brcm,ccode-map > + takes precedence. > + type: boolean > + > required: > - compatible > - reg
On Mon, 11 Jul 2022 14:30:03 +0200, Alvin Šipraga wrote: > From: Alvin Šipraga <alsi@bang-olufsen.dk> > > The bindings already offer a brcm,ccode-map property to describe the > mapping between the kernel's ISO3166 alpha 2 country code string and the > firmware's country code string and revision number. This is a > board-specific property and determined by the CLM blob firmware provided > by the hardware vendor. > > However, in some cases the firmware will also use ISO3166 country codes > internally, and the revision will always be zero. This implies a trivial > mapping: cc -> { cc, 0 }. > > For such cases, add an optional property brcm,ccode-map-trivial which > obviates the need to describe every trivial country code mapping in the > device tree with the existing brcm,ccode-map property. The new property > is subordinate to the more explicit brcm,ccode-map property. > > Signed-off-by: Alvin Šipraga <alsi@bang-olufsen.dk> > --- > .../bindings/net/wireless/brcm,bcm4329-fmac.yaml | 10 ++++++++++ > 1 file changed, 10 insertions(+) > Acked-by: Rob Herring <robh@kernel.org>
Alvin Šipraga <alvin@pqrs.dk> wrote: > From: Alvin Šipraga <alsi@bang-olufsen.dk> > > The bindings already offer a brcm,ccode-map property to describe the > mapping between the kernel's ISO3166 alpha 2 country code string and the > firmware's country code string and revision number. This is a > board-specific property and determined by the CLM blob firmware provided > by the hardware vendor. > > However, in some cases the firmware will also use ISO3166 country codes > internally, and the revision will always be zero. This implies a trivial > mapping: cc -> { cc, 0 }. > > For such cases, add an optional property brcm,ccode-map-trivial which > obviates the need to describe every trivial country code mapping in the > device tree with the existing brcm,ccode-map property. The new property > is subordinate to the more explicit brcm,ccode-map property. > > Signed-off-by: Alvin Šipraga <alsi@bang-olufsen.dk> > Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de> > Acked-by: Rob Herring <robh@kernel.org> 2 patches applied to wireless-next.git, thanks. 8406993a891f dt-bindings: bcm4329-fmac: add optional brcm,ccode-map-trivial 5c54ab24377b wifi: brcmfmac: support brcm,ccode-map-trivial DT property
diff --git a/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml b/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml index c11f23b20c4c..53b4153d9bfc 100644 --- a/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml +++ b/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml @@ -75,6 +75,16 @@ properties: items: pattern: '^[A-Z][A-Z]-[A-Z][0-9A-Z]-[0-9]+$' + brcm,ccode-map-trivial: + description: | + Use a trivial mapping of ISO3166 country codes to brcmfmac firmware + country code and revision: cc -> { cc, 0 }. In other words, assume that + the CLM blob firmware uses ISO3166 country codes as well, and that all + revisions are zero. This property is mutually exclusive with + brcm,ccode-map. If both properties are specified, then brcm,ccode-map + takes precedence. + type: boolean + required: - compatible - reg