From: Yogesh Gaur <[email protected]>
Add clockgen support and configuration for NXP SoC lx2160a in qoriq
clock driver with compatible property as "fsl,lx2160a-clockgen".
qoriq-cpufreq driver is based on qoriq clock driver, enable support
of NXP SoC lx2160a in qoriq cpufreq driver to handle the lx2160a SoC.
Signed-off-by: Tang Yuantian <[email protected]>
Signed-off-by: Yogesh Gaur <[email protected]>
Signed-off-by: Vabhav Sharma <[email protected]>
Acked-by: Scott Wood <[email protected]>
Acked-by: Stephen Boyd <[email protected]>
Acked-by: Viresh Kumar <[email protected]>
---
Changes for v3:
- Incorporated review comments of Rafael J. Wysocki
- Updated commit message
Changes for v2:
- Subject line updated
drivers/clk/clk-qoriq.c | 12 ++++++++++++
drivers/cpufreq/qoriq-cpufreq.c | 1 +
2 files changed, 13 insertions(+)
diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c
index 3d51d7c..1a15201 100644
--- a/drivers/clk/clk-qoriq.c
+++ b/drivers/clk/clk-qoriq.c
@@ -570,6 +570,17 @@ static const struct clockgen_chipinfo chipinfo[] = {
.flags = CG_VER3 | CG_LITTLE_ENDIAN,
},
{
+ .compat = "fsl,lx2160a-clockgen",
+ .cmux_groups = {
+ &clockgen2_cmux_cga12, &clockgen2_cmux_cgb
+ },
+ .cmux_to_group = {
+ 0, 0, 0, 0, 1, 1, 1, 1, -1
+ },
+ .pll_mask = 0x37,
+ .flags = CG_VER3 | CG_LITTLE_ENDIAN,
+ },
+ {
.compat = "fsl,p2041-clockgen",
.guts_compat = "fsl,qoriq-device-config-1.0",
.init_periph = p2041_init_periph,
@@ -1427,6 +1438,7 @@ 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_ls1088a, "fsl,ls1088a-clockgen", clockgen_init);
CLK_OF_DECLARE(qoriq_clockgen_ls2080a, "fsl,ls2080a-clockgen", clockgen_init);
+CLK_OF_DECLARE(qoriq_clockgen_lx2160a, "fsl,lx2160a-clockgen", clockgen_init);
CLK_OF_DECLARE(qoriq_clockgen_p2041, "fsl,p2041-clockgen", clockgen_init);
CLK_OF_DECLARE(qoriq_clockgen_p3041, "fsl,p3041-clockgen", clockgen_init);
CLK_OF_DECLARE(qoriq_clockgen_p4080, "fsl,p4080-clockgen", clockgen_init);
diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c
index 4295e54..81f0288 100644
--- a/drivers/cpufreq/qoriq-cpufreq.c
+++ b/drivers/cpufreq/qoriq-cpufreq.c
@@ -284,6 +284,7 @@ static const struct of_device_id node_matches[] __initconst = {
{ .compatible = "fsl,ls1046a-clockgen", },
{ .compatible = "fsl,ls1088a-clockgen", },
{ .compatible = "fsl,ls2080a-clockgen", },
+ { .compatible = "fsl,lx2160a-clockgen", },
{ .compatible = "fsl,p4080-clockgen", },
{ .compatible = "fsl,qoriq-clockgen-1.0", },
{ .compatible = "fsl,qoriq-clockgen-2.0", },
--
2.7.4
Quoting Vabhav Sharma (2019-04-25 06:57:05)
> From: Yogesh Gaur <[email protected]>
>
> Add clockgen support and configuration for NXP SoC lx2160a in qoriq
> clock driver with compatible property as "fsl,lx2160a-clockgen".
>
> qoriq-cpufreq driver is based on qoriq clock driver, enable support
> of NXP SoC lx2160a in qoriq cpufreq driver to handle the lx2160a SoC.
>
> Signed-off-by: Tang Yuantian <[email protected]>
> Signed-off-by: Yogesh Gaur <[email protected]>
> Signed-off-by: Vabhav Sharma <[email protected]>
> Acked-by: Scott Wood <[email protected]>
> Acked-by: Stephen Boyd <[email protected]>
> Acked-by: Viresh Kumar <[email protected]>
> ---
> Changes for v3:
> - Incorporated review comments of Rafael J. Wysocki
> - Updated commit message
If you can split it into clk and cpufreq that would be preferred. Then I
can take the clk part and PM tree can take the cpufreq part. Otherwise,
you have sent other patches to drivers/clk/clk-qoriq.c and I'm worried
there will be cross tree conflicts if I take those other patches this
cycle.
> -----Original Message-----
> From: Stephen Boyd <[email protected]>
> Sent: Thursday, April 25, 2019 11:52 PM
> To: [email protected]; [email protected]; linux-
> [email protected]; Vabhav Sharma <[email protected]>
> Cc: [email protected]; [email protected]; [email protected];
> Yogesh Narayan Gaur <[email protected]>; Andy Tang
> <[email protected]>; Vabhav Sharma <[email protected]>
> Subject: [EXT] Re: [PATCH v3] clk: qoriq: add support for lx2160a
>
> Caution: EXT Email
>
> Quoting Vabhav Sharma (2019-04-25 06:57:05)
> > From: Yogesh Gaur <[email protected]>
> >
> > Add clockgen support and configuration for NXP SoC lx2160a in qoriq
> > clock driver with compatible property as "fsl,lx2160a-clockgen".
> >
> > qoriq-cpufreq driver is based on qoriq clock driver, enable support of
> > NXP SoC lx2160a in qoriq cpufreq driver to handle the lx2160a SoC.
> >
> > Signed-off-by: Tang Yuantian <[email protected]>
> > Signed-off-by: Yogesh Gaur <[email protected]>
> > Signed-off-by: Vabhav Sharma <[email protected]>
> > Acked-by: Scott Wood <[email protected]>
> > Acked-by: Stephen Boyd <[email protected]>
> > Acked-by: Viresh Kumar <[email protected]>
> > ---
> > Changes for v3:
> > - Incorporated review comments of Rafael J. Wysocki
> > - Updated commit message
>
> If you can split it into clk and cpufreq that would be preferred. Then I can
> take the clk part and PM tree can take the cpufreq part. Otherwise, you have
> sent other patches to drivers/clk/clk-qoriq.c and I'm worried there will be
> cross tree conflicts if I take those other patches this cycle.
Agree, sure.
I will split the patch and sent it to clk and PM tree.