linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3] clk: qoriq: added ls1012a clock configuration
@ 2016-11-24  2:36 yuantian.tang
  2016-11-24  8:21 ` Scott Wood
  0 siblings, 1 reply; 6+ messages in thread
From: yuantian.tang @ 2016-11-24  2:36 UTC (permalink / raw)
  To: mturquette
  Cc: sboyd, linux-clk, linux-kernel, scott.wood, linux-arm-kernel,
	Tang Yuantian, Tang Yuantian

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

Signed-off-by: Tang Yuantian <yuantian.tang@nxp.com>
---
v3:
  - rebased to latest kernel and re-sorted the code
v2:
  - remove commit message as it is duplicated to title
 drivers/clk/clk-qoriq.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c
index 7dd4351..697310e 100644
--- a/drivers/clk/clk-qoriq.c
+++ b/drivers/clk/clk-qoriq.c
@@ -291,6 +291,14 @@ static const struct clockgen_muxinfo ls1046a_hwa2 = {
 	},
 };
 
+static const struct clockgen_muxinfo ls1012a_cmux = {
+	{
+		[0] = { CLKSEL_VALID, CGA_PLL1, PLL_DIV1 },
+		{},
+		[2] = { CLKSEL_VALID, CGA_PLL1, PLL_DIV2 },
+	}
+};
+
 static const struct clockgen_muxinfo t1023_hwa1 = {
 	{
 		{},
@@ -529,6 +537,16 @@ static const struct clockgen_chipinfo chipinfo[] = {
 		.flags = CG_PLL_8BIT,
 	},
 	{
+		.compat = "fsl,ls1012a-clockgen",
+		.cmux_groups = {
+			&ls1012a_cmux
+		},
+		.cmux_to_group = {
+			0, -1
+		},
+		.pll_mask = 0x03,
+	},
+	{
 		.compat = "fsl,ls2080a-clockgen",
 		.cmux_groups = {
 			&clockgen2_cmux_cga12, &clockgen2_cmux_cgb
@@ -1316,6 +1334,7 @@ CLK_OF_DECLARE(qoriq_clockgen_2, "fsl,qoriq-clockgen-2.0", clockgen_init);
 CLK_OF_DECLARE(qoriq_clockgen_ls1021a, "fsl,ls1021a-clockgen", clockgen_init);
 CLK_OF_DECLARE(qoriq_clockgen_ls1043a, "fsl,ls1043a-clockgen", clockgen_init);
 CLK_OF_DECLARE(qoriq_clockgen_ls1046a, "fsl,ls1046a-clockgen", clockgen_init);
+CLK_OF_DECLARE(qoriq_clockgen_ls1012a, "fsl,ls1012a-clockgen", clockgen_init);
 CLK_OF_DECLARE(qoriq_clockgen_ls2080a, "fsl,ls2080a-clockgen", clockgen_init);
 
 /* Legacy nodes */
-- 
2.1.0.27.g96db324

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH v3] clk: qoriq: added ls1012a clock configuration
  2016-11-24  2:36 [PATCH v3] clk: qoriq: added ls1012a clock configuration yuantian.tang
@ 2016-11-24  8:21 ` Scott Wood
  2016-11-25  3:32   ` Y.T. Tang
  0 siblings, 1 reply; 6+ messages in thread
From: Scott Wood @ 2016-11-24  8:21 UTC (permalink / raw)
  To: Y.T. Tang, mturquette; +Cc: sboyd, linux-clk, linux-kernel, linux-arm-kernel

On 11/23/2016 08:50 PM, yuantian.tang@nxp.com wrote:
> From: Tang Yuantian <Yuantian.Tang@nxp.com>
> 
> Signed-off-by: Tang Yuantian <yuantian.tang@nxp.com>
> ---
> v3:
>   - rebased to latest kernel and re-sorted the code
[snip]
> @@ -1316,6 +1334,7 @@ CLK_OF_DECLARE(qoriq_clockgen_2, "fsl,qoriq-clockgen-2.0", clockgen_init);
>  CLK_OF_DECLARE(qoriq_clockgen_ls1021a, "fsl,ls1021a-clockgen", clockgen_init);
>  CLK_OF_DECLARE(qoriq_clockgen_ls1043a, "fsl,ls1043a-clockgen", clockgen_init);
>  CLK_OF_DECLARE(qoriq_clockgen_ls1046a, "fsl,ls1046a-clockgen", clockgen_init);
> +CLK_OF_DECLARE(qoriq_clockgen_ls1012a, "fsl,ls1012a-clockgen", clockgen_init);
>  CLK_OF_DECLARE(qoriq_clockgen_ls2080a, "fsl,ls2080a-clockgen", clockgen_init);

You need a better sorting algorithm. :-P

-Scott

^ permalink raw reply	[flat|nested] 6+ messages in thread
* RE: [PATCH v3] clk: qoriq: added ls1012a clock configuration
  2016-11-24  8:21 ` Scott Wood
@ 2016-11-25  3:32   ` Y.T. Tang
  2016-12-08 23:10     ` sboyd
  0 siblings, 1 reply; 6+ messages in thread
From: Y.T. Tang @ 2016-11-25  3:32 UTC (permalink / raw)
  To: Scott Wood, mturquette; +Cc: sboyd, linux-clk, linux-kernel, linux-arm-kernel

Hi Scott,

> -----Original Message-----
> From: Scott Wood
> Sent: Thursday, November 24, 2016 4:21 PM
> To: Y.T. Tang <yuantian.tang@nxp.com>; mturquette@baylibre.com
> Cc: sboyd@codeaurora.org; linux-clk@vger.kernel.org; linux-
> kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org
> Subject: Re: [PATCH v3] clk: qoriq: added ls1012a clock configuration
> 
> On 11/23/2016 08:50 PM, yuantian.tang@nxp.com wrote:
> > From: Tang Yuantian <Yuantian.Tang@nxp.com>
> >
> > Signed-off-by: Tang Yuantian <yuantian.tang@nxp.com>
> > ---
> > v3:
> >   - rebased to latest kernel and re-sorted the code
> [snip]
> > @@ -1316,6 +1334,7 @@ CLK_OF_DECLARE(qoriq_clockgen_2,
> > "fsl,qoriq-clockgen-2.0", clockgen_init);
> > CLK_OF_DECLARE(qoriq_clockgen_ls1021a, "fsl,ls1021a-clockgen",
> > clockgen_init);  CLK_OF_DECLARE(qoriq_clockgen_ls1043a,
> > "fsl,ls1043a-clockgen", clockgen_init);
> > CLK_OF_DECLARE(qoriq_clockgen_ls1046a, "fsl,ls1046a-clockgen",
> > clockgen_init);
> > +CLK_OF_DECLARE(qoriq_clockgen_ls1012a, "fsl,ls1012a-clockgen",
> > +clockgen_init);
> >  CLK_OF_DECLARE(qoriq_clockgen_ls2080a, "fsl,ls2080a-clockgen",
> > clockgen_init);
> 
> You need a better sorting algorithm. :-P
> 
I don't think so. This time, each code snip goes right after ls1046a.
The sorting 'algorithm' is best ever. :)

Regards,
Yuantian
 
> -Scott

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH v3] clk: qoriq: added ls1012a clock configuration
  2016-11-25  3:32   ` Y.T. Tang
@ 2016-12-08 23:10     ` sboyd
  2016-12-08 23:19       ` Scott Wood
  0 siblings, 1 reply; 6+ messages in thread
From: sboyd @ 2016-12-08 23:10 UTC (permalink / raw)
  To: Y.T. Tang
  Cc: Scott Wood, mturquette, linux-clk, linux-kernel, linux-arm-kernel

On 11/25, Y.T. Tang wrote:
> Hi Scott,
> 
> > -----Original Message-----
> > From: Scott Wood
> > Sent: Thursday, November 24, 2016 4:21 PM
> > To: Y.T. Tang <yuantian.tang@nxp.com>; mturquette@baylibre.com
> > Cc: sboyd@codeaurora.org; linux-clk@vger.kernel.org; linux-
> > kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org
> > Subject: Re: [PATCH v3] clk: qoriq: added ls1012a clock configuration
> > 
> > On 11/23/2016 08:50 PM, yuantian.tang@nxp.com wrote:
> > > From: Tang Yuantian <Yuantian.Tang@nxp.com>
> > >
> > > Signed-off-by: Tang Yuantian <yuantian.tang@nxp.com>
> > > ---
> > > v3:
> > >   - rebased to latest kernel and re-sorted the code
> > [snip]
> > > @@ -1316,6 +1334,7 @@ CLK_OF_DECLARE(qoriq_clockgen_2,
> > > "fsl,qoriq-clockgen-2.0", clockgen_init);
> > > CLK_OF_DECLARE(qoriq_clockgen_ls1021a, "fsl,ls1021a-clockgen",
> > > clockgen_init);  CLK_OF_DECLARE(qoriq_clockgen_ls1043a,
> > > "fsl,ls1043a-clockgen", clockgen_init);
> > > CLK_OF_DECLARE(qoriq_clockgen_ls1046a, "fsl,ls1046a-clockgen",
> > > clockgen_init);
> > > +CLK_OF_DECLARE(qoriq_clockgen_ls1012a, "fsl,ls1012a-clockgen",
> > > +clockgen_init);
> > >  CLK_OF_DECLARE(qoriq_clockgen_ls2080a, "fsl,ls2080a-clockgen",
> > > clockgen_init);
> > 
> > You need a better sorting algorithm. :-P
> > 
> I don't think so. This time, each code snip goes right after ls1046a.
> The sorting 'algorithm' is best ever. :)
> 

I will sort it and apply it? Ack Scott?

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH v3] clk: qoriq: added ls1012a clock configuration
  2016-12-08 23:10     ` sboyd
@ 2016-12-08 23:19       ` Scott Wood
  2016-12-09  0:31         ` sboyd
  0 siblings, 1 reply; 6+ messages in thread
From: Scott Wood @ 2016-12-08 23:19 UTC (permalink / raw)
  To: sboyd, Y.T. Tang; +Cc: mturquette, linux-clk, linux-kernel, linux-arm-kernel

On 12/08/2016 05:10 PM, sboyd@codeaurora.org wrote:
> On 11/25, Y.T. Tang wrote:
>> Hi Scott,
>>
>>> -----Original Message-----
>>> From: Scott Wood
>>> Sent: Thursday, November 24, 2016 4:21 PM
>>> To: Y.T. Tang <yuantian.tang@nxp.com>; mturquette@baylibre.com
>>> Cc: sboyd@codeaurora.org; linux-clk@vger.kernel.org; linux-
>>> kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org
>>> Subject: Re: [PATCH v3] clk: qoriq: added ls1012a clock configuration
>>>
>>> On 11/23/2016 08:50 PM, yuantian.tang@nxp.com wrote:
>>>> From: Tang Yuantian <Yuantian.Tang@nxp.com>
>>>>
>>>> Signed-off-by: Tang Yuantian <yuantian.tang@nxp.com>
>>>> ---
>>>> v3:
>>>>   - rebased to latest kernel and re-sorted the code
>>> [snip]
>>>> @@ -1316,6 +1334,7 @@ CLK_OF_DECLARE(qoriq_clockgen_2,
>>>> "fsl,qoriq-clockgen-2.0", clockgen_init);
>>>> CLK_OF_DECLARE(qoriq_clockgen_ls1021a, "fsl,ls1021a-clockgen",
>>>> clockgen_init);  CLK_OF_DECLARE(qoriq_clockgen_ls1043a,
>>>> "fsl,ls1043a-clockgen", clockgen_init);
>>>> CLK_OF_DECLARE(qoriq_clockgen_ls1046a, "fsl,ls1046a-clockgen",
>>>> clockgen_init);
>>>> +CLK_OF_DECLARE(qoriq_clockgen_ls1012a, "fsl,ls1012a-clockgen",
>>>> +clockgen_init);
>>>>  CLK_OF_DECLARE(qoriq_clockgen_ls2080a, "fsl,ls2080a-clockgen",
>>>> clockgen_init);
>>>
>>> You need a better sorting algorithm. :-P
>>>
>> I don't think so. This time, each code snip goes right after ls1046a.
>> The sorting 'algorithm' is best ever. :)
>>
> 
> I will sort it and apply it? Ack Scott?
> 

Acked-by: Scott Wood <oss@buserror.net>

-Scott

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH v3] clk: qoriq: added ls1012a clock configuration
  2016-12-08 23:19       ` Scott Wood
@ 2016-12-09  0:31         ` sboyd
  0 siblings, 0 replies; 6+ messages in thread
From: sboyd @ 2016-12-09  0:31 UTC (permalink / raw)
  To: Scott Wood
  Cc: Y.T. Tang, mturquette, linux-clk, linux-kernel, linux-arm-kernel

On 12/08, Scott Wood wrote:
> On 12/08/2016 05:10 PM, sboyd@codeaurora.org wrote:
> > On 11/25, Y.T. Tang wrote:
> >> Hi Scott,
> >>
> >>> -----Original Message-----
> >>> From: Scott Wood
> >>> Sent: Thursday, November 24, 2016 4:21 PM
> >>> To: Y.T. Tang <yuantian.tang@nxp.com>; mturquette@baylibre.com
> >>> Cc: sboyd@codeaurora.org; linux-clk@vger.kernel.org; linux-
> >>> kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org
> >>> Subject: Re: [PATCH v3] clk: qoriq: added ls1012a clock configuration
> >>>
> >>> On 11/23/2016 08:50 PM, yuantian.tang@nxp.com wrote:
> >>>> From: Tang Yuantian <Yuantian.Tang@nxp.com>
> >>>>
> >>>> Signed-off-by: Tang Yuantian <yuantian.tang@nxp.com>
> >>>> ---
> >>>> v3:
> >>>>   - rebased to latest kernel and re-sorted the code
> >>> [snip]
> >>>> @@ -1316,6 +1334,7 @@ CLK_OF_DECLARE(qoriq_clockgen_2,
> >>>> "fsl,qoriq-clockgen-2.0", clockgen_init);
> >>>> CLK_OF_DECLARE(qoriq_clockgen_ls1021a, "fsl,ls1021a-clockgen",
> >>>> clockgen_init);  CLK_OF_DECLARE(qoriq_clockgen_ls1043a,
> >>>> "fsl,ls1043a-clockgen", clockgen_init);
> >>>> CLK_OF_DECLARE(qoriq_clockgen_ls1046a, "fsl,ls1046a-clockgen",
> >>>> clockgen_init);
> >>>> +CLK_OF_DECLARE(qoriq_clockgen_ls1012a, "fsl,ls1012a-clockgen",
> >>>> +clockgen_init);
> >>>>  CLK_OF_DECLARE(qoriq_clockgen_ls2080a, "fsl,ls2080a-clockgen",
> >>>> clockgen_init);
> >>>
> >>> You need a better sorting algorithm. :-P
> >>>
> >> I don't think so. This time, each code snip goes right after ls1046a.
> >> The sorting 'algorithm' is best ever. :)
> >>
> > 
> > I will sort it and apply it? Ack Scott?
> > 
> 
> Acked-by: Scott Wood <oss@buserror.net>
> 

Thanks. Applied this to clk-next:

---8<----
From: Tang Yuantian <Yuantian.Tang@nxp.com>
Subject: [PATCH] clk: qoriq: added ls1012a clock configuration

Acked-by: Scott Wood <oss@buserror.net>
Signed-off-by: Tang Yuantian <yuantian.tang@nxp.com>
[sboyd@codeaurora.org: Sorted list]
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 drivers/clk/clk-qoriq.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c
index 7dd4351efdd6..d0bf8b1c67de 100644
--- a/drivers/clk/clk-qoriq.c
+++ b/drivers/clk/clk-qoriq.c
@@ -291,6 +291,14 @@ static const struct clockgen_muxinfo ls1046a_hwa2 = {
 	},
 };
 
+static const struct clockgen_muxinfo ls1012a_cmux = {
+	{
+		[0] = { CLKSEL_VALID, CGA_PLL1, PLL_DIV1 },
+		{},
+		[2] = { CLKSEL_VALID, CGA_PLL1, PLL_DIV2 },
+	}
+};
+
 static const struct clockgen_muxinfo t1023_hwa1 = {
 	{
 		{},
@@ -529,6 +537,16 @@ static const struct clockgen_chipinfo chipinfo[] = {
 		.flags = CG_PLL_8BIT,
 	},
 	{
+		.compat = "fsl,ls1012a-clockgen",
+		.cmux_groups = {
+			&ls1012a_cmux
+		},
+		.cmux_to_group = {
+			0, -1
+		},
+		.pll_mask = 0x03,
+	},
+	{
 		.compat = "fsl,ls2080a-clockgen",
 		.cmux_groups = {
 			&clockgen2_cmux_cga12, &clockgen2_cmux_cgb
@@ -1313,6 +1331,7 @@ static void __init clockgen_init(struct device_node *np)
 
 CLK_OF_DECLARE(qoriq_clockgen_1, "fsl,qoriq-clockgen-1.0", clockgen_init);
 CLK_OF_DECLARE(qoriq_clockgen_2, "fsl,qoriq-clockgen-2.0", clockgen_init);
+CLK_OF_DECLARE(qoriq_clockgen_ls1012a, "fsl,ls1012a-clockgen", clockgen_init);
 CLK_OF_DECLARE(qoriq_clockgen_ls1021a, "fsl,ls1021a-clockgen", clockgen_init);
 CLK_OF_DECLARE(qoriq_clockgen_ls1043a, "fsl,ls1043a-clockgen", clockgen_init);
 CLK_OF_DECLARE(qoriq_clockgen_ls1046a, "fsl,ls1046a-clockgen", clockgen_init);
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-12-09  0:31 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-24  2:36 [PATCH v3] clk: qoriq: added ls1012a clock configuration yuantian.tang
2016-11-24  8:21 ` Scott Wood
2016-11-25  3:32   ` Y.T. Tang
2016-12-08 23:10     ` sboyd
2016-12-08 23:19       ` Scott Wood
2016-12-09  0:31         ` sboyd

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).