2024-03-01 11:35:25

by Rafał Miłecki

[permalink] [raw]
Subject: [PATCH 0/4] arm64: dts: mediatek: mt7622: fix some validation errors

From: Rafał Miłecki <[email protected]>

One more step in cleaning up DTS for "make dtbs_check".

Rafał Miłecki (4):
arm64: dts: mediatek: mt7622: fix clock controllers
arm64: dts: mediatek: mt7622: fix IR nodename
arm64: dts: mediatek: mt7622: fix ethernet controller "compatible"
arm64: dts: mediatek: mt7622: drop "reset-names" from thermal block

arch/arm64/boot/dts/mediatek/mt7622.dtsi | 34 ++++++++++--------------
1 file changed, 14 insertions(+), 20 deletions(-)

--
2.35.3



2024-03-01 11:35:51

by Rafał Miłecki

[permalink] [raw]
Subject: [PATCH 2/4] arm64: dts: mediatek: mt7622: fix IR nodename

From: Rafał Miłecki <[email protected]>

Fix following validation error:
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dtb: cir@10009000: $nodename:0: 'cir@10009000' does not match '^ir(-receiver)?(@[a-f0-9]+)?$'
from schema $id: http://devicetree.org/schemas/media/mediatek,mt7622-cir.yaml#

Signed-off-by: Rafał Miłecki <[email protected]>
---
arch/arm64/boot/dts/mediatek/mt7622.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
index 283fdf7d2d8b..7714775d1bd0 100644
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
@@ -252,7 +252,7 @@ scpsys: power-controller@10006000 {
clock-names = "hif_sel";
};

- cir: cir@10009000 {
+ cir: ir@10009000 {
compatible = "mediatek,mt7622-cir";
reg = <0 0x10009000 0 0x1000>;
interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_LOW>;
--
2.35.3


2024-03-01 11:36:15

by Rafał Miłecki

[permalink] [raw]
Subject: [PATCH 4/4] arm64: dts: mediatek: mt7622: drop "reset-names" from thermal block

From: Rafał Miłecki <[email protected]>

Binding doesn't specify "reset-names" property and Linux driver also
doesn't use it.

Fix following validation error:
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dtb: thermal@1100b000: Unevaluated properties are not allowed ('reset-names' was unexpected)
from schema $id: http://devicetree.org/schemas/thermal/mediatek,thermal.yaml#

Signed-off-by: Rafał Miłecki <[email protected]>
---
arch/arm64/boot/dts/mediatek/mt7622.dtsi | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
index 7da4ac273a15..9d19dd8ee524 100644
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
@@ -513,7 +513,6 @@ thermal: thermal@1100b000 {
<&pericfg CLK_PERI_AUXADC_PD>;
clock-names = "therm", "auxadc";
resets = <&pericfg MT7622_PERI_THERM_SW_RST>;
- reset-names = "therm";
mediatek,auxadc = <&auxadc>;
mediatek,apmixedsys = <&apmixedsys>;
nvmem-cells = <&thermal_calibration>;
--
2.35.3


2024-03-01 11:37:11

by Rafał Miłecki

[permalink] [raw]
Subject: [PATCH 1/4] arm64: dts: mediatek: mt7622: fix clock controllers

From: Rafał Miłecki <[email protected]>

1. Drop unneeded "syscon"s (bindings were updated recently)
2. Use "clock-controller" in nodenames
3. Add missing "#clock-cells"

Signed-off-by: Rafał Miłecki <[email protected]>
---
arch/arm64/boot/dts/mediatek/mt7622.dtsi | 27 +++++++++++-------------
1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
index 3ee9266fa8e9..283fdf7d2d8b 100644
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
@@ -283,16 +283,14 @@ thermal_calibration: calib@198 {
};
};

- apmixedsys: apmixedsys@10209000 {
- compatible = "mediatek,mt7622-apmixedsys",
- "syscon";
+ apmixedsys: clock-controller@10209000 {
+ compatible = "mediatek,mt7622-apmixedsys";
reg = <0 0x10209000 0 0x1000>;
#clock-cells = <1>;
};

- topckgen: topckgen@10210000 {
- compatible = "mediatek,mt7622-topckgen",
- "syscon";
+ topckgen: clock-controller@10210000 {
+ compatible = "mediatek,mt7622-topckgen";
reg = <0 0x10210000 0 0x1000>;
#clock-cells = <1>;
};
@@ -734,9 +732,8 @@ wmac: wmac@18000000 {
power-domains = <&scpsys MT7622_POWER_DOMAIN_WB>;
};

- ssusbsys: ssusbsys@1a000000 {
- compatible = "mediatek,mt7622-ssusbsys",
- "syscon";
+ ssusbsys: clock-controller@1a000000 {
+ compatible = "mediatek,mt7622-ssusbsys";
reg = <0 0x1a000000 0 0x1000>;
#clock-cells = <1>;
#reset-cells = <1>;
@@ -793,9 +790,8 @@ u2port1: usb-phy@1a0c5000 {
};
};

- pciesys: pciesys@1a100800 {
- compatible = "mediatek,mt7622-pciesys",
- "syscon";
+ pciesys: clock-controller@1a100800 {
+ compatible = "mediatek,mt7622-pciesys";
reg = <0 0x1a100800 0 0x1000>;
#clock-cells = <1>;
#reset-cells = <1>;
@@ -921,12 +917,13 @@ sata_port: sata-phy@1a243000 {
};
};

- hifsys: syscon@1af00000 {
- compatible = "mediatek,mt7622-hifsys", "syscon";
+ hifsys: clock-controller@1af00000 {
+ compatible = "mediatek,mt7622-hifsys";
reg = <0 0x1af00000 0 0x70>;
+ #clock-cells = <1>;
};

- ethsys: syscon@1b000000 {
+ ethsys: clock-controller@1b000000 {
compatible = "mediatek,mt7622-ethsys",
"syscon";
reg = <0 0x1b000000 0 0x1000>;
--
2.35.3


2024-03-01 11:43:17

by Rafał Miłecki

[permalink] [raw]
Subject: [PATCH 3/4] arm64: dts: mediatek: mt7622: fix ethernet controller "compatible"

From: Rafał Miłecki <[email protected]>

Fix following validation error:
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dtb: ethernet@1b100000: compatible: ['mediatek,mt7622-eth', 'mediatek,mt2701-eth', 'syscon'] is too long
from schema $id: http://devicetree.org/schemas/net/mediatek,net.yaml#
(and other complains about wrong clocks).

Signed-off-by: Rafał Miłecki <[email protected]>
---
arch/arm64/boot/dts/mediatek/mt7622.dtsi | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
index 7714775d1bd0..7da4ac273a15 100644
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
@@ -963,9 +963,7 @@ wed1: wed@1020b000 {
};

eth: ethernet@1b100000 {
- compatible = "mediatek,mt7622-eth",
- "mediatek,mt2701-eth",
- "syscon";
+ compatible = "mediatek,mt7622-eth";
reg = <0 0x1b100000 0 0x20000>;
interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_LOW>,
<GIC_SPI 224 IRQ_TYPE_LEVEL_LOW>,
--
2.35.3


Subject: Re: [PATCH 1/4] arm64: dts: mediatek: mt7622: fix clock controllers

Il 01/03/24 12:35, Rafał Miłecki ha scritto:
> From: Rafał Miłecki <[email protected]>
>
> 1. Drop unneeded "syscon"s (bindings were updated recently)
> 2. Use "clock-controller" in nodenames
> 3. Add missing "#clock-cells"
>
> Signed-off-by: Rafał Miłecki <[email protected]>

Please add the appropriate Fixes tag and resend.

Thanks,
Angelo


Subject: Re: [PATCH 3/4] arm64: dts: mediatek: mt7622: fix ethernet controller "compatible"

Il 01/03/24 12:35, Rafał Miłecki ha scritto:
> From: Rafał Miłecki <[email protected]>
>
> Fix following validation error:
> arch/arm64/boot/dts/mediatek/mt7622-rfb1.dtb: ethernet@1b100000: compatible: ['mediatek,mt7622-eth', 'mediatek,mt2701-eth', 'syscon'] is too long
> from schema $id: http://devicetree.org/schemas/net/mediatek,net.yaml#
> (and other complains about wrong clocks).
>
> Signed-off-by: Rafał Miłecki <[email protected]>

Fixes tag?

Thanks,
Angelo


Subject: Re: [PATCH 4/4] arm64: dts: mediatek: mt7622: drop "reset-names" from thermal block

Il 01/03/24 12:35, Rafał Miłecki ha scritto:
> From: Rafał Miłecki <[email protected]>
>
> Binding doesn't specify "reset-names" property and Linux driver also
> doesn't use it.
>
> Fix following validation error:
> arch/arm64/boot/dts/mediatek/mt7622-rfb1.dtb: thermal@1100b000: Unevaluated properties are not allowed ('reset-names' was unexpected)
> from schema $id: http://devicetree.org/schemas/thermal/mediatek,thermal.yaml#
>
> Signed-off-by: Rafał Miłecki <[email protected]>

Fixes tag missing


> ---
> arch/arm64/boot/dts/mediatek/mt7622.dtsi | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
> index 7da4ac273a15..9d19dd8ee524 100644
> --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
> +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
> @@ -513,7 +513,6 @@ thermal: thermal@1100b000 {
> <&pericfg CLK_PERI_AUXADC_PD>;
> clock-names = "therm", "auxadc";
> resets = <&pericfg MT7622_PERI_THERM_SW_RST>;
> - reset-names = "therm";
> mediatek,auxadc = <&auxadc>;
> mediatek,apmixedsys = <&apmixedsys>;
> nvmem-cells = <&thermal_calibration>;



Subject: Re: [PATCH 2/4] arm64: dts: mediatek: mt7622: fix IR nodename

Il 01/03/24 12:35, Rafał Miłecki ha scritto:
> From: Rafał Miłecki <[email protected]>
>
> Fix following validation error:
> arch/arm64/boot/dts/mediatek/mt7622-rfb1.dtb: cir@10009000: $nodename:0: 'cir@10009000' does not match '^ir(-receiver)?(@[a-f0-9]+)?$'
> from schema $id: http://devicetree.org/schemas/media/mediatek,mt7622-cir.yaml#
>
> Signed-off-by: Rafał Miłecki <[email protected]>

Is this an IR receiver, an IR transmitter or a xceiver?

While we're fixing that node name, we might as well increase readability of (and
somewhat implicitly document) this.

.. so, that might be...:

ir-receiver@xxxxx {
...

Cheers,
Angelo

> ---
> arch/arm64/boot/dts/mediatek/mt7622.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
> index 283fdf7d2d8b..7714775d1bd0 100644
> --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
> +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
> @@ -252,7 +252,7 @@ scpsys: power-controller@10006000 {
> clock-names = "hif_sel";
> };
>
> - cir: cir@10009000 {
> + cir: ir@10009000 {
> compatible = "mediatek,mt7622-cir";
> reg = <0 0x10009000 0 0x1000>;
> interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_LOW>;