From: Peter Chiu <[email protected]>
Add an entry for MT7986 SoC.
Signed-off-by: Peter Chiu <[email protected]>
Cc: [email protected]
---
.../bindings/net/wireless/mediatek,mt76.yaml | 29 +++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml b/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
index 1489d3c..4444524 100644
--- a/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
+++ b/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
@@ -18,7 +18,7 @@ description: |
wireless device. The node is expected to be specified as a child
node of the PCI controller to which the wireless chip is connected.
Alternatively, it can specify the wireless part of the MT7628/MT7688
- or MT7622 SoC.
+ or MT7622/MT7986 SoC.
allOf:
- $ref: ieee80211.yaml#
@@ -29,9 +29,10 @@ properties:
- mediatek,mt76
- mediatek,mt7628-wmac
- mediatek,mt7622-wmac
+ - mediatek,mt7986-wmac
reg:
- maxItems: 1
+ maxItems: 3
interrupts:
maxItems: 1
@@ -39,6 +40,17 @@ properties:
power-domains:
maxItems: 1
+ memory-region:
+ maxItems: 1
+
+ resets:
+ maxItems: 1
+ description:
+ Specify the consys reset for mt7986.
+
+ reset-name:
+ const: consys
+
mediatek,infracfg:
$ref: /schemas/types.yaml#/definitions/phandle
description:
@@ -231,3 +243,16 @@ examples:
power-domains = <&scpsys 3>;
};
+
+ - |
+ #include <dt-bindings/reset/mt7986-resets.h>
+ wifi@18000000 {
+ compatible = "mediatek,mt7986-wmac";
+ resets = <&watchdog MT7986_TOPRGU_CONSYS_RST>;
+ reset-names = "consys";
+ reg = <0 0x18000000 0 0x1000000>,
+ <0 0x10003000 0 0x1000>,
+ <0 0x011d1000 0 0x1000>;
+ interrupts = <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>;
+ memory-region = <&wmcpu_emi>;
+ };
--
2.18.0
On Tue, 11 Jan 2022 19:59:17 +0800, Bo Jiao wrote:
> From: Peter Chiu <[email protected]>
>
> Add an entry for MT7986 SoC.
>
> Signed-off-by: Peter Chiu <[email protected]>
> Cc: [email protected]
> ---
> .../bindings/net/wireless/mediatek,mt76.yaml | 29 +++++++++++++++++--
> 1 file changed, 27 insertions(+), 2 deletions(-)
>
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
dtschema/dtc warnings/errors:
Documentation/devicetree/bindings/net/wireless/mediatek,mt76.example.dts:131:18: fatal error: dt-bindings/reset/mt7986-resets.h: No such file or directory
131 | #include <dt-bindings/reset/mt7986-resets.h>
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[1]: *** [scripts/Makefile.lib:373: Documentation/devicetree/bindings/net/wireless/mediatek,mt76.example.dt.yaml] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:1413: dt_binding_check] Error 2
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/patch/1578404
This check can fail if there are any dependencies. The base for a patch
series is generally the most recent rc1.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit.
On Tue, Jan 11, 2022 at 07:59:17PM +0800, Bo Jiao wrote:
> From: Peter Chiu <[email protected]>
>
> Add an entry for MT7986 SoC.
>
> Signed-off-by: Peter Chiu <[email protected]>
> Cc: [email protected]
> ---
> .../bindings/net/wireless/mediatek,mt76.yaml | 29 +++++++++++++++++--
> 1 file changed, 27 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml b/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
> index 1489d3c..4444524 100644
> --- a/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
> +++ b/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
> @@ -18,7 +18,7 @@ description: |
> wireless device. The node is expected to be specified as a child
> node of the PCI controller to which the wireless chip is connected.
> Alternatively, it can specify the wireless part of the MT7628/MT7688
> - or MT7622 SoC.
> + or MT7622/MT7986 SoC.
>
> allOf:
> - $ref: ieee80211.yaml#
> @@ -29,9 +29,10 @@ properties:
> - mediatek,mt76
> - mediatek,mt7628-wmac
> - mediatek,mt7622-wmac
> + - mediatek,mt7986-wmac
>
> reg:
> - maxItems: 1
> + maxItems: 3
You just changed existing users. You need 'minItems: 1' to keep 1 reg
entry being valid.
>
> interrupts:
> maxItems: 1
> @@ -39,6 +40,17 @@ properties:
> power-domains:
> maxItems: 1
>
> + memory-region:
> + maxItems: 1
> +
> + resets:
> + maxItems: 1
> + description:
> + Specify the consys reset for mt7986.
> +
> + reset-name:
> + const: consys
> +
> mediatek,infracfg:
> $ref: /schemas/types.yaml#/definitions/phandle
> description:
> @@ -231,3 +243,16 @@ examples:
>
> power-domains = <&scpsys 3>;
> };
> +
> + - |
> + #include <dt-bindings/reset/mt7986-resets.h>
> + wifi@18000000 {
> + compatible = "mediatek,mt7986-wmac";
> + resets = <&watchdog MT7986_TOPRGU_CONSYS_RST>;
I'd suggest you don't use the define here to avoid the dependency.
> + reset-names = "consys";
> + reg = <0 0x18000000 0 0x1000000>,
> + <0 0x10003000 0 0x1000>,
> + <0 0x011d1000 0 0x1000>;
> + interrupts = <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>;
> + memory-region = <&wmcpu_emi>;
> + };
> --
> 2.18.0
>
>