[PATCH 1/3] dt-bindings: fsl: scu: Update RTC compatible string

[PATCH 1/3] dt-bindings: fsl: scu: Update RTC compatible string

[Anson.Huang]

From: Anson Huang <Anson.Huang@nxp.com>

Update RTC compatible string to make system controller RTC
driver more generic for all i.MX SoCs with system controller
inside.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
This patch should be based on below patch which is already picked by
watchdog maintainer:
https://patchwork.kernel.org/patch/10962183/
---
 Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt b/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
index fc3844e..7ca20a1 100644
--- a/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
+++ b/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
@@ -131,7 +131,9 @@ RTC bindings based on SCU Message Protocol
 ------------------------------------------------------------
 
 Required properties:
-- compatible: should be "fsl,imx8qxp-sc-rtc";
+- compatible: should be:
+              "fsl,imx8qxp-sc-rtc"
+              followed by "fsl,imx-sc-rtc";
 
 OCOTP bindings based on SCU Message Protocol
 ------------------------------------------------------------
@@ -226,7 +228,7 @@ firmware {
 		};
 
 		rtc: rtc {
-			compatible = "fsl,imx8qxp-sc-rtc";
+			compatible = "fsl,imx8qxp-sc-rtc", "fsl,imx-sc-rtc";
 		};
 
 		watchdog {
-- 
2.7.4

[PATCH 2/3] rtc: imx-sc: Make compatible string more generic

[Anson.Huang]

From: Anson Huang <Anson.Huang@nxp.com>

i.MX system controller RTC driver can support all i.MX SoCs
with system controller inside, this patch makes the compatible
string more generic to support other i.MX SoCs with system
controller inside, such as i.MX8QM etc..

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
 drivers/rtc/rtc-imx-sc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/rtc/rtc-imx-sc.c b/drivers/rtc/rtc-imx-sc.c
index c933045..38ef3ca 100644
--- a/drivers/rtc/rtc-imx-sc.c
+++ b/drivers/rtc/rtc-imx-sc.c
@@ -178,7 +178,7 @@ static int imx_sc_rtc_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id imx_sc_dt_ids[] = {
-	{ .compatible = "fsl,imx8qxp-sc-rtc", },
+	{ .compatible = "fsl,imx-sc-rtc", },
 	{}
 };
 MODULE_DEVICE_TABLE(of, imx_sc_dt_ids);
-- 
2.7.4

[PATCH 3/3] arm64: dts: imx8qxp: Add fallback compatible string for RTC node

[Anson.Huang]

From: Anson Huang <Anson.Huang@nxp.com>

The i.MX system controller RTC driver uses generic compatible
string to support all i.MX SoCs with system controller inside,
this patch adds the generic system controller RTC compatible
string as fallback compatible string accordingly.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
 arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
index 12044be..40811a2 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
@@ -162,7 +162,7 @@
 		};
 
 		rtc: rtc {
-			compatible = "fsl,imx8qxp-sc-rtc";
+			compatible = "fsl,imx8qxp-sc-rtc", "fsl,imx-sc-rtc";
 		};
 
 		watchdog {
-- 
2.7.4

RE: [PATCH 1/3] dt-bindings: fsl: scu: Update RTC compatible string

[Aisheng Dong]

> From: Anson Huang <Anson.Huang@nxp.com>
> 
> Update RTC compatible string to make system controller RTC driver more
> generic for all i.MX SoCs with system controller inside.
> 
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>

Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>

Regards
Dong Aisheng

RE: [PATCH 2/3] rtc: imx-sc: Make compatible string more generic

[Aisheng Dong]

> From: Anson.Huang@nxp.com [mailto:Anson.Huang@nxp.com]
> Sent: Tuesday, June 11, 2019 2:34 PM
> 
> i.MX system controller RTC driver can support all i.MX SoCs with system
> controller inside, this patch makes the compatible string more generic to
> support other i.MX SoCs with system controller inside, such as i.MX8QM etc..
> 
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>

Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>

Regards
Dong Aisheng

> ---
>  drivers/rtc/rtc-imx-sc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/rtc/rtc-imx-sc.c b/drivers/rtc/rtc-imx-sc.c index
> c933045..38ef3ca 100644
> --- a/drivers/rtc/rtc-imx-sc.c
> +++ b/drivers/rtc/rtc-imx-sc.c
> @@ -178,7 +178,7 @@ static int imx_sc_rtc_probe(struct platform_device
> *pdev)  }
> 
>  static const struct of_device_id imx_sc_dt_ids[] = {
> -	{ .compatible = "fsl,imx8qxp-sc-rtc", },
> +	{ .compatible = "fsl,imx-sc-rtc", },
>  	{}
>  };
>  MODULE_DEVICE_TABLE(of, imx_sc_dt_ids);
> --
> 2.7.4

RE: [PATCH 3/3] arm64: dts: imx8qxp: Add fallback compatible string for RTC node

[Aisheng Dong]

> From: Anson.Huang@nxp.com [mailto:Anson.Huang@nxp.com]
> Sent: Tuesday, June 11, 2019 2:34 PM
> 
> The i.MX system controller RTC driver uses generic compatible string to
> support all i.MX SoCs with system controller inside, this patch adds the generic
> system controller RTC compatible string as fallback compatible string
> accordingly.
> 
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>

Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>

Regards
Dong Aisheng

Re: [PATCH 2/3] rtc: imx-sc: Make compatible string more generic

[Alexandre Belloni]

On 11/06/2019 10:57:17+0000, Aisheng Dong wrote:
> > From: Anson.Huang@nxp.com [mailto:Anson.Huang@nxp.com]
> > Sent: Tuesday, June 11, 2019 2:34 PM
> > 
> > i.MX system controller RTC driver can support all i.MX SoCs with system
> > controller inside, this patch makes the compatible string more generic to
> > support other i.MX SoCs with system controller inside, such as i.MX8QM etc..
> > 
> > Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> 
> Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>
> 
> Regards
> Dong Aisheng
> 
> > ---
> >  drivers/rtc/rtc-imx-sc.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/rtc/rtc-imx-sc.c b/drivers/rtc/rtc-imx-sc.c index
> > c933045..38ef3ca 100644
> > --- a/drivers/rtc/rtc-imx-sc.c
> > +++ b/drivers/rtc/rtc-imx-sc.c
> > @@ -178,7 +178,7 @@ static int imx_sc_rtc_probe(struct platform_device
> > *pdev)  }
> > 
> >  static const struct of_device_id imx_sc_dt_ids[] = {
> > -	{ .compatible = "fsl,imx8qxp-sc-rtc", },

Don't you want to keep that compatible for backward compatibility?

> > +	{ .compatible = "fsl,imx-sc-rtc", },
> >  	{}
> >  };
> >  MODULE_DEVICE_TABLE(of, imx_sc_dt_ids);
> > --
> > 2.7.4
> 

-- 
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [PATCH 2/3] rtc: imx-sc: Make compatible string more generic

[Fabio Estevam]

Hi Anson,

On Tue, Jun 11, 2019 at 3:31 AM <Anson.Huang@nxp.com> wrote:
>
> From: Anson Huang <Anson.Huang@nxp.com>
>
> i.MX system controller RTC driver can support all i.MX SoCs
> with system controller inside, this patch makes the compatible
> string more generic to support other i.MX SoCs with system
> controller inside, such as i.MX8QM etc..
>
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> ---
>  drivers/rtc/rtc-imx-sc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/rtc/rtc-imx-sc.c b/drivers/rtc/rtc-imx-sc.c
> index c933045..38ef3ca 100644
> --- a/drivers/rtc/rtc-imx-sc.c
> +++ b/drivers/rtc/rtc-imx-sc.c
> @@ -178,7 +178,7 @@ static int imx_sc_rtc_probe(struct platform_device *pdev)
>  }
>
>  static const struct of_device_id imx_sc_dt_ids[] = {
> -       { .compatible = "fsl,imx8qxp-sc-rtc", },
> +       { .compatible = "fsl,imx-sc-rtc", },

What is wrong with the current compatible string?

If you want to support i.MX8QM just add in its dtsi:

compatible = "fsl,imx8qm-sc-rtc", "fsl,imx8qxp-sc-rtc"

and add a dt-bindings entry for "fsl,imx8qm-sc-rtc"

Re: [PATCH 2/3] rtc: imx-sc: Make compatible string more generic

[Trent Piepho]

On Tue, 2019-06-11 at 17:32 -0300, Fabio Estevam wrote:
> Hi Anson,
> 
> On Tue, Jun 11, 2019 at 3:31 AM <Anson.Huang@nxp.com> wrote:
> > 
> > From: Anson Huang <Anson.Huang@nxp.com>
> > 
> > i.MX system controller RTC driver can support all i.MX SoCs
> > with system controller inside, this patch makes the compatible
> > string more generic to support other i.MX SoCs with system
> > controller inside, such as i.MX8QM etc..
> > 
> > Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> > ---
> >  drivers/rtc/rtc-imx-sc.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/rtc/rtc-imx-sc.c b/drivers/rtc/rtc-imx-sc.c
> > index c933045..38ef3ca 100644
> > --- a/drivers/rtc/rtc-imx-sc.c
> > +++ b/drivers/rtc/rtc-imx-sc.c
> > @@ -178,7 +178,7 @@ static int imx_sc_rtc_probe(struct
> > platform_device *pdev)
> >  }
> > 
> >  static const struct of_device_id imx_sc_dt_ids[] = {
> > -       { .compatible = "fsl,imx8qxp-sc-rtc", },
> > +       { .compatible = "fsl,imx-sc-rtc", },
> 
> What is wrong with the current compatible string?
> 
> If you want to support i.MX8QM just add in its dtsi:
> 
> compatible = "fsl,imx8qm-sc-rtc", "fsl,imx8qxp-sc-rtc"
> 
> and add a dt-bindings entry for "fsl,imx8qm-sc-rtc"

Yes, I thought this is (was?) the recommended practice for IP blocks in
SoCs that don't have their own version (vs something like a Synopsis
block used many places):

* Use the first SoC to have the block as the base compatible for the
block.
* Always add the current SoC, in additional to the base, in the SoC's
dts's list of compatibles.  Even if unneeded at the present.
* The driver will list the base compatible in the match table, and will
add new ones for specific socs if/when there is a need for it.

RE: [PATCH 2/3] rtc: imx-sc: Make compatible string more generic

[Anson Huang]

Hi, Fabio/Trent

> -----Original Message-----
> From: Trent Piepho <tpiepho@impinj.com>
> Sent: Wednesday, June 12, 2019 4:46 AM
> To: festevam@gmail.com; Anson Huang <anson.huang@nxp.com>
> Cc: Aisheng Dong <aisheng.dong@nxp.com>; alexandre.belloni@bootlin.com;
> robh+dt@kernel.org; dl-linux-imx <linux-imx@nxp.com>; linux-
> kernel@vger.kernel.org; devicetree@vger.kernel.org;
> a.zummo@towertech.it; mark.rutland@arm.com; Peng Fan
> <peng.fan@nxp.com>; shawnguo@kernel.org; linux-arm-
> kernel@lists.infradead.org; Daniel Baluta <daniel.baluta@nxp.com>;
> ulf.hansson@linaro.org; kernel@pengutronix.de; linux-rtc@vger.kernel.org;
> s.hauer@pengutronix.de
> Subject: Re: [PATCH 2/3] rtc: imx-sc: Make compatible string more generic
> 
> On Tue, 2019-06-11 at 17:32 -0300, Fabio Estevam wrote:
> > Hi Anson,
> >
> > On Tue, Jun 11, 2019 at 3:31 AM <Anson.Huang@nxp.com> wrote:
> > >
> > > From: Anson Huang <Anson.Huang@nxp.com>
> > >
> > > i.MX system controller RTC driver can support all i.MX SoCs with
> > > system controller inside, this patch makes the compatible string
> > > more generic to support other i.MX SoCs with system controller
> > > inside, such as i.MX8QM etc..
> > >
> > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> > > ---
> > >  drivers/rtc/rtc-imx-sc.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/rtc/rtc-imx-sc.c b/drivers/rtc/rtc-imx-sc.c
> > > index c933045..38ef3ca 100644
> > > --- a/drivers/rtc/rtc-imx-sc.c
> > > +++ b/drivers/rtc/rtc-imx-sc.c
> > > @@ -178,7 +178,7 @@ static int imx_sc_rtc_probe(struct
> > > platform_device *pdev)  }
> > >
> > >  static const struct of_device_id imx_sc_dt_ids[] = {
> > > -       { .compatible = "fsl,imx8qxp-sc-rtc", },
> > > +       { .compatible = "fsl,imx-sc-rtc", },
> >
> > What is wrong with the current compatible string?

Nothing wrong, just want to make it aligned with other SCU drivers, like
SCU watchdog, SCU thermal etc., the driver ONLY contains "fsl,imx-sc-xxx"
compatible string, then for new SoC, we can just add it as compatible or
fallback compatible string, no need to do any change for driver.  

> >
> > If you want to support i.MX8QM just add in its dtsi:
> >
> > compatible = "fsl,imx8qm-sc-rtc", "fsl,imx8qxp-sc-rtc"
> >
> > and add a dt-bindings entry for "fsl,imx8qm-sc-rtc"

I am OK if we can just use " fsl,imx8qxp-sc-rtc" as fallback compatible string
for later SoCs.

> 
> Yes, I thought this is (was?) the recommended practice for IP blocks in SoCs
> that don't have their own version (vs something like a Synopsis block used
> many places):
> 
> * Use the first SoC to have the block as the base compatible for the block.
> * Always add the current SoC, in additional to the base, in the SoC's dts's list
> of compatibles.  Even if unneeded at the present.
> * The driver will list the base compatible in the match table, and will add new
> ones for specific socs if/when there is a need for it.

Make sense, I was recommended to make the fallback compatible string aligned
for all SCU drivers, for me, I am OK with either way, so if you think it is NOT necessary
to do it, we can drop this series.

Thanks,
Anson

Re: [PATCH 1/3] dt-bindings: fsl: scu: Update RTC compatible string

[Rob Herring]

On Tue, 11 Jun 2019 14:33:31 +0800, Anson.Huang@nxp.com wrote:
> From: Anson Huang <Anson.Huang@nxp.com>
> 
> Update RTC compatible string to make system controller RTC
> driver more generic for all i.MX SoCs with system controller
> inside.
> 
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> ---
> This patch should be based on below patch which is already picked by
> watchdog maintainer:
> https://patchwork.kernel.org/patch/10962183/
> ---
>  Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 

Reviewed-by: Rob Herring <robh@kernel.org>