| Message ID | 1445587282-29529-5-git-send-email-B48286@freescale.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On Fri, Oct 23, 2015 at 3:01 AM, Zhiqiang Hou <B48286@freescale.com> wrote: > From: Hou Zhiqiang <B48286@freescale.com> > > Signed-off-by: Hou Zhiqiang <B48286@freescale.com> > Acked-by: Stephen Boyd <sboyd@codeaurora.org> > --- > V6: V5 V4 V3 V2 > - No change. I know you mentioned the dependency in the summary of the patch series. But it's not likely these dependencies will be merged through the ARM sub-maintainers tree and be resolved in this merge window. So it will be better to mention these dependencies here so that this patch will go through the same tree as these dependency patches. Scott, What is your plan to merge the clock patches? This patch need to go together with it. Regards, Leo -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 2015-10-26 at 17:20 -0500, Leo Li wrote: > On Fri, Oct 23, 2015 at 3:01 AM, Zhiqiang Hou <B48286@freescale.com> wrote: > > From: Hou Zhiqiang <B48286@freescale.com> > > > > Signed-off-by: Hou Zhiqiang <B48286@freescale.com> > > Acked-by: Stephen Boyd <sboyd@codeaurora.org> > > --- > > V6: V5 V4 V3 V2 > > - No change. > > I know you mentioned the dependency in the summary of the patch > series. But it's not likely these dependencies will be merged through > the ARM sub-maintainers tree and be resolved in this merge window. So > it will be better to mention these dependencies here so that this > patch will go through the same tree as these dependency patches. > > Scott, > > What is your plan to merge the clock patches? This patch need to go > together with it. See https://lists.ozlabs.org/pipermail/linuxppc-dev/2015-October/135565.html -Scott -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c index 8f9c93b..b189688 100644 --- a/drivers/clk/clk-qoriq.c +++ b/drivers/clk/clk-qoriq.c @@ -244,6 +244,28 @@ static const struct clockgen_muxinfo clockgen2_cmux_cgb = { }, }; +static const struct clockgen_muxinfo ls1043a_hwa1 = { + { + {}, + {}, + { CLKSEL_VALID, CGA_PLL1, PLL_DIV2 }, + { CLKSEL_VALID, CGA_PLL1, PLL_DIV3 }, + {}, + {}, + { CLKSEL_VALID, CGA_PLL2, PLL_DIV2 }, + { CLKSEL_VALID, CGA_PLL2, PLL_DIV3 }, + }, +}; + +static const struct clockgen_muxinfo ls1043a_hwa2 = { + { + {}, + { CLKSEL_VALID, CGA_PLL2, PLL_DIV1 }, + {}, + { CLKSEL_VALID, CGA_PLL2, PLL_DIV3 }, + }, +}; + static const struct clockgen_muxinfo t1023_hwa1 = { { {}, @@ -452,6 +474,21 @@ static const struct clockgen_chipinfo chipinfo[] = { .pll_mask = 0x03, }, { + .compat = "fsl,ls1043a-clockgen", + .init_periph = t2080_init_periph, + .cmux_groups = { + &t1040_cmux + }, + .hwaccel = { + &ls1043a_hwa1, &ls1043a_hwa2 + }, + .cmux_to_group = { + 0, -1 + }, + .pll_mask = 0x07, + .flags = CG_PLL_8BIT, + }, + { .compat = "fsl,ls2080a-clockgen", .cmux_groups = { &clockgen2_cmux_cga12, &clockgen2_cmux_cgb @@ -1227,6 +1264,7 @@ err: 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_ls1021a, "fsl,ls1021a-clockgen", clockgen_init); +CLK_OF_DECLARE(qoriq_clockgen_ls1043a, "fsl,ls1043a-clockgen", clockgen_init); CLK_OF_DECLARE(qoriq_clockgen_ls2080a, "fsl,ls2080a-clockgen", clockgen_init); /* Legacy nodes */