Message ID | 1536871075-3732-4-git-send-email-vabhav.sharma@nxp.com (mailing list archive) |
---|---|
State | Superseded, archived |
Headers | show |
Series | arm64: dts: NXP: add basic dts file for LX2160A SoC | expand |
On Fri, 2018-09-14 at 02:07 +0530, Vabhav Sharma wrote: > From: Yogesh Gaur <yogeshnarayan.gaur@nxp.com> > > Add clockgen support for lx2160a. > Added entry for compat 'fsl,lx2160a-clockgen'. > > Signed-off-by: Tang Yuantian <andy.tang@nxp.com> > Signed-off-by: Yogesh Gaur <yogeshnarayan.gaur@nxp.com> > Signed-off-by: Vabhav Sharma <vabhav.sharma@nxp.com> > Acked-by: Stephen Boyd <sboyd@kernel.org> > --- > drivers/clk/clk-qoriq.c | 14 +++++++++++++- > drivers/cpufreq/qoriq-cpufreq.c | 1 + > 2 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c > index 3a1812f..e9ae70b 100644 > --- a/drivers/clk/clk-qoriq.c > +++ b/drivers/clk/clk-qoriq.c > @@ -79,7 +79,7 @@ struct clockgen_chipinfo { > const struct clockgen_muxinfo *cmux_groups[2]; > const struct clockgen_muxinfo *hwaccel[NUM_HWACCEL]; > void (*init_periph)(struct clockgen *cg); > - int cmux_to_group[NUM_CMUX]; /* -1 terminates if fewer than > NUM_CMUX */ > + int cmux_to_group[NUM_CMUX+1]; /* -1 terminate if fewer to > NUM_CMUX+1 */ You need to add the -1 terminator to p4080, and remove the "if fewer" comment since the whole point of this is that every array gets -1 terminated. Why did you change "terminates" to "terminate" and "than" to "to"? This +1 change should be a separate patch from lx2160a support. -Scott
> -----Original Message----- > From: Scott Wood <oss@buserror.net> > Sent: Sunday, September 16, 2018 12:54 AM > To: Vabhav Sharma <vabhav.sharma@nxp.com>; sudeep.holla@arm.com; linux- > kernel@vger.kernel.org; devicetree@vger.kernel.org; robh+dt@kernel.org; > mark.rutland@arm.com; linuxppc-dev@lists.ozlabs.org; linux-arm- > kernel@lists.infradead.org; mturquette@baylibre.com; sboyd@kernel.org; > rjw@rjwysocki.net; viresh.kumar@linaro.org; linux-clk@vger.kernel.org; linux- > pm@vger.kernel.org; linux-kernel-owner@vger.kernel.org; > catalin.marinas@arm.com; will.deacon@arm.com; > gregkh@linuxfoundation.org; arnd@arndb.de; kstewart@linuxfoundation.org; > yamada.masahiro@socionext.com > Cc: linux@armlinux.org.uk; Varun Sethi <V.Sethi@nxp.com>; Udit Kumar > <udit.kumar@nxp.com>; Yogesh Narayan Gaur > <yogeshnarayan.gaur@nxp.com>; Andy Tang <andy.tang@nxp.com> > Subject: Re: [PATCH v2 3/5] drivers: clk-qoriq: Add clockgen support for lx2160a > > On Fri, 2018-09-14 at 02:07 +0530, Vabhav Sharma wrote: > > From: Yogesh Gaur <yogeshnarayan.gaur@nxp.com> > > > > Add clockgen support for lx2160a. > > Added entry for compat 'fsl,lx2160a-clockgen'. > > > > Signed-off-by: Tang Yuantian <andy.tang@nxp.com> > > Signed-off-by: Yogesh Gaur <yogeshnarayan.gaur@nxp.com> > > Signed-off-by: Vabhav Sharma <vabhav.sharma@nxp.com> > > Acked-by: Stephen Boyd <sboyd@kernel.org> > > --- > > drivers/clk/clk-qoriq.c | 14 +++++++++++++- > > drivers/cpufreq/qoriq-cpufreq.c | 1 + > > 2 files changed, 14 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c index > > 3a1812f..e9ae70b 100644 > > --- a/drivers/clk/clk-qoriq.c > > +++ b/drivers/clk/clk-qoriq.c > > @@ -79,7 +79,7 @@ struct clockgen_chipinfo { > > const struct clockgen_muxinfo *cmux_groups[2]; > > const struct clockgen_muxinfo *hwaccel[NUM_HWACCEL]; > > void (*init_periph)(struct clockgen *cg); > > - int cmux_to_group[NUM_CMUX]; /* -1 terminates if fewer than > > NUM_CMUX */ > > + int cmux_to_group[NUM_CMUX+1]; /* -1 terminate if fewer to > > NUM_CMUX+1 */ > > You need to add the -1 terminator to p4080, and remove the "if fewer" > comment since the whole point of this is that every array gets -1 terminated. Ok, Updated > > Why did you change "terminates" to "terminate" and "than" to "to"? > > This +1 change should be a separate patch from lx2160a support. Sure, Sending as separate patch > > -Scott
diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c index 3a1812f..e9ae70b 100644 --- a/drivers/clk/clk-qoriq.c +++ b/drivers/clk/clk-qoriq.c @@ -79,7 +79,7 @@ struct clockgen_chipinfo { const struct clockgen_muxinfo *cmux_groups[2]; const struct clockgen_muxinfo *hwaccel[NUM_HWACCEL]; void (*init_periph)(struct clockgen *cg); - int cmux_to_group[NUM_CMUX]; /* -1 terminates if fewer than NUM_CMUX */ + int cmux_to_group[NUM_CMUX+1]; /* -1 terminate if fewer to NUM_CMUX+1 */ u32 pll_mask; /* 1 << n bit set if PLL n is valid */ u32 flags; /* CG_xxx */ }; @@ -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, @@ -1424,6 +1435,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); /* Legacy nodes */ CLK_OF_DECLARE(qoriq_sysclk_1, "fsl,qoriq-sysclk-1.0", sysclk_init); diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c index 3d773f6..83921b7 100644 --- a/drivers/cpufreq/qoriq-cpufreq.c +++ b/drivers/cpufreq/qoriq-cpufreq.c @@ -295,6 +295,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", },