Skip to contentSkip to conversation

ARM: dts: mediatek: mt7623: fix IR nodename

PATCH In review Rafał Miłecki 3 participants 6 messages Jun 17, 2024 – Dec 15, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ARM: dts: mediatek: mt7623: fix IR nodename

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

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

Fixes 91044f38dae7 ("arm: dts: mt7623: add ir nodes to the mt7623.dtsi file")
---
 arch/arm/boot/dts/mediatek/mt7623.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/mediatek/mt7623.dtsi +1 -1
index f0b4a09004b3..9c5a52ce9351 100644
@@ -308,7 +308,7 @@ pwrap: pwrap@1000d000 {
 		clock-names = "spi", "wrap";
 	};
 
-	cir: cir@10013000 {
+	cir: ir-receiver@10013000 {
 		compatible = "mediatek,mt7623-cir";
 		reg = <0 0x10013000 0 0x1000>;
 		interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_LOW>;
Signature · 1 line
2.35.3
#1 lore raw

PATCH 2/2 ARM: dts: mediatek: mt7623: fix efuse fallback compatible

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

Fix following validation error:
arch/arm/boot/dts/mediatek/mt7623a-rfb-emmc.dtb: efuse@10206000: compatible: 'oneOf' conditional failed, one must be fixed:
['mediatek,mt7623-efuse', 'mediatek,mt8173-efuse'] is too long
'mediatek,mt8173-efuse' was expected
'mediatek,efuse' was expected
from schema $id: http://devicetree.org/schemas/nvmem/mediatek,efuse.yaml#
arch/arm/boot/dts/mediatek/mt7623a-rfb-emmc.dtb: efuse@10206000: Unevaluated properties are not allowed ('compatible' was unexpected)
from schema $id: http://devicetree.org/schemas/nvmem/mediatek,efuse.yaml#

Fixes 43c7a91b4b3a ("arm: dts: mt7623: add efuse nodes to the mt7623.dtsi file")
---
 arch/arm/boot/dts/mediatek/mt7623.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/mediatek/mt7623.dtsi +1 -1
index 9c5a52ce9351..748f9b366897 100644
@@ -328,7 +328,7 @@ sysirq: interrupt-controller@10200100 {
 
 	efuse: efuse@10206000 {
 		compatible = "mediatek,mt7623-efuse",
-			     "mediatek,mt8173-efuse";
+			     "mediatek,efuse";
 		reg = <0 0x10206000 0 0x1000>;
 		#address-cells = <1>;
 		#size-cells = <1>;
Signature · 1 line
2.35.3
maintainer
#2 lore raw

Re: [PATCH 2/2] ARM: dts: mediatek: mt7623: fix efuse fallback compatible

Quoted 22 lines · Rafał Miłecki

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

Fix following validation error:
arch/arm/boot/dts/mediatek/mt7623a-rfb-emmc.dtb: efuse@10206000: compatible: 'oneOf' conditional failed, one must be fixed:
['mediatek,mt7623-efuse', 'mediatek,mt8173-efuse'] is too long
'mediatek,mt8173-efuse' was expected
'mediatek,efuse' was expected
from schema $id: http://devicetree.org/schemas/nvmem/mediatek,efuse.yaml#
arch/arm/boot/dts/mediatek/mt7623a-rfb-emmc.dtb: efuse@10206000: Unevaluated properties are not allowed ('compatible' was unexpected)
from schema $id: http://devicetree.org/schemas/nvmem/mediatek,efuse.yaml#

Fixes 43c7a91b4b3a ("arm: dts: mt7623: add efuse nodes to the mt7623.dtsi file")
---
  arch/arm/boot/dts/mediatek/mt7623.dtsi | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/mediatek/mt7623.dtsi +0 -0
index 9c5a52ce9351..748f9b366897 100644

arch/arm/boot/dts/mediatek/mt7623.dtsi sysirq: interrupt-controller@10200100 { · line 331

Quoted 5 lines
arch/arm/boot/dts/mediatek/mt7623.dtsi +1 -1
@@ -328,7 +328,7 @@ sysirq: interrupt-controller@10200100 {
 
  	efuse: efuse@10206000 {
  		compatible = "mediatek,mt7623-efuse",
-			     "mediatek,mt8173-efuse";
+			     "mediatek,efuse";

Angelo stated that we should move away from generic fallbacks. Although the binding states explicitly to use "mediatek,efuse" and deprecates the standalone "mediate,mt8173-efuse", which could the default fallback. Angelo, what do you think, take it or re-doing the binding first?

Regards,
Matthias

Quoted 3 lines
arch/arm/boot/dts/mediatek/mt7623.dtsi +0 -0
  		reg = <0 0x10206000 0 0x1000>;
  		#address-cells = <1>;
  		#size-cells = <1>;
maintainer Reviewed-by
#3 lore raw

Re: [PATCH 2/2] ARM: dts: mediatek: mt7623: fix efuse fallback compatible

Il 07/10/24 16:06, Matthias Brugger ha scritto:

Quoted 20 lines · Rafał Miłecki
Quoted 17 lines

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

Fix following validation error:
arch/arm/boot/dts/mediatek/mt7623a-rfb-emmc.dtb: efuse@10206000: compatible: 'oneOf' conditional failed, one must be fixed:
         ['mediatek,mt7623-efuse', 'mediatek,mt8173-efuse'] is too long
         'mediatek,mt8173-efuse' was expected
         'mediatek,efuse' was expected
         from schema $id: http://devicetree.org/schemas/nvmem/mediatek,efuse.yaml#
arch/arm/boot/dts/mediatek/mt7623a-rfb-emmc.dtb: efuse@10206000: Unevaluated properties are not allowed ('compatible' was unexpected) from schema $id: http://devicetree.org/schemas/nvmem/mediatek,efuse.yaml#

Fixes 43c7a91b4b3a ("arm: dts: mt7623: add efuse nodes to the mt7623.dtsi file")

---
  arch/arm/boot/dts/mediatek/mt7623.dtsi | 2 +-

  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 11 lines

arch/arm/boot/dts/mediatek/mt7623.dtsi sysirq: interrupt-controller@10200100 { · line 330

Quoted 9 lines
arch/arm/boot/dts/mediatek/mt7623.dtsi +1 -1
index 9c5a52ce9351..748f9b366897 100644
@@ -328,7 +328,7 @@ sysirq: interrupt-controller@10200100 {
       efuse: efuse@10206000 {
           compatible = "mediatek,mt7623-efuse",
-                 "mediatek,mt8173-efuse";
+                 "mediatek,efuse";

Angelo stated that we should move away from generic fallbacks.

That's right.

Quoted 2 lines

Although the binding states explicitly to use "mediatek,efuse" and deprecates the standalone "mediate,mt8173-efuse", which could the default fallback. Angelo, what do you think, take it or re-doing the binding first?

No, this is an old SoC, and we want the DTs to be backward compatible as they should.

Deprecating the generic "mediatek,efuse" fallback is something that we must enforce only on new SoCs (so, new compatible strings), not on older ones.

So, my call is to take it.

Cheers!
Angelo

Quoted 6 lines

Regards,
Matthias

Quoted 3 lines
arch/arm/boot/dts/mediatek/mt7623.dtsi +0 -0
           reg = <0 0x10206000 0 0x1000>;
           #address-cells = <1>;
           #size-cells = <1>;
#4 lore raw

Re: [PATCH 2/2] ARM: dts: mediatek: mt7623: fix efuse fallback compatible

In reply to Rafał Miłecki

W dniu 17.06.2024 o 11:46, Rafał Miłecki pisze:

Quoted 11 lines

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

Fix following validation error:
arch/arm/boot/dts/mediatek/mt7623a-rfb-emmc.dtb: efuse@10206000: compatible: 'oneOf' conditional failed, one must be fixed:
['mediatek,mt7623-efuse', 'mediatek,mt8173-efuse'] is too long
'mediatek,mt8173-efuse' was expected
'mediatek,efuse' was expected
from schema $id: http://devicetree.org/schemas/nvmem/mediatek,efuse.yaml#
arch/arm/boot/dts/mediatek/mt7623a-rfb-emmc.dtb: efuse@10206000: Unevaluated properties are not allowed ('compatible' was unexpected)
from schema $id: http://devicetree.org/schemas/nvmem/mediatek,efuse.yaml#

Quoted 2 lines
Fixes 43c7a91b4b3a ("arm: dts: mt7623: add efuse nodes to the mt7623.dtsi file")

I noticed this patch got missed.

With AngeloGioacchino's review, can we have it accepted now?

Quoted 17 lines
---
  arch/arm/boot/dts/mediatek/mt7623.dtsi | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/mediatek/mt7623.dtsi +1 -1
index 9c5a52ce9351..748f9b366897 100644
@@ -328,7 +328,7 @@ sysirq: interrupt-controller@10200100 {
 
  	efuse: efuse@10206000 {
  		compatible = "mediatek,mt7623-efuse",
-			     "mediatek,mt8173-efuse";
+			     "mediatek,efuse";
  		reg = <0 0x10206000 0 0x1000>;
  		#address-cells = <1>;
  		#size-cells = <1>;
maintainer Reviewed-by on v1 1/2
#5 lore raw
In reply to Rafał Miłecki

Il 17/06/24 11:46, Rafał Miłecki ha scritto:

Quoted 9 lines

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

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

Fixes 91044f38dae7 ("arm: dts: mt7623: add ir nodes to the mt7623.dtsi file")