[v3 PATCH 0/2] create patches for nxp-ls1046a platform watchdog feature

[v3 PATCH 0/2] create patches for nxp-ls1046a platform watchdog feature

[Meng Li]

v3:
 - merge patch 0002 into patch 0001
 - improve the commit log of patches

v2:
 - improve the commit log of patch 0001
 - add another 2 patches to fix below warning
 arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dtb: watchdog@2ad0000(fsl,imx21-wdt): big-endian: False schema does not allow True

v1:
 - create patch 0001-arch-arm64-dts-add-big-endian-property-back-into-wat.patch
 
Meng Li (2):
  dt-bindings: watchdog: fsl-imx-wdt: add compatible string
    fsl,ls1046a-wdt
  arch: arm64: dts: add big-endian property back into watchdog node

 Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 2 ++
 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi              | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

-- 
2.34.1

[v3 PATCH 1/2] dt-bindings: watchdog: fsl-imx-wdt: add compatible string fsl,ls1046a-wdt

[Meng Li]

Add compatible string fsl,ls1046a-wdt for ls1046a SoC. fsl,ls1046a-wdt
allows big-endian property.

Signed-off-by: Meng Li <Meng.Li@windriver.com>
---
 Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
index 8a6c3a75a547..34951783a633 100644
--- a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
@@ -37,6 +37,7 @@ properties:
               - fsl,ls1012a-wdt
               - fsl,ls1021a-wdt
               - fsl,ls1043a-wdt
+              - fsl,ls1046a-wdt
               - fsl,vf610-wdt
           - const: fsl,imx21-wdt
 
@@ -105,6 +106,7 @@ allOf:
                 - fsl,ls1012a-wdt
                 - fsl,ls1021a-wdt
                 - fsl,ls1043a-wdt
+                - fsl,ls1046a-wdt
     then:
       properties:
         big-endian: false
-- 
2.34.1

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

[Meng Li]

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 1/2] dt-bindings: watchdog: fsl-imx-wdt: add compatible string fsl,ls1046a-wdt

[Frank Li]

On Tue, Jun 03, 2025 at 12:02:29PM +0800, Meng Li wrote:
> Add compatible string fsl,ls1046a-wdt for ls1046a SoC. fsl,ls1046a-wdt
> allows big-endian property.
>
> Signed-off-by: Meng Li <Meng.Li@windriver.com>

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

> ---
>  Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
> index 8a6c3a75a547..34951783a633 100644
> --- a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
> +++ b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
> @@ -37,6 +37,7 @@ properties:
>                - fsl,ls1012a-wdt
>                - fsl,ls1021a-wdt
>                - fsl,ls1043a-wdt
> +              - fsl,ls1046a-wdt
>                - fsl,vf610-wdt
>            - const: fsl,imx21-wdt
>
> @@ -105,6 +106,7 @@ allOf:
>                  - fsl,ls1012a-wdt
>                  - fsl,ls1021a-wdt
>                  - fsl,ls1043a-wdt
> +                - fsl,ls1046a-wdt
>      then:
>        properties:
>          big-endian: false
> --
> 2.34.1
>

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

[Frank Li]

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

[Li, Meng]

> -----Original Message-----
> From: Peng Fan <peng.fan@oss.nxp.com>
> Sent: Thursday, June 5, 2025 10:42 AM
> To: Frank Li <Frank.li@nxp.com>
> Cc: Li, Meng <Meng.Li@windriver.com>; linux@roeck-us.net;
> s.hauer@pengutronix.de; kernel@pengutronix.de; linux-
> watchdog@vger.kernel.org; imx@lists.linux.dev; shawnguo@kernel.org;
> robh@kernel.org; conor+dt@kernel.org; linux-arm-kernel@lists.infradead.org;
> devicetree@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: Re: [v3 PATCH 2/2] arch: arm64: dts: add big-endian property back
> into watchdog node
> 
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and
> know the content is safe.
> 
> 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?
> 

Yes. I think LS1046/ls1043 use the same watchdog device as imx21

Thanks,
LImeng

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

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

[Peng Fan]

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