1. Patchew
  2. linux
  3. [v3 PATCH 0/2] create patches for nxp-ls1046a platform watchdog feature
  4. View patch

[v3 PATCH 2/2] arch: arm64: dts: add big-endian property back into watchdog node

Meng Li posted 2 patches 8 months, 1 week ago
There is a newer version of this series
[v3 PATCH 2/2] arch: arm64: dts: add big-endian property back into watchdog node
Posted by Meng Li 8 months, 1 week ago 
When verifying watchdog feature on NXP ls1046ardb board,
it doesn't work. Because in commit 7c8ffc5555cb("arm64: dts: layerscape:
remove big-endian for mmc nodes"), it intented to remove the big-endian
from mmc node, but the big-endian of watchdog node is also removed by
accident. So, add watchdog big-endian property back.
In addition, fsl,ls1046a-wdt allows big-endian property, so add it into
compatible property.

Fixes: 7c8ffc5555cb ("arm64: dts: layerscape: remove big-endian for mmc nodes")
Cc: stable@vger.kernel.org
Signed-off-by: Meng Li <Meng.Li@windriver.com>
---
 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
index 0baf256b4400..983b2f0e8797 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
@@ -687,11 +687,12 @@ lpuart5: serial@29a0000 {
 		};
 
 		wdog0: watchdog@2ad0000 {
-			compatible = "fsl,imx21-wdt";
+			compatible = "fsl,ls1046a-wdt", "fsl,imx21-wdt";
 			reg = <0x0 0x2ad0000 0x0 0x10000>;
 			interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
 					    QORIQ_CLK_PLL_DIV(2)>;
+			big-endian;
 		};
 
 		edma0: dma-controller@2c00000 {
-- 
2.34.1
Re: [v3 PATCH 2/2] arch: arm64: dts: add big-endian property back into watchdog node
Posted by Frank Li 8 months, 1 week ago 
On Tue, Jun 03, 2025 at 12:02:30PM +0800, Meng Li wrote:
> When verifying watchdog feature on NXP ls1046ardb board,
> it doesn't work. Because in commit 7c8ffc5555cb("arm64: dts: layerscape:

Watchdog doesn't work on NXP ls1046ardb board because ...

please wrap at 75 chas.
> remove big-endian for mmc nodes"), it intented to remove the big-endian
> from mmc node, but the big-endian of watchdog node is also removed by
> accident. So, add watchdog big-endian property back.

extra empty line here.

> In addition, fsl,ls1046a-wdt allows big-endian property, so add it into
> compatible property.

In addition, add compatible string fsl,ls1046a-wdt, which allow big-endian
property.

>
> Fixes: 7c8ffc5555cb ("arm64: dts: layerscape: remove big-endian for mmc nodes")
> Cc: stable@vger.kernel.org
> Signed-off-by: Meng Li <Meng.Li@windriver.com>

after above small fix

Reviewed-by: Frank Li <Frank.Li@nxp.com>

> ---
>  arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
> index 0baf256b4400..983b2f0e8797 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
> @@ -687,11 +687,12 @@ lpuart5: serial@29a0000 {
>  		};
>
>  		wdog0: watchdog@2ad0000 {
> -			compatible = "fsl,imx21-wdt";
> +			compatible = "fsl,ls1046a-wdt", "fsl,imx21-wdt";
>  			reg = <0x0 0x2ad0000 0x0 0x10000>;
>  			interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
>  					    QORIQ_CLK_PLL_DIV(2)>;
> +			big-endian;
>  		};
>
>  		edma0: dma-controller@2c00000 {
> --
> 2.34.1
>
Re: [v3 PATCH 2/2] arch: arm64: dts: add big-endian property back into watchdog node
Posted by Peng Fan 8 months, 1 week ago 
On Tue, Jun 03, 2025 at 10:55:01AM -0400, Frank Li wrote:
>On Tue, Jun 03, 2025 at 12:02:30PM +0800, Meng Li wrote:
>> When verifying watchdog feature on NXP ls1046ardb board,
>> it doesn't work. Because in commit 7c8ffc5555cb("arm64: dts: layerscape:
>
>Watchdog doesn't work on NXP ls1046ardb board because ...
>
>please wrap at 75 chas.
>> remove big-endian for mmc nodes"), it intented to remove the big-endian
>> from mmc node, but the big-endian of watchdog node is also removed by
>> accident. So, add watchdog big-endian property back.
>
>extra empty line here.
>
>> In addition, fsl,ls1046a-wdt allows big-endian property, so add it into
>> compatible property.
>
>In addition, add compatible string fsl,ls1046a-wdt, which allow big-endian
>property.
>
>>
>> Fixes: 7c8ffc5555cb ("arm64: dts: layerscape: remove big-endian for mmc nodes")
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Meng Li <Meng.Li@windriver.com>
>
>after above small fix
>
>Reviewed-by: Frank Li <Frank.Li@nxp.com>
>
>> ---
>>  arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
>> index 0baf256b4400..983b2f0e8797 100644
>> --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
>> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
>> @@ -687,11 +687,12 @@ lpuart5: serial@29a0000 {
>>  		};
>>
>>  		wdog0: watchdog@2ad0000 {
>> -			compatible = "fsl,imx21-wdt";
>> +			compatible = "fsl,ls1046a-wdt", "fsl,imx21-wdt";

So ls1046a is really compatible with imx21?

Regards,
Peng

>>  			reg = <0x0 0x2ad0000 0x0 0x10000>;
>>  			interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
>>  			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
>>  					    QORIQ_CLK_PLL_DIV(2)>;
>> +			big-endian;
>>  		};
>>
>>  		edma0: dma-controller@2c00000 {
>> --
>> 2.34.1
>>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.