diff mbox series

arm64: dts: amlogic: ad402: fix thermal zone node name

Message ID 20240624-topic-amlogic-upstream-bindings-fixes-dts-round-2-v1-1-0a21f456eb8d@linaro.org (mailing list archive)
State Accepted
Headers show
Series arm64: dts: amlogic: ad402: fix thermal zone node name | expand

Commit Message

Neil Armstrong June 24, 2024, 8:59 a.m. UTC
Fixes the following:
thermal-zones: 'soc_thermal' does not match any of the regexes: '^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$', 'pinctrl-[0-9]+'
        from schema $id: http://devicetree.org/schemas/thermal/thermal-zones.yaml#

Fixes: 593ab951232b ("arm64: dts: amlogic: ad402: setup thermal-zones")
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
 arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


---
base-commit: 202661addeb4130fbd99075ab7b4f5290a692542
change-id: 20240624-topic-amlogic-upstream-bindings-fixes-dts-round-2-5ca9b1193bff

Best regards,

Comments

Krzysztof Kozlowski June 24, 2024, 9:28 a.m. UTC | #1
On 24/06/2024 10:59, Neil Armstrong wrote:
> Fixes the following:
> thermal-zones: 'soc_thermal' does not match any of the regexes: '^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$', 'pinctrl-[0-9]+'
>         from schema $id: http://devicetree.org/schemas/thermal/thermal-zones.yaml#
> 
> Fixes: 593ab951232b ("arm64: dts: amlogic: ad402: setup thermal-zones")
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> ---
>  arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
> index 6883471a93b4..0d92f5253b64 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
> @@ -86,7 +86,7 @@ vddio_1v8: regulator-vddio-1v8 {
>  	};
>  
>  	thermal-zones {
> -		soc_thermal: soc_thermal {
> +		soc_thermal: soc-thermal {

I was fixing all underscores... but then mentioned above commit
re-introduced them.

Some fixes need to be done more than once to stick. :)

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof
Neil Armstrong June 24, 2024, 9:45 a.m. UTC | #2
On 24/06/2024 11:28, Krzysztof Kozlowski wrote:
> On 24/06/2024 10:59, Neil Armstrong wrote:
>> Fixes the following:
>> thermal-zones: 'soc_thermal' does not match any of the regexes: '^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$', 'pinctrl-[0-9]+'
>>          from schema $id: http://devicetree.org/schemas/thermal/thermal-zones.yaml#
>>
>> Fixes: 593ab951232b ("arm64: dts: amlogic: ad402: setup thermal-zones")
>> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
>> ---
>>   arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
>> index 6883471a93b4..0d92f5253b64 100644
>> --- a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
>> +++ b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
>> @@ -86,7 +86,7 @@ vddio_1v8: regulator-vddio-1v8 {
>>   	};
>>   
>>   	thermal-zones {
>> -		soc_thermal: soc_thermal {
>> +		soc_thermal: soc-thermal {
> 
> I was fixing all underscores... but then mentioned above commit
> re-introduced them.

Sorry about that, I'm removing all dtbs check errors, so I'll be able to spot
this before merging anything now !

> 
> Some fixes need to be done more than once to stick. :)
> 
> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >
> Best regards,
> Krzysztof
> 

Thanks,
Neil
Neil Armstrong June 24, 2024, 9:46 a.m. UTC | #3
Hi,

On Mon, 24 Jun 2024 10:59:36 +0200, Neil Armstrong wrote:
> Fixes the following:
> thermal-zones: 'soc_thermal' does not match any of the regexes: '^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$', 'pinctrl-[0-9]+'
>         from schema $id: http://devicetree.org/schemas/thermal/thermal-zones.yaml#
> 
> 

Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.11/arm64-dt)

[1/1] arm64: dts: amlogic: ad402: fix thermal zone node name
      https://git.kernel.org/amlogic/c/ca88b172eebfaa923ea752f6eb41ec5c9cb587c5

These changes has been applied on the intermediate git tree [1].

The v6.11/arm64-dt branch will then be sent via a formal Pull Request to the Linux SoC maintainers
for inclusion in their intermediate git branches in order to be sent to Linus during
the next merge window, or sooner if it's a set of fixes.

In the cases of fixes, those will be merged in the current release candidate
kernel and as soon they appear on the Linux master branch they will be
backported to the previous Stable and Long-Stable kernels [2].

The intermediate git branches are merged daily in the linux-next tree [3],
people are encouraged testing these pre-release kernels and report issues on the
relevant mailing-lists.

If problems are discovered on those changes, please submit a signed-off-by revert
patch followed by a corrective changeset.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
[3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
Dmitry Rokosov June 25, 2024, 9:53 a.m. UTC | #4
Hello Neil and Krzysztof,

Before posting any commit I've running dt_binding_check and dtbs_check.
Which target should highlight the errors like mentioned in this fix?
Please advise what I'm doing wrong.

My commands:

$ /usr/bin/make ARCH=arm64 INSTALL_MOD_PATH=$ROOT/out/$TARGET/target CROSS_COMPILE="$ROOT/out/$TARGET/host/bin/aarch64-buildroot-linux-gnu-" DEPMOD=$ROOT/out/$TARGET/host/sbin/depmod INSTALL_MOD_STRIP=1 -C $ROOT/out/$TARGET/build/linux-custom dt_binding_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/example_device.yaml
$ /usr/bin/make ARCH=arm64 INSTALL_MOD_PATH=$ROOT/out/$TARGET/target CROSS_COMPILE="$ROOT/out/$TARGET/host/bin/aarch64-buildroot-linux-gnu-" DEPMOD=$ROOT/out/$TARGET/host/sbin/depmod INSTALL_MOD_STRIP=1 -C $ROOT/out/$TARGET/build/linux-custom dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/example_device.yaml

On Mon, Jun 24, 2024 at 11:45:51AM +0200, Neil Armstrong wrote:
> On 24/06/2024 11:28, Krzysztof Kozlowski wrote:
> > On 24/06/2024 10:59, Neil Armstrong wrote:
> > > Fixes the following:
> > > thermal-zones: 'soc_thermal' does not match any of the regexes: '^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$', 'pinctrl-[0-9]+'
> > >          from schema $id: http://devicetree.org/schemas/thermal/thermal-zones.yaml#
> > > 
> > > Fixes: 593ab951232b ("arm64: dts: amlogic: ad402: setup thermal-zones")
> > > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> > > ---
> > >   arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts | 2 +-
> > >   1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
> > > index 6883471a93b4..0d92f5253b64 100644
> > > --- a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
> > > +++ b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
> > > @@ -86,7 +86,7 @@ vddio_1v8: regulator-vddio-1v8 {
> > >   	};
> > >   	thermal-zones {
> > > -		soc_thermal: soc_thermal {
> > > +		soc_thermal: soc-thermal {
> > 
> > I was fixing all underscores... but then mentioned above commit
> > re-introduced them.
> 
> Sorry about that, I'm removing all dtbs check errors, so I'll be able to spot
> this before merging anything now !
> 
> > 
> > Some fixes need to be done more than once to stick. :)
> > 
> > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >
> > Best regards,
> > Krzysztof
> > 
> 
> Thanks,
> Neil
Neil Armstrong June 25, 2024, 9:55 a.m. UTC | #5
On 25/06/2024 11:53, Dmitry Rokosov wrote:
> Hello Neil and Krzysztof,
> 
> Before posting any commit I've running dt_binding_check and dtbs_check.
> Which target should highlight the errors like mentioned in this fix?
> Please advise what I'm doing wrong.
> 
> My commands:
> 
> $ /usr/bin/make ARCH=arm64 INSTALL_MOD_PATH=$ROOT/out/$TARGET/target CROSS_COMPILE="$ROOT/out/$TARGET/host/bin/aarch64-buildroot-linux-gnu-" DEPMOD=$ROOT/out/$TARGET/host/sbin/depmod INSTALL_MOD_STRIP=1 -C $ROOT/out/$TARGET/build/linux-custom dt_binding_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/example_device.yaml
> $ /usr/bin/make ARCH=arm64 INSTALL_MOD_PATH=$ROOT/out/$TARGET/target CROSS_COMPILE="$ROOT/out/$TARGET/host/bin/aarch64-buildroot-linux-gnu-" DEPMOD=$ROOT/out/$TARGET/host/sbin/depmod INSTALL_MOD_STRIP=1 -C $ROOT/out/$TARGET/build/linux-custom dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/example_device.yaml

Thus should work, but I use:
make ARCH=arm64 DTBS_CHECK=y $(cd arch/arm64/boot/dts; find amlogic/ -name "*.dts" | sed "s/dts/dtb/")

to only check amlogic dtbs.

Neil

> 
> On Mon, Jun 24, 2024 at 11:45:51AM +0200, Neil Armstrong wrote:
>> On 24/06/2024 11:28, Krzysztof Kozlowski wrote:
>>> On 24/06/2024 10:59, Neil Armstrong wrote:
>>>> Fixes the following:
>>>> thermal-zones: 'soc_thermal' does not match any of the regexes: '^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$', 'pinctrl-[0-9]+'
>>>>           from schema $id: http://devicetree.org/schemas/thermal/thermal-zones.yaml#
>>>>
>>>> Fixes: 593ab951232b ("arm64: dts: amlogic: ad402: setup thermal-zones")
>>>> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
>>>> ---
>>>>    arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts | 2 +-
>>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
>>>> index 6883471a93b4..0d92f5253b64 100644
>>>> --- a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
>>>> +++ b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
>>>> @@ -86,7 +86,7 @@ vddio_1v8: regulator-vddio-1v8 {
>>>>    	};
>>>>    	thermal-zones {
>>>> -		soc_thermal: soc_thermal {
>>>> +		soc_thermal: soc-thermal {
>>>
>>> I was fixing all underscores... but then mentioned above commit
>>> re-introduced them.
>>
>> Sorry about that, I'm removing all dtbs check errors, so I'll be able to spot
>> this before merging anything now !
>>
>>>
>>> Some fixes need to be done more than once to stick. :)
>>>
>>> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >
>>> Best regards,
>>> Krzysztof
>>>
>>
>> Thanks,
>> Neil
>
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
index 6883471a93b4..0d92f5253b64 100644
--- a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
@@ -86,7 +86,7 @@  vddio_1v8: regulator-vddio-1v8 {
 	};
 
 	thermal-zones {
-		soc_thermal: soc_thermal {
+		soc_thermal: soc-thermal {
 			polling-delay = <1000>;
 			polling-delay-passive = <100>;
 			sustainable-power = <130>;