On Tue, Dec 22, 2009 at 9:03 AM, Paul Walmsley <paul@xxxxxxxxx> wrote:
>
> From: Cory Maccarrone <darkstar6262@xxxxxxxxx>
>
> This change adds in some missing clocks that were needed as a result
> of 526505... (OMAP1 clock: convert mach-omap1/clock.h to
> mach-omap1/clock_data.c). Prior to this, it was just assumed that
> these clocks existed for all devices, and it was used directly instead
> of calling it out with a clock_get call or similar. So, not having
> the CK_7XX meant these clocks weren't being used anymore for omap 7xx
> devices, which broke things badly.
>
> Signed-off-by: Cory Maccarrone <darkstar6262@xxxxxxxxx>
> [paul@xxxxxxxxx: commit message edited]
> Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
> ---
> arch/arm/mach-omap1/clock_data.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c
> index ab995a9..31fba07 100644
> --- a/arch/arm/mach-omap1/clock_data.c
> +++ b/arch/arm/mach-omap1/clock_data.c
> @@ -599,7 +599,7 @@ static struct clk i2c_ick = {
> static struct omap_clk omap_clks[] = {
> /* non-ULPD clocks */
> CLK(NULL, "ck_ref", &ck_ref, CK_16XX | CK_1510 | CK_310 | CK_7XX),
> - CLK(NULL, "ck_dpll1", &ck_dpll1, CK_16XX | CK_1510 | CK_310),
> + CLK(NULL, "ck_dpll1", &ck_dpll1, CK_16XX | CK_1510 | CK_310 | CK_7XX),
> /* CK_GEN1 clocks */
> CLK(NULL, "ck_dpll1out", &ck_dpll1out.clk, CK_16XX),
> CLK(NULL, "ck_sossi", &sossi_ck, CK_16XX),
> @@ -627,7 +627,7 @@ static struct omap_clk omap_clks[] = {
> CLK(NULL, "tc2_ck", &tc2_ck, CK_16XX),
> CLK(NULL, "dma_ck", &dma_ck, CK_16XX | CK_1510 | CK_310),
> CLK(NULL, "dma_lcdfree_ck", &dma_lcdfree_ck, CK_16XX),
> - CLK(NULL, "api_ck", &api_ck.clk, CK_16XX | CK_1510 | CK_310),
> + CLK(NULL, "api_ck", &api_ck.clk, CK_16XX | CK_1510 | CK_310 | CK_7XX),
> CLK(NULL, "lb_ck", &lb_ck.clk, CK_1510 | CK_310),
> CLK(NULL, "rhea1_ck", &rhea1_ck, CK_16XX),
> CLK(NULL, "rhea2_ck", &rhea2_ck, CK_16XX),
> --
> 1.6.6.rc2.5.g49666
>
I'd like to amend this patch -- there's more wrong in this file than
simply missing clocks, as it turns out. I'll submit my new patch for
review shortly.
- Cory
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
