* [PATCH 2/3] ARM: dts: imx: align watchdog node name with dtschema
2020-09-26 16:23 [PATCH 1/3] dt-bindings: watchdog: fsl-imx: document i.MX compatibles Krzysztof Kozlowski
@ 2020-09-26 16:23 ` Krzysztof Kozlowski
2020-10-29 14:38 ` Shawn Guo
2020-09-26 16:23 ` [PATCH 3/3] ARM: dts: vf: " Krzysztof Kozlowski
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Krzysztof Kozlowski @ 2020-09-26 16:23 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck, Rob Herring, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam,
NXP Linux Team, Stefan Agner, Anson Huang, linux-watchdog,
devicetree, linux-arm-kernel, linux-kernel
Cc: Krzysztof Kozlowski
The dtschema expects watchdog device node name to be "watchdog":
arch/arm/boot/dts/imx31-bug.dt.yaml: wdog@53fdc000:
$nodename:0: 'wdog@53fdc000' does not match '^watchdog(@.*|-[0-9a-f])?$'
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
arch/arm/boot/dts/imx25.dtsi | 2 +-
arch/arm/boot/dts/imx27.dtsi | 2 +-
arch/arm/boot/dts/imx31.dtsi | 3 ++-
arch/arm/boot/dts/imx35.dtsi | 2 +-
arch/arm/boot/dts/imx50.dtsi | 2 +-
arch/arm/boot/dts/imx51.dtsi | 4 ++--
arch/arm/boot/dts/imx53.dtsi | 4 ++--
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 1ab19f1268f8..fdcca82c9986 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -525,7 +525,7 @@
fsl,sdma-ram-script-name = "imx/sdma/sdma-imx25.bin";
};
- wdog@53fdc000 {
+ watchdog@53fdc000 {
compatible = "fsl,imx25-wdt", "fsl,imx21-wdt";
reg = <0x53fdc000 0x4000>;
clocks = <&clks 126>;
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index 7bc132737a37..fd525c3b16fa 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -99,7 +99,7 @@
#dma-channels = <16>;
};
- wdog: wdog@10002000 {
+ wdog: watchdog@10002000 {
compatible = "fsl,imx27-wdt", "fsl,imx21-wdt";
reg = <0x10002000 0x1000>;
interrupts = <27>;
diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index 45333f7e10ea..948d2a543f8d 100644
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -315,10 +315,11 @@
clock-names = "ref", "ipg";
};
- wdog: wdog@53fdc000 {
+ wdog: watchdog@53fdc000 {
compatible = "fsl,imx31-wdt", "fsl,imx21-wdt";
reg = <0x53fdc000 0x4000>;
clocks = <&clks 41>;
+ interrupts = <55>;
};
pwm: pwm@53fe0000 {
diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi
index aba16252faab..98ccc81ca6d9 100644
--- a/arch/arm/boot/dts/imx35.dtsi
+++ b/arch/arm/boot/dts/imx35.dtsi
@@ -294,7 +294,7 @@
fsl,sdma-ram-script-name = "imx/sdma/sdma-imx35.bin";
};
- wdog: wdog@53fdc000 {
+ wdog: watchdog@53fdc000 {
compatible = "fsl,imx35-wdt", "fsl,imx21-wdt";
reg = <0x53fdc000 0x4000>;
clocks = <&clks 74>;
diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index b6b2e6af9b96..a969f335b240 100644
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -267,7 +267,7 @@
<&iomuxc 20 140 11>;
};
- wdog1: wdog@53f98000 {
+ wdog1: watchdog@53f98000 {
compatible = "fsl,imx50-wdt", "fsl,imx21-wdt";
reg = <0x53f98000 0x4000>;
interrupts = <58>;
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 985e1be03ad6..7ebb46ce9e36 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -370,14 +370,14 @@
status = "disabled";
};
- wdog1: wdog@73f98000 {
+ wdog1: watchdog@73f98000 {
compatible = "fsl,imx51-wdt", "fsl,imx21-wdt";
reg = <0x73f98000 0x4000>;
interrupts = <58>;
clocks = <&clks IMX5_CLK_DUMMY>;
};
- wdog2: wdog@73f9c000 {
+ wdog2: watchdog@73f9c000 {
compatible = "fsl,imx51-wdt", "fsl,imx21-wdt";
reg = <0x73f9c000 0x4000>;
interrupts = <59>;
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 500eeaa3a27c..000050aeeabe 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -427,14 +427,14 @@
status = "disabled";
};
- wdog1: wdog@53f98000 {
+ wdog1: watchdog@53f98000 {
compatible = "fsl,imx53-wdt", "fsl,imx21-wdt";
reg = <0x53f98000 0x4000>;
interrupts = <58>;
clocks = <&clks IMX5_CLK_DUMMY>;
};
- wdog2: wdog@53f9c000 {
+ wdog2: watchdog@53f9c000 {
compatible = "fsl,imx53-wdt", "fsl,imx21-wdt";
reg = <0x53f9c000 0x4000>;
interrupts = <59>;
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 2/3] ARM: dts: imx: align watchdog node name with dtschema
2020-09-26 16:23 ` [PATCH 2/3] ARM: dts: imx: align watchdog node name with dtschema Krzysztof Kozlowski
@ 2020-10-29 14:38 ` Shawn Guo
0 siblings, 0 replies; 8+ messages in thread
From: Shawn Guo @ 2020-10-29 14:38 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Wim Van Sebroeck, Guenter Roeck, Rob Herring, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
Stefan Agner, Anson Huang, linux-watchdog, devicetree,
linux-arm-kernel, linux-kernel
On Sat, Sep 26, 2020 at 06:23:01PM +0200, Krzysztof Kozlowski wrote:
> The dtschema expects watchdog device node name to be "watchdog":
>
> arch/arm/boot/dts/imx31-bug.dt.yaml: wdog@53fdc000:
> $nodename:0: 'wdog@53fdc000' does not match '^watchdog(@.*|-[0-9a-f])?$'
>
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Applied, thanks.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/3] ARM: dts: vf: align watchdog node name with dtschema
2020-09-26 16:23 [PATCH 1/3] dt-bindings: watchdog: fsl-imx: document i.MX compatibles Krzysztof Kozlowski
2020-09-26 16:23 ` [PATCH 2/3] ARM: dts: imx: align watchdog node name with dtschema Krzysztof Kozlowski
@ 2020-09-26 16:23 ` Krzysztof Kozlowski
2020-10-29 14:39 ` Shawn Guo
2020-09-29 19:13 ` [PATCH 1/3] dt-bindings: watchdog: fsl-imx: document i.MX compatibles Rob Herring
2020-10-29 14:35 ` Shawn Guo
3 siblings, 1 reply; 8+ messages in thread
From: Krzysztof Kozlowski @ 2020-09-26 16:23 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck, Rob Herring, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam,
NXP Linux Team, Stefan Agner, Anson Huang, linux-watchdog,
devicetree, linux-arm-kernel, linux-kernel
Cc: Krzysztof Kozlowski
The dtschema expects watchdog device node name to be "watchdog":
arch/arm/boot/dts/vf500-colibri-eval-v3.dt.yaml: wdog@4003e000:
$nodename:0: 'wdog@4003e000' does not match '^watchdog(@.*|-[0-9a-f])?$'
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
arch/arm/boot/dts/vfxxx.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi
index 2259d11af721..0c8d15fd9253 100644
--- a/arch/arm/boot/dts/vfxxx.dtsi
+++ b/arch/arm/boot/dts/vfxxx.dtsi
@@ -293,7 +293,7 @@
status = "disabled";
};
- wdoga5: wdog@4003e000 {
+ wdoga5: watchdog@4003e000 {
compatible = "fsl,vf610-wdt", "fsl,imx21-wdt";
reg = <0x4003e000 0x1000>;
interrupts = <20 IRQ_TYPE_LEVEL_HIGH>;
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 3/3] ARM: dts: vf: align watchdog node name with dtschema
2020-09-26 16:23 ` [PATCH 3/3] ARM: dts: vf: " Krzysztof Kozlowski
@ 2020-10-29 14:39 ` Shawn Guo
0 siblings, 0 replies; 8+ messages in thread
From: Shawn Guo @ 2020-10-29 14:39 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Wim Van Sebroeck, Guenter Roeck, Rob Herring, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
Stefan Agner, Anson Huang, linux-watchdog, devicetree,
linux-arm-kernel, linux-kernel
On Sat, Sep 26, 2020 at 06:23:02PM +0200, Krzysztof Kozlowski wrote:
> The dtschema expects watchdog device node name to be "watchdog":
>
> arch/arm/boot/dts/vf500-colibri-eval-v3.dt.yaml: wdog@4003e000:
> $nodename:0: 'wdog@4003e000' does not match '^watchdog(@.*|-[0-9a-f])?$'
>
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Applied, thanks.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] dt-bindings: watchdog: fsl-imx: document i.MX compatibles
2020-09-26 16:23 [PATCH 1/3] dt-bindings: watchdog: fsl-imx: document i.MX compatibles Krzysztof Kozlowski
2020-09-26 16:23 ` [PATCH 2/3] ARM: dts: imx: align watchdog node name with dtschema Krzysztof Kozlowski
2020-09-26 16:23 ` [PATCH 3/3] ARM: dts: vf: " Krzysztof Kozlowski
@ 2020-09-29 19:13 ` Rob Herring
2020-10-29 14:35 ` Shawn Guo
3 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2020-09-29 19:13 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: devicetree, NXP Linux Team, Stefan Agner, Anson Huang,
linux-kernel, Rob Herring, Wim Van Sebroeck, Guenter Roeck,
Sascha Hauer, linux-arm-kernel, Fabio Estevam, Shawn Guo,
Pengutronix Kernel Team, linux-watchdog
On Sat, 26 Sep 2020 18:23:00 +0200, Krzysztof Kozlowski wrote:
> Document all ARMv5, ARMv6 and ARMv7 i.MX compatibles used in DTSes (even
> though driver binds only to fsl,imx21-wdt) to fix dtbs_check warnings
> like:
>
> arch/arm/boot/dts/imx53-qsb.dt.yaml: gpio@53fe0000: compatible:
> ['fsl,imx53-gpio', 'fsl,imx35-gpio'] is not valid under any of the given schemas
>
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> ---
> .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] dt-bindings: watchdog: fsl-imx: document i.MX compatibles
2020-09-26 16:23 [PATCH 1/3] dt-bindings: watchdog: fsl-imx: document i.MX compatibles Krzysztof Kozlowski
` (2 preceding siblings ...)
2020-09-29 19:13 ` [PATCH 1/3] dt-bindings: watchdog: fsl-imx: document i.MX compatibles Rob Herring
@ 2020-10-29 14:35 ` Shawn Guo
2020-10-29 16:13 ` Krzysztof Kozlowski
3 siblings, 1 reply; 8+ messages in thread
From: Shawn Guo @ 2020-10-29 14:35 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Wim Van Sebroeck, Guenter Roeck, Rob Herring, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
Stefan Agner, Anson Huang, linux-watchdog, devicetree,
linux-arm-kernel, linux-kernel
On Sat, Sep 26, 2020 at 06:23:00PM +0200, Krzysztof Kozlowski wrote:
> Document all ARMv5, ARMv6 and ARMv7 i.MX compatibles used in DTSes (even
> though driver binds only to fsl,imx21-wdt) to fix dtbs_check warnings
> like:
>
> arch/arm/boot/dts/imx53-qsb.dt.yaml: gpio@53fe0000: compatible:
> ['fsl,imx53-gpio', 'fsl,imx35-gpio'] is not valid under any of the given schemas
>
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> ---
> .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
> index 991b4e33486e..a06e70f44fd0 100644
> --- a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
> +++ b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
> @@ -18,10 +18,24 @@ properties:
> - const: fsl,imx21-wdt
> - items:
> - enum:
> + - fsl,imx25-wdt
> + - fsl,imx27-wdt
> + - fsl,imx31-wdt
> + - fsl,imx35-wdt
> + - fsl,imx50-wdt
> + - fsl,imx51-wdt
> + - fsl,imx53-wdt
> + - fsl,imx6q-wdt
> + - fsl,imx6sl-wdt
> + - fsl,imx6sll-wdt
> + - fsl,imx6sx-wdt
> + - fsl,imx6ul-wdt
> + - fsl,imx7d-wdt
> - fsl,imx8mm-wdt
> - fsl,imx8mn-wdt
> - fsl,imx8mp-wdt
> - fsl,imx8mq-wdt
Could you add the following two as well?
- fsl,ls1012a-wdt
- fsl,ls1043a-wdt
Shawn
> + - fsl,vf610-wdt
> - const: fsl,imx21-wdt
>
> reg:
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/3] dt-bindings: watchdog: fsl-imx: document i.MX compatibles
2020-10-29 14:35 ` Shawn Guo
@ 2020-10-29 16:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 8+ messages in thread
From: Krzysztof Kozlowski @ 2020-10-29 16:13 UTC (permalink / raw)
To: Shawn Guo
Cc: Wim Van Sebroeck, Guenter Roeck, Rob Herring, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
Stefan Agner, Anson Huang, linux-watchdog, devicetree,
linux-arm-kernel, linux-kernel
On Thu, Oct 29, 2020 at 10:35:09PM +0800, Shawn Guo wrote:
> On Sat, Sep 26, 2020 at 06:23:00PM +0200, Krzysztof Kozlowski wrote:
> > Document all ARMv5, ARMv6 and ARMv7 i.MX compatibles used in DTSes (even
> > though driver binds only to fsl,imx21-wdt) to fix dtbs_check warnings
> > like:
> >
> > arch/arm/boot/dts/imx53-qsb.dt.yaml: gpio@53fe0000: compatible:
> > ['fsl,imx53-gpio', 'fsl,imx35-gpio'] is not valid under any of the given schemas
> >
> > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> > ---
> > .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 14 ++++++++++++++
> > 1 file changed, 14 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
> > index 991b4e33486e..a06e70f44fd0 100644
> > --- a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
> > +++ b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
> > @@ -18,10 +18,24 @@ properties:
> > - const: fsl,imx21-wdt
> > - items:
> > - enum:
> > + - fsl,imx25-wdt
> > + - fsl,imx27-wdt
> > + - fsl,imx31-wdt
> > + - fsl,imx35-wdt
> > + - fsl,imx50-wdt
> > + - fsl,imx51-wdt
> > + - fsl,imx53-wdt
> > + - fsl,imx6q-wdt
> > + - fsl,imx6sl-wdt
> > + - fsl,imx6sll-wdt
> > + - fsl,imx6sx-wdt
> > + - fsl,imx6ul-wdt
> > + - fsl,imx7d-wdt
> > - fsl,imx8mm-wdt
> > - fsl,imx8mn-wdt
> > - fsl,imx8mp-wdt
> > - fsl,imx8mq-wdt
>
> Could you add the following two as well?
>
> - fsl,ls1012a-wdt
> - fsl,ls1043a-wdt
I focused in these patches on i.MX but I can fix the Layerscape as well.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 8+ messages in thread