[PATCH 1/3] clk: qoriq: add t1023 soc support

[PATCH 1/3] clk: qoriq: add t1023 soc support

[andy.tang]

From: Yuantian Tang <andy.tang@nxp.com>

Add t1023 clock compatible string to the bindings.

Signed-off-by: Tang Yuantian <andy.tang@nxp.com>
---
 .../devicetree/bindings/clock/qoriq-clock.txt      |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Documentation/devicetree/bindings/clock/qoriq-clock.txt b/Documentation/devicetree/bindings/clock/qoriq-clock.txt
index 97f46ad..34e1933 100644
--- a/Documentation/devicetree/bindings/clock/qoriq-clock.txt
+++ b/Documentation/devicetree/bindings/clock/qoriq-clock.txt
@@ -37,6 +37,7 @@ Required properties:
 	* "fsl,ls1046a-clockgen"
 	* "fsl,ls1088a-clockgen"
 	* "fsl,ls2080a-clockgen"
+	* "fsl,t1023-clockgen"
 	Chassis-version clock strings include:
 	* "fsl,qoriq-clockgen-1.0": for chassis 1.0 clocks
 	* "fsl,qoriq-clockgen-2.0": for chassis 2.0 clocks
-- 
1.7.1

[PATCH 2/3] powerpc: t102x: upgrade the legacy clock node

[andy.tang]

From: Yuantian Tang <andy.tang@nxp.com>

There are issues in current lagacy clock node.
The compatible string is not correct and the clocks property
refers to the wrong node too.
Instead of fixing them, upgrade it to use new clock binding
which has been already ready to use.

Signed-off-by: Tang Yuantian <andy.tang@nxp.com>
---
 arch/powerpc/boot/dts/fsl/qoriq-clockgen.dtsi |   23 +++++++++++++++++++++++
 arch/powerpc/boot/dts/fsl/t1023si-post.dtsi   |   20 ++------------------
 arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi    |    4 ++--
 3 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-clockgen.dtsi

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-clockgen.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-clockgen.dtsi
new file mode 100644
index 0000000..49c6f86
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/qoriq-clockgen.dtsi
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Device Tree Include file for NXP PowerPC family SoC.
+ *
+ * Copyright 2017 NXP
+ *
+ * Tang Yuantian <andy.tang@nxp.com>
+ *
+ */
+
+sysclk: sysclk {
+	compatible = "fixed-clock";
+	#clock-cells = <0>;
+	clock-frequency = <100000000>;
+	clock-output-names = "sysclk";
+};
+
+clockgen: global-utilities@e1000 {
+	compatible = "fsl,qoriq-clockgen";
+	reg = <0xe1000 0x1000>;
+	#clock-cells = <2>;
+	clocks = <&sysclk>;
+};
diff --git a/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
index 4908af5..c77d3e9 100644
--- a/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
@@ -342,25 +342,9 @@
 		fsl,liodn-bits = <12>;
 	};
 
-/include/ "qoriq-clockgen2.dtsi"
+/include/ "qoriq-clockgen.dtsi"
 	global-utilities@e1000 {
-		compatible = "fsl,t1023-clockgen", "fsl,qoriq-clockgen-2.0";
-		mux0: mux0@0 {
-			#clock-cells = <0>;
-			reg = <0x0 4>;
-			compatible = "fsl,core-mux-clock";
-			clocks = <&pll0 0>, <&pll0 1>;
-			clock-names = "pll0_0", "pll0_1";
-			clock-output-names = "cmux0";
-		};
-		mux1: mux1@20 {
-			#clock-cells = <0>;
-			reg = <0x20 4>;
-			compatible = "fsl,core-mux-clock";
-			clocks = <&pll0 0>, <&pll0 1>;
-			clock-names = "pll0_0", "pll0_1";
-			clock-output-names = "cmux1";
-		};
+		compatible = "fsl,t1023-clockgen";
 	};
 
 	rcpm: global-utilities@e2000 {
diff --git a/arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi b/arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi
index 9d08a36..d87ea13 100644
--- a/arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi
@@ -74,7 +74,7 @@
 		cpu0: PowerPC,e5500@0 {
 			device_type = "cpu";
 			reg = <0>;
-			clocks = <&mux0>;
+			clocks = <&clockgen 1 0>;
 			next-level-cache = <&L2_1>;
 			#cooling-cells = <2>;
 			L2_1: l2-cache {
@@ -84,7 +84,7 @@
 		cpu1: PowerPC,e5500@1 {
 			device_type = "cpu";
 			reg = <1>;
-			clocks = <&mux1>;
+			clocks = <&clockgen 1 1>;
 			next-level-cache = <&L2_2>;
 			#cooling-cells = <2>;
 			L2_2: l2-cache {
-- 
1.7.1

[PATCH 3/3] clk: qoriq: add t1023 soc support

[andy.tang]

From: Yuantian Tang <andy.tang@nxp.com>

Add t1023 clock compatible string to support t1023 soc.

Signed-off-by: Tang Yuantian <andy.tang@nxp.com>
---
 drivers/clk/clk-qoriq.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c
index 3a1812f..b43df2a 100644
--- a/drivers/clk/clk-qoriq.c
+++ b/drivers/clk/clk-qoriq.c
@@ -1424,6 +1424,7 @@ static void __init clockgen_init(struct device_node *np)
 CLK_OF_DECLARE(qoriq_clockgen_ls1046a, "fsl,ls1046a-clockgen", clockgen_init);
 CLK_OF_DECLARE(qoriq_clockgen_ls1088a, "fsl,ls1088a-clockgen", clockgen_init);
 CLK_OF_DECLARE(qoriq_clockgen_ls2080a, "fsl,ls2080a-clockgen", clockgen_init);
+CLK_OF_DECLARE(qoriq_clockgen_t1023, "fsl,t1023-clockgen", clockgen_init);
 
 /* Legacy nodes */
 CLK_OF_DECLARE(qoriq_sysclk_1, "fsl,qoriq-sysclk-1.0", sysclk_init);
-- 
1.7.1

RE: [PATCH 1/3] clk: qoriq: add t1023 soc support

[Andy Tang]

Hi,

Appreciate if you can take a look at this patch set.

BR,
Andy

> -----Original Message-----
> From: andy.tang@nxp.com <andy.tang@nxp.com>
> Sent: 2018年9月19日 15:39
> To: mturquette@baylibre.com; oss@buserror.net
> Cc: sboyd@kernel.org; robh+dt@kernel.org; mark.rutland@arm.com;
> linux-clk@vger.kernel.org; devicetree@vger.kernel.org; Andy Tang
> <andy.tang@nxp.com>
> Subject: [PATCH 1/3] clk: qoriq: add t1023 soc support
> 
> From: Yuantian Tang <andy.tang@nxp.com>
> 
> Add t1023 clock compatible string to the bindings.
> 
> Signed-off-by: Tang Yuantian <andy.tang@nxp.com>
> ---
>  .../devicetree/bindings/clock/qoriq-clock.txt      |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/clock/qoriq-clock.txt
> b/Documentation/devicetree/bindings/clock/qoriq-clock.txt
> index 97f46ad..34e1933 100644
> --- a/Documentation/devicetree/bindings/clock/qoriq-clock.txt
> +++ b/Documentation/devicetree/bindings/clock/qoriq-clock.txt
> @@ -37,6 +37,7 @@ Required properties:
>  	* "fsl,ls1046a-clockgen"
>  	* "fsl,ls1088a-clockgen"
>  	* "fsl,ls2080a-clockgen"
> +	* "fsl,t1023-clockgen"
>  	Chassis-version clock strings include:
>  	* "fsl,qoriq-clockgen-1.0": for chassis 1.0 clocks
>  	* "fsl,qoriq-clockgen-2.0": for chassis 2.0 clocks
> --
> 1.7.1

RE: [PATCH 1/3] clk: qoriq: add t1023 soc support

[Stephen Boyd]

Quoting Andy Tang (2018-10-15 23:17:18)
> Hi,
> 
> Appreciate if you can take a look at this patch set.
> 

I can pick the clk patches, but not the dts bits. Sound good?

RE: [PATCH 1/3] clk: qoriq: add t1023 soc support

[Andy Tang]

> -----Original Message-----
> From: Stephen Boyd <sboyd@kernel.org>
> Sent: 2018年10月17日 23:28
> To: mturquette@baylibre.com; oss@buserror.net; Andy Tang
> <andy.tang@nxp.com>
> Cc: robh+dt@kernel.org; mark.rutland@arm.com;
> linux-clk@vger.kernel.org; devicetree@vger.kernel.org
> Subject: RE: [PATCH 1/3] clk: qoriq: add t1023 soc support
> 
> Quoting Andy Tang (2018-10-15 23:17:18)
> > Hi,
> >
> > Appreciate if you can take a look at this patch set.
> >
> 
> I can pick the clk patches, but not the dts bits. Sound good?

Let's see what Scott say.

Hi Scott,

Do you have any comments about this patch set?

Do you thinik it is ok if Stephen picks up the clk patch and you pick up the rest of two patches?
Or one of you Acked the patch and the other one apply them all?

Thanks
Andy

Re: [PATCH 1/3] clk: qoriq: add t1023 soc support

[Scott Wood]

On Thu, 2018-10-18 at 01:00 +0000, Andy Tang wrote:
> > -----Original Message-----
> > From: Stephen Boyd <sboyd@kernel.org>
> > Sent: 2018年10月17日 23:28
> > To: mturquette@baylibre.com; oss@buserror.net; Andy Tang
> > <andy.tang@nxp.com>
> > Cc: robh+dt@kernel.org; mark.rutland@arm.com;
> > linux-clk@vger.kernel.org; devicetree@vger.kernel.org
> > Subject: RE: [PATCH 1/3] clk: qoriq: add t1023 soc support
> > 
> > Quoting Andy Tang (2018-10-15 23:17:18)
> > > Hi,
> > > 
> > > Appreciate if you can take a look at this patch set.
> > > 
> > 
> > I can pick the clk patches, but not the dts bits. Sound good?
> 
> Let's see what Scott say.
> 
> Hi Scott,
> 
> Do you have any comments about this patch set?
> 
> Do you thinik it is ok if Stephen picks up the clk patch and you pick up the
> rest of two patches?
> Or one of you Acked the patch and the other one apply them all?

I can take the dts patches.

-Scott

RE: [PATCH 1/3] clk: qoriq: add t1023 soc support

[Andy Tang]

> -----Original Message-----
> From: Scott Wood <oss@buserror.net>
> Sent: 2018年10月19日 14:28
> To: Andy Tang <andy.tang@nxp.com>; Stephen Boyd <sboyd@kernel.org>;
> mturquette@baylibre.com
> Cc: robh+dt@kernel.org; mark.rutland@arm.com;
> linux-clk@vger.kernel.org; devicetree@vger.kernel.org
> Subject: Re: [PATCH 1/3] clk: qoriq: add t1023 soc support
> 
> On Thu, 2018-10-18 at 01:00 +0000, Andy Tang wrote:
> > > -----Original Message-----
> > > From: Stephen Boyd <sboyd@kernel.org>
> > > Sent: 2018年10月17日 23:28
> > > To: mturquette@baylibre.com; oss@buserror.net; Andy Tang
> > > <andy.tang@nxp.com>
> > > Cc: robh+dt@kernel.org; mark.rutland@arm.com;
> > > linux-clk@vger.kernel.org; devicetree@vger.kernel.org
> > > Subject: RE: [PATCH 1/3] clk: qoriq: add t1023 soc support
> > >
> > > Quoting Andy Tang (2018-10-15 23:17:18)
> > > > Hi,
> > > >
> > > > Appreciate if you can take a look at this patch set.
> > > >
> > >
> > > I can pick the clk patches, but not the dts bits. Sound good?
> >
> > Let's see what Scott say.
> >
> > Hi Scott,
> >
> > Do you have any comments about this patch set?
> >
> > Do you thinik it is ok if Stephen picks up the clk patch and you pick
> > up the rest of two patches?
> > Or one of you Acked the patch and the other one apply them all?
> 
> I can take the dts patches.
> 
Thanks Scott. Please take the dts patches.

Hi Stephen,
Please take the clk patch.

Thanks you all.
BR,
Andy

> -Scott

Re: [PATCH 2/3] powerpc: t102x: upgrade the legacy clock node

[Scott Wood]

On Wed, 2018-09-19 at 15:39 +0800, andy.tang@nxp.com wrote:
> +clockgen: global-utilities@e1000 {
> +	compatible = "fsl,qoriq-clockgen";

Where does this compatible string come from?

> +		compatible = "fsl,t1023-clockgen";
>  	};

And here you overwrite it with only the chip-specific compatible?

Is t1023 incompatible with both fsl,qoriq-clockgen-1.0 and fsl,qoriq-clockgen-
2.0?  The existing dts says 2.0; is that wrong?

BTW, assuming it is 2.0 compatible and thus the use of qoriq-clockgen2.dtsi is
correct, the best course of action is probably to to remove the legacy stuff
from all fsl chips, rather than introduce a new dtsi.  In fact it'd be nice to
see it all removed in any case. :-)

Also, please post any patches that you want me to apply to the linuxppc-dev
mailing list.

-Scott

RE: [PATCH 2/3] powerpc: t102x: upgrade the legacy clock node

[Andy Tang]

Hi Scott,

Please see my reply inline.

> -----Original Message-----
> From: Scott Wood <oss@buserror.net>
> Sent: 2018年10月21日 7:54
> To: Andy Tang <andy.tang@nxp.com>; mturquette@baylibre.com
> Cc: sboyd@kernel.org; robh+dt@kernel.org; mark.rutland@arm.com;
> linux-clk@vger.kernel.org; devicetree@vger.kernel.org
> Subject: Re: [PATCH 2/3] powerpc: t102x: upgrade the legacy clock node
> 
> On Wed, 2018-09-19 at 15:39 +0800, andy.tang@nxp.com wrote:
> > +clockgen: global-utilities@e1000 {
> > +	compatible = "fsl,qoriq-clockgen";
> 
> Where does this compatible string come from?
> 
> > +		compatible = "fsl,t1023-clockgen";
> >  	};
> 
> And here you overwrite it with only the chip-specific compatible?
> 
> Is t1023 incompatible with both fsl,qoriq-clockgen-1.0 and
> fsl,qoriq-clockgen- 2.0?  The existing dts says 2.0; is that wrong?
> 
> BTW, assuming it is 2.0 compatible and thus the use of
> qoriq-clockgen2.dtsi is correct, the best course of action is probably to to
> remove the legacy stuff from all fsl chips, rather than introduce a new dtsi.
> In fact it'd be nice to see it all removed in any case. :-)
qoriq-clockgen*.dtsi are used by legacy bindings. The contents are all of legacy bindings.
To use new framework, I introduce a new dtsi which contains new bindings and used for all PPC soc.
A chip-specific compatible is needed because driver will use it to get chip-specific clock tree information.
The clock information was defined in driver not in dts in new framework, remember?

This patch set is the first step to convert it to using new framework. After all the chips have been updated,
the legacy stuff will be removed. Including qoriq-clockgen*.dtsi.
> 
> Also, please post any patches that you want me to apply to the
> linuxppc-dev mailing list.
Sure, no problem.

BR,
Andy
> 
> -Scott

Re: [PATCH 2/3] powerpc: t102x: upgrade the legacy clock node

[Scott Wood]

On Mon, 2018-10-22 at 01:34 +0000, Andy Tang wrote:
> Hi Scott,
> 
> Please see my reply inline.
> 
> > -----Original Message-----
> > From: Scott Wood <oss@buserror.net>
> > Sent: 2018年10月21日 7:54
> > To: Andy Tang <andy.tang@nxp.com>; mturquette@baylibre.com
> > Cc: sboyd@kernel.org; robh+dt@kernel.org; mark.rutland@arm.com;
> > linux-clk@vger.kernel.org; devicetree@vger.kernel.org
> > Subject: Re: [PATCH 2/3] powerpc: t102x: upgrade the legacy clock node
> > 
> > On Wed, 2018-09-19 at 15:39 +0800, andy.tang@nxp.com wrote:
> > > +clockgen: global-utilities@e1000 {
> > > +	compatible = "fsl,qoriq-clockgen";
> > 
> > Where does this compatible string come from?
> > 
> > > +		compatible = "fsl,t1023-clockgen";
> > >  	};
> > 
> > And here you overwrite it with only the chip-specific compatible?
> > 
> > Is t1023 incompatible with both fsl,qoriq-clockgen-1.0 and
> > fsl,qoriq-clockgen- 2.0?  The existing dts says 2.0; is that wrong?
> > 
> > BTW, assuming it is 2.0 compatible and thus the use of
> > qoriq-clockgen2.dtsi is correct, the best course of action is probably to
> > to
> > remove the legacy stuff from all fsl chips, rather than introduce a new
> > dtsi.
> > In fact it'd be nice to see it all removed in any case. :-)
> 
> qoriq-clockgen*.dtsi are used by legacy bindings. The contents are all of
> legacy bindings.
> To use new framework, I introduce a new dtsi which contains new bindings and
> used for all PPC soc.
> A chip-specific compatible is needed because driver will use it to get chip-
> specific clock tree information.
> The clock information was defined in driver not in dts in new framework,
> remember?

I'm aware that a chip-specific compatible is required.  What is unusual (on
PPC) is providing *only* the chip-specific compatible.  I was expecting
something more along the lines of https://patchwork.ozlabs.org/patch/486565/

Granted, the driver requiring two different compatibles to be present is odd,
and was a convenience based on what was already in the device trees, but the
fsl,qoriq-clockgen-2.0 compatible is part of the new binding (albeit an
optional part).  I guess I don't mind no longer relying on it, but at least
remove the "fsl,qoriq-clockgen" string.

-Scott

RE: [PATCH 2/3] powerpc: t102x: upgrade the legacy clock node

[Andy Tang]

Hi Scott,

Please see my reply inline.

> -----Original Message-----
> From: Scott Wood <oss@buserror.net>
> Sent: 2018年10月22日 13:21
> To: Andy Tang <andy.tang@nxp.com>; mturquette@baylibre.com
> Cc: sboyd@kernel.org; robh+dt@kernel.org; mark.rutland@arm.com;
> linux-clk@vger.kernel.org; devicetree@vger.kernel.org
> Subject: Re: [PATCH 2/3] powerpc: t102x: upgrade the legacy clock node
> 
> On Mon, 2018-10-22 at 01:34 +0000, Andy Tang wrote:
> > Hi Scott,
> >
> > Please see my reply inline.
> >
> > > -----Original Message-----
> > > From: Scott Wood <oss@buserror.net>
> > > Sent: 2018年10月21日 7:54
> > > To: Andy Tang <andy.tang@nxp.com>; mturquette@baylibre.com
> > > Cc: sboyd@kernel.org; robh+dt@kernel.org; mark.rutland@arm.com;
> > > linux-clk@vger.kernel.org; devicetree@vger.kernel.org
> > > Subject: Re: [PATCH 2/3] powerpc: t102x: upgrade the legacy clock
> > > node
> > >
> > > On Wed, 2018-09-19 at 15:39 +0800, andy.tang@nxp.com wrote:
> > > > +clockgen: global-utilities@e1000 {
> > > > +	compatible = "fsl,qoriq-clockgen";
> > >
> > > Where does this compatible string come from?
> > >
> > > > +		compatible = "fsl,t1023-clockgen";
> > > >  	};
> > >
> > > And here you overwrite it with only the chip-specific compatible?
> > >
> > > Is t1023 incompatible with both fsl,qoriq-clockgen-1.0 and
> > > fsl,qoriq-clockgen- 2.0?  The existing dts says 2.0; is that wrong?
> > >
> > > BTW, assuming it is 2.0 compatible and thus the use of
> > > qoriq-clockgen2.dtsi is correct, the best course of action is
> > > probably to to remove the legacy stuff from all fsl chips, rather
> > > than introduce a new dtsi.
> > > In fact it'd be nice to see it all removed in any case. :-)
> >
> > qoriq-clockgen*.dtsi are used by legacy bindings. The contents are all
> > of legacy bindings.
> > To use new framework, I introduce a new dtsi which contains new
> > bindings and used for all PPC soc.
> > A chip-specific compatible is needed because driver will use it to get
> > chip- specific clock tree information.
> > The clock information was defined in driver not in dts in new
> > framework, remember?
> 
> I'm aware that a chip-specific compatible is required.  What is unusual (on
> PPC) is providing *only* the chip-specific compatible.  I was expecting
> something more along the lines of
> https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fp
> atchwork.ozlabs.org%2Fpatch%2F486565%2F&amp;data=02%7C01%7Can
> dy.tang%40nxp.com%7Ceaf46e43620b45a19eb408d637de20cb%7C686e
> a1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636757824505667539
> &amp;sdata=T5yRSWtHYO2yLMjsZRIxZT%2BM82xuGQm2VGX7MRB8MJA%
> 3D&amp;reserved=0
> 
> Granted, the driver requiring two different compatibles to be present is
> odd, and was a convenience based on what was already in the device
> trees, but the
> fsl,qoriq-clockgen-2.0 compatible is part of the new binding (albeit an
> optional part).  I guess I don't mind no longer relying on it, but at least
> remove the "fsl,qoriq-clockgen" string.
After saw your previous patch, I plan to work out a similar patch. The fsl,qoriq-clockgen-2.0 and fsl,qoriq-clockgen-1.0 will be retained.

Thanks,
Andy

> 
> -Scott