diff mbox series

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

Message ID 20240617094634.23173-2-zajec5@gmail.com (mailing list archive)
State New
Headers show
Series [1/2] ARM: dts: mediatek: mt7623: fix IR nodename | expand

Commit Message

Rafał Miłecki June 17, 2024, 9:46 a.m. UTC
From: Rafał Miłecki <rafal@milecki.pl>

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")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
 arch/arm/boot/dts/mediatek/mt7623.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Matthias Brugger Oct. 7, 2024, 2:06 p.m. UTC | #1
On 17/06/2024 11:46, Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
> 
> 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")
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
> ---
>   arch/arm/boot/dts/mediatek/mt7623.dtsi | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/mediatek/mt7623.dtsi b/arch/arm/boot/dts/mediatek/mt7623.dtsi
> index 9c5a52ce9351..748f9b366897 100644
> --- a/arch/arm/boot/dts/mediatek/mt7623.dtsi
> +++ b/arch/arm/boot/dts/mediatek/mt7623.dtsi
> @@ -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

>   		reg = <0 0x10206000 0 0x1000>;
>   		#address-cells = <1>;
>   		#size-cells = <1>;
AngeloGioacchino Del Regno Oct. 8, 2024, 10:02 a.m. UTC | #2
Il 07/10/24 16:06, Matthias Brugger ha scritto:
> 
> 
> On 17/06/2024 11:46, Rafał Miłecki wrote:
>> From: Rafał Miłecki <rafal@milecki.pl>
>>
>> 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")
>> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
>> ---
>>   arch/arm/boot/dts/mediatek/mt7623.dtsi | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/boot/dts/mediatek/mt7623.dtsi 
>> b/arch/arm/boot/dts/mediatek/mt7623.dtsi
>> index 9c5a52ce9351..748f9b366897 100644
>> --- a/arch/arm/boot/dts/mediatek/mt7623.dtsi
>> +++ b/arch/arm/boot/dts/mediatek/mt7623.dtsi
>> @@ -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.

> 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.

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

Cheers!
Angelo

> Regards,
> Matthias
> 
>>           reg = <0 0x10206000 0 0x1000>;
>>           #address-cells = <1>;
>>           #size-cells = <1>;
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/mediatek/mt7623.dtsi b/arch/arm/boot/dts/mediatek/mt7623.dtsi
index 9c5a52ce9351..748f9b366897 100644
--- a/arch/arm/boot/dts/mediatek/mt7623.dtsi
+++ b/arch/arm/boot/dts/mediatek/mt7623.dtsi
@@ -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>;