| Message ID | 1363895115-14129-1-git-send-email-swarren@wwwdotorg.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
On 03/21/2013 01:45 PM, Stephen Warren wrote: > From: Stephen Warren <swarren@nvidia.com> > > This sets up all the audio-related clocks on Tegra114 in the same way > as they are set up on previous chips. > Peter, do you want to roll this into your CCF series V8, or should I apply > it seperately? I see that part of this is included in your CCF series v8, except that: > diff --git a/drivers/clk/tegra/clk-tegra114.c b/drivers/clk/tegra/clk-tegra114.c > + {pll_a, clk_max, 564480000, 1}, > + {pll_a_out0, clk_max, 11289600, 1}, > + {extern1, pll_a_out0, 0, 1}, > + {clk_out_1, clk_max, 0, 1}, The "enable" bits are set to 0 there. As I mentioned in the other email, the audio driver assumes these clocks are enabled, unless we want to enhance the driver to change that, but that would create a dependency between the ASoC and Tegra trees, which I'd really rather not do, since other changes to the relevant ASoC files are already going through ASoC tree for 3.10. > + {i2s0, pll_a_out0, 11289600, 0}, > + {i2s1, pll_a_out0, 11289600, 0}, > + {i2s2, pll_a_out0, 11289600, 0}, > + {i2s3, pll_a_out0, 11289600, 0}, > + {i2s4, pll_a_out0, 11289600, 0}, Those entries are missing. At least the parenting relationship needs to be set up I believe. I assume you want me to send an incremental patch to fix that up? -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Mar 22, 2013 at 07:48:51PM +0100, Stephen Warren wrote: > On 03/21/2013 01:45 PM, Stephen Warren wrote: > > From: Stephen Warren <swarren@nvidia.com> > > > > This sets up all the audio-related clocks on Tegra114 in the same way > > as they are set up on previous chips. > > > Peter, do you want to roll this into your CCF series V8, or should I apply > > it seperately? > > I see that part of this is included in your CCF series v8, except that: > > > diff --git a/drivers/clk/tegra/clk-tegra114.c b/drivers/clk/tegra/clk-tegra114.c > > > + {pll_a, clk_max, 564480000, 1}, > > + {pll_a_out0, clk_max, 11289600, 1}, > > + {extern1, pll_a_out0, 0, 1}, > > > + {clk_out_1, clk_max, 0, 1}, > > The "enable" bits are set to 0 there. As I mentioned in the other email, > the audio driver assumes these clocks are enabled, unless we want to > enhance the driver to change that, but that would create a dependency > between the ASoC and Tegra trees, which I'd really rather not do, since > other changes to the relevant ASoC files are already going through ASoC > tree for 3.10. > Ok. In that cse we have to think about using a different way of doing udelay() in clk-pll.c or move the initialization after the loop has been calibrated. > > + {i2s0, pll_a_out0, 11289600, 0}, > > + {i2s1, pll_a_out0, 11289600, 0}, > > + {i2s2, pll_a_out0, 11289600, 0}, > > + {i2s3, pll_a_out0, 11289600, 0}, > > + {i2s4, pll_a_out0, 11289600, 0}, > > Those entries are missing. At least the parenting relationship needs to > be set up I believe. That's ok. > > I assume you want me to send an incremental patch to fix that up? That would be great. cheers, Peter. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Mar 25, 2013 at 11:04:44AM +0100, Peter De Schrijver wrote: > On Fri, Mar 22, 2013 at 07:48:51PM +0100, Stephen Warren wrote: > > On 03/21/2013 01:45 PM, Stephen Warren wrote: > > > From: Stephen Warren <swarren@nvidia.com> > > > > > > This sets up all the audio-related clocks on Tegra114 in the same way > > > as they are set up on previous chips. > > > > > Peter, do you want to roll this into your CCF series V8, or should I apply > > > it seperately? > > > > I see that part of this is included in your CCF series v8, except that: > > > > > diff --git a/drivers/clk/tegra/clk-tegra114.c b/drivers/clk/tegra/clk-tegra114.c > > > > > + {pll_a, clk_max, 564480000, 1}, > > > + {pll_a_out0, clk_max, 11289600, 1}, > > > + {extern1, pll_a_out0, 0, 1}, > > > > > + {clk_out_1, clk_max, 0, 1}, > > > > The "enable" bits are set to 0 there. As I mentioned in the other email, > > the audio driver assumes these clocks are enabled, unless we want to > > enhance the driver to change that, but that would create a dependency > > between the ASoC and Tegra trees, which I'd really rather not do, since > > other changes to the relevant ASoC files are already going through ASoC > > tree for 3.10. > > > > Ok. In that cse we have to think about using a different way of doing udelay() > in clk-pll.c or move the initialization after the loop has been calibrated. > > > > + {i2s0, pll_a_out0, 11289600, 0}, > > > + {i2s1, pll_a_out0, 11289600, 0}, > > > + {i2s2, pll_a_out0, 11289600, 0}, > > > + {i2s3, pll_a_out0, 11289600, 0}, > > > + {i2s4, pll_a_out0, 11289600, 0}, > > > > Those entries are missing. At least the parenting relationship needs to > > be set up I believe. > I can add these directly into CCF v9. Is that ok? Cheers, Peter. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" 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/tegra/clk-tegra114.c b/drivers/clk/tegra/clk-tegra114.c index 81101f1..9aa87b5 100644 --- a/drivers/clk/tegra/clk-tegra114.c +++ b/drivers/clk/tegra/clk-tegra114.c @@ -1979,6 +1979,16 @@ static __initdata struct tegra_clk_init_table init_table[] = { {uartb, pll_p, 408000000, 0}, {uartc, pll_p, 408000000, 0}, {uartd, pll_p, 408000000, 0}, + {pll_a, clk_max, 564480000, 1}, + {pll_a_out0, clk_max, 11289600, 1}, + {extern1, pll_a_out0, 0, 1}, + {clk_out_1_mux, extern1, 0, 0}, + {clk_out_1, clk_max, 0, 1}, + {i2s0, pll_a_out0, 11289600, 0}, + {i2s1, pll_a_out0, 11289600, 0}, + {i2s2, pll_a_out0, 11289600, 0}, + {i2s3, pll_a_out0, 11289600, 0}, + {i2s4, pll_a_out0, 11289600, 0}, {clk_max, clk_max, 0, 0}, /* This MUST be the last entry. */ };