diff mbox series

[RESEND,V4,2/3] arm64: dts: imx8qxp: Move watchdog node into scu node

Message ID 1557655528-12816-2-git-send-email-Anson.Huang@nxp.com (mailing list archive)
State Superseded
Headers show
Series [RESEND,V4,1/3] dt-bindings: watchdog: move i.MX system controller watchdog binding to SCU | expand

Commit Message

Anson Huang May 12, 2019, 10:10 a.m. UTC
i.MX system controller watchdog has pretimeout function which
depends on i.MX SCU driver, so it should be a subnode of SCU.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
No change, just resend patch with correct encoding.
---
 arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Anson Huang June 4, 2019, 9:06 a.m. UTC | #1
Hi, Shawn
	The driver and binding doc are already reviewed and waiting for DT patch, will you help review this DT patch?

Thanks,
Anson

> -----Original Message-----
> From: Anson Huang
> Sent: Sunday, May 12, 2019 6:11 PM
> To: robh+dt@kernel.org; mark.rutland@arm.com; wim@linux-watchdog.org;
> linux@roeck-us.net; shawnguo@kernel.org; s.hauer@pengutronix.de;
> kernel@pengutronix.de; festevam@gmail.com; Aisheng Dong
> <aisheng.dong@nxp.com>; ulf.hansson@linaro.org; Daniel Baluta
> <daniel.baluta@nxp.com>; Peng Fan <peng.fan@nxp.com>;
> devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; linux-
> watchdog@vger.kernel.org; linux-arm-kernel@lists.infradead.org
> Cc: dl-linux-imx <linux-imx@nxp.com>
> Subject: [PATCH RESEND V4 2/3] arm64: dts: imx8qxp: Move watchdog node
> into scu node
> 
> i.MX system controller watchdog has pretimeout function which depends on
> i.MX SCU driver, so it should be a subnode of SCU.
> 
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> ---
> No change, just resend patch with correct encoding.
> ---
>  arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> index 0683ee2..b17c22e 100644
> --- a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> +++ b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> @@ -149,6 +149,11 @@
>  		rtc: rtc {
>  			compatible = "fsl,imx8qxp-sc-rtc";
>  		};
> +
> +		watchdog {
> +			compatible = "fsl,imx8qxp-sc-wdt", "fsl,imx-sc-wdt";
> +			timeout-sec = <60>;
> +		};
>  	};
> 
>  	timer {
> @@ -517,9 +522,4 @@
>  			power-domains = <&pd IMX_SC_R_GPIO_7>;
>  		};
>  	};
> -
> -	watchdog {
> -		compatible = "fsl,imx8qxp-sc-wdt", "fsl,imx-sc-wdt";
> -		timeout-sec = <60>;
> -	};
>  };
> --
> 2.7.4
Shawn Guo June 5, 2019, 6 a.m. UTC | #2
On Tue, Jun 04, 2019 at 09:06:28AM +0000, Anson Huang wrote:
> Hi, Shawn
> 	The driver and binding doc are already reviewed and waiting for DT patch, will you help review this DT patch?

I'm fine with it.  Should I just pick this patch up, or is there any
dependency we need to handle?

Shawn

> 
> Thanks,
> Anson
> 
> > -----Original Message-----
> > From: Anson Huang
> > Sent: Sunday, May 12, 2019 6:11 PM
> > To: robh+dt@kernel.org; mark.rutland@arm.com; wim@linux-watchdog.org;
> > linux@roeck-us.net; shawnguo@kernel.org; s.hauer@pengutronix.de;
> > kernel@pengutronix.de; festevam@gmail.com; Aisheng Dong
> > <aisheng.dong@nxp.com>; ulf.hansson@linaro.org; Daniel Baluta
> > <daniel.baluta@nxp.com>; Peng Fan <peng.fan@nxp.com>;
> > devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; linux-
> > watchdog@vger.kernel.org; linux-arm-kernel@lists.infradead.org
> > Cc: dl-linux-imx <linux-imx@nxp.com>
> > Subject: [PATCH RESEND V4 2/3] arm64: dts: imx8qxp: Move watchdog node
> > into scu node
> > 
> > i.MX system controller watchdog has pretimeout function which depends on
> > i.MX SCU driver, so it should be a subnode of SCU.
> > 
> > Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> > ---
> > No change, just resend patch with correct encoding.
> > ---
> >  arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> > 
> > diff --git a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> > b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> > index 0683ee2..b17c22e 100644
> > --- a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> > +++ b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> > @@ -149,6 +149,11 @@
> >  		rtc: rtc {
> >  			compatible = "fsl,imx8qxp-sc-rtc";
> >  		};
> > +
> > +		watchdog {
> > +			compatible = "fsl,imx8qxp-sc-wdt", "fsl,imx-sc-wdt";
> > +			timeout-sec = <60>;
> > +		};
> >  	};
> > 
> >  	timer {
> > @@ -517,9 +522,4 @@
> >  			power-domains = <&pd IMX_SC_R_GPIO_7>;
> >  		};
> >  	};
> > -
> > -	watchdog {
> > -		compatible = "fsl,imx8qxp-sc-wdt", "fsl,imx-sc-wdt";
> > -		timeout-sec = <60>;
> > -	};
> >  };
> > --
> > 2.7.4
>
Anson Huang June 5, 2019, 6:09 a.m. UTC | #3
Hi, Shawn

> -----Original Message-----
> From: Shawn Guo <shawnguo@kernel.org>
> Sent: Wednesday, June 5, 2019 2:00 PM
> To: Anson Huang <anson.huang@nxp.com>
> Cc: robh+dt@kernel.org; mark.rutland@arm.com; wim@linux-watchdog.org;
> linux@roeck-us.net; s.hauer@pengutronix.de; kernel@pengutronix.de;
> festevam@gmail.com; Aisheng Dong <aisheng.dong@nxp.com>;
> ulf.hansson@linaro.org; Daniel Baluta <daniel.baluta@nxp.com>; Peng Fan
> <peng.fan@nxp.com>; devicetree@vger.kernel.org; linux-
> kernel@vger.kernel.org; linux-watchdog@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; dl-linux-imx <linux-imx@nxp.com>
> Subject: Re: [PATCH RESEND V4 2/3] arm64: dts: imx8qxp: Move watchdog
> node into scu node
> 
> On Tue, Jun 04, 2019 at 09:06:28AM +0000, Anson Huang wrote:
> > Hi, Shawn
> > 	The driver and binding doc are already reviewed and waiting for DT
> patch, will you help review this DT patch?
> 
> I'm fine with it.  Should I just pick this patch up, or is there any dependency
> we need to handle?

No dependency, it just makes more sense to move the node into SCU node as it is NOW depending on SCU
driver. Once you pick up this patch (and maybe the dt-binding patch as well?), I will notify the watchdog
maintainer to pick up the watchdog patch in this series.

Thanks,
Anson

> 
> Shawn
> 
> >
> > Thanks,
> > Anson
> >
> > > -----Original Message-----
> > > From: Anson Huang
> > > Sent: Sunday, May 12, 2019 6:11 PM
> > > To: robh+dt@kernel.org; mark.rutland@arm.com;
> > > wim@linux-watchdog.org; linux@roeck-us.net; shawnguo@kernel.org;
> > > s.hauer@pengutronix.de; kernel@pengutronix.de; festevam@gmail.com;
> > > Aisheng Dong <aisheng.dong@nxp.com>; ulf.hansson@linaro.org; Daniel
> > > Baluta <daniel.baluta@nxp.com>; Peng Fan <peng.fan@nxp.com>;
> > > devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; linux-
> > > watchdog@vger.kernel.org; linux-arm-kernel@lists.infradead.org
> > > Cc: dl-linux-imx <linux-imx@nxp.com>
> > > Subject: [PATCH RESEND V4 2/3] arm64: dts: imx8qxp: Move watchdog
> > > node into scu node
> > >
> > > i.MX system controller watchdog has pretimeout function which
> > > depends on i.MX SCU driver, so it should be a subnode of SCU.
> > >
> > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> > > ---
> > > No change, just resend patch with correct encoding.
> > > ---
> > >  arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 10 +++++-----
> > >  1 file changed, 5 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> > > b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> > > index 0683ee2..b17c22e 100644
> > > --- a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> > > +++ b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> > > @@ -149,6 +149,11 @@
> > >  		rtc: rtc {
> > >  			compatible = "fsl,imx8qxp-sc-rtc";
> > >  		};
> > > +
> > > +		watchdog {
> > > +			compatible = "fsl,imx8qxp-sc-wdt", "fsl,imx-sc-wdt";
> > > +			timeout-sec = <60>;
> > > +		};
> > >  	};
> > >
> > >  	timer {
> > > @@ -517,9 +522,4 @@
> > >  			power-domains = <&pd IMX_SC_R_GPIO_7>;
> > >  		};
> > >  	};
> > > -
> > > -	watchdog {
> > > -		compatible = "fsl,imx8qxp-sc-wdt", "fsl,imx-sc-wdt";
> > > -		timeout-sec = <60>;
> > > -	};
> > >  };
> > > --
> > > 2.7.4
> >
Shawn Guo June 5, 2019, 6:12 a.m. UTC | #4
On Wed, Jun 05, 2019 at 06:09:12AM +0000, Anson Huang wrote:
> Hi, Shawn
> 
> > -----Original Message-----
> > From: Shawn Guo <shawnguo@kernel.org>
> > Sent: Wednesday, June 5, 2019 2:00 PM
> > To: Anson Huang <anson.huang@nxp.com>
> > Cc: robh+dt@kernel.org; mark.rutland@arm.com; wim@linux-watchdog.org;
> > linux@roeck-us.net; s.hauer@pengutronix.de; kernel@pengutronix.de;
> > festevam@gmail.com; Aisheng Dong <aisheng.dong@nxp.com>;
> > ulf.hansson@linaro.org; Daniel Baluta <daniel.baluta@nxp.com>; Peng Fan
> > <peng.fan@nxp.com>; devicetree@vger.kernel.org; linux-
> > kernel@vger.kernel.org; linux-watchdog@vger.kernel.org; linux-arm-
> > kernel@lists.infradead.org; dl-linux-imx <linux-imx@nxp.com>
> > Subject: Re: [PATCH RESEND V4 2/3] arm64: dts: imx8qxp: Move watchdog
> > node into scu node
> > 
> > On Tue, Jun 04, 2019 at 09:06:28AM +0000, Anson Huang wrote:
> > > Hi, Shawn
> > > 	The driver and binding doc are already reviewed and waiting for DT
> > patch, will you help review this DT patch?
> > 
> > I'm fine with it.  Should I just pick this patch up, or is there any dependency
> > we need to handle?
> 
> No dependency, it just makes more sense to move the node into SCU node as it is NOW depending on SCU
> driver. Once you pick up this patch

Just applied.

> (and maybe the dt-binding patch as well?),

It makes more sense to have it go through watchdog tree.

Shawn

> I will notify the watchdog
> maintainer to pick up the watchdog patch in this series.
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
index 0683ee2..b17c22e 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
@@ -149,6 +149,11 @@ 
 		rtc: rtc {
 			compatible = "fsl,imx8qxp-sc-rtc";
 		};
+
+		watchdog {
+			compatible = "fsl,imx8qxp-sc-wdt", "fsl,imx-sc-wdt";
+			timeout-sec = <60>;
+		};
 	};
 
 	timer {
@@ -517,9 +522,4 @@ 
 			power-domains = <&pd IMX_SC_R_GPIO_7>;
 		};
 	};
-
-	watchdog {
-		compatible = "fsl,imx8qxp-sc-wdt", "fsl,imx-sc-wdt";
-		timeout-sec = <60>;
-	};
 };