Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a16e9703 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2: Clean up 24xx clock code 



Clean up 24xx clock code to sync it with linux-omap tree.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 2150ef46

arch/arm/mach-omap2/clock.c

+4 −11
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/mach-omap2/clock.c

 *

 *  Copyright (C) 2005 Texas Instruments Inc.

 *  Richard Woodruff <r-woodruff2@ti.com>

 *  Created for OMAP2.

 *

 *  Cleaned up and modified to use omap shared clock framework by

 *  Tony Lindgren <tony@atomide.com>

 *  Copyright (C) 2005-2008 Texas Instruments, Inc.

 *  Copyright (C) 2004-2008 Nokia Corporation

 *

 *  Copyright (C) 2007 Texas Instruments, Inc.

 *  Copyright (C) 2007 Nokia Corporation

 *  Contacts:

 *  Richard Woodruff <r-woodruff2@ti.com>

 *  Paul Walmsley

 *

 *  Based on omap1 clock.c, Copyright (C) 2004 - 2005 Nokia corporation

 *  Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

arch/arm/mach-omap2/clock.h

+4 −9
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/mach-omap2/clock.h

 *

 *  Copyright (C) 2005 Texas Instruments Inc.

 *  Richard Woodruff <r-woodruff2@ti.com>

 *  Created for OMAP2.

 *

 *  Copyright (C) 2004 Nokia corporation

 *  Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com>

 *  Based on clocks.h by Tony Lindgren, Gordon McNutt and RidgeRun, Inc

 *  Copyright (C) 2005-2008 Texas Instruments, Inc.

 *  Copyright (C) 2004-2008 Nokia Corporation

 *

 *  Copyright (C) 2007 Texas Instruments, Inc.

 *  Copyright (C) 2007 Nokia Corporation

 *  Contacts:

 *  Richard Woodruff <r-woodruff2@ti.com>

 *  Paul Walmsley

 *

 * This program is free software; you can redistribute it and/or modify

arch/arm/mach-omap2/clock24xx.c

+23 −23
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/mach-omap2/clock.c

 *

 *  Copyright (C) 2005 Texas Instruments Inc.

 *  Richard Woodruff <r-woodruff2@ti.com>

 *  Created for OMAP2.

 *  Copyright (C) 2005-2008 Texas Instruments, Inc.

 *  Copyright (C) 2004-2008 Nokia Corporation

 *

 *  Cleaned up and modified to use omap shared clock framework by

 *  Tony Lindgren <tony@atomide.com>

 *  Contacts:

 *  Richard Woodruff <r-woodruff2@ti.com>

 *  Paul Walmsley

 *

 *  Based on omap1 clock.c, Copyright (C) 2004 - 2005 Nokia corporation

 *  Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com>

 *  Based on earlier work by Tuukka Tikkanen, Tony Lindgren,

 *  Gordon McNutt and RidgeRun, Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as
@@ -60,6 +60,21 @@ static struct clk *sclk; 
 * Omap24xx specific clock functions

 *-------------------------------------------------------------------------*/



/* This actually returns the rate of core_ck, not dpll_ck. */

static u32 omap2_get_dpll_rate_24xx(struct clk *tclk)

{

	long long dpll_clk;

	u8 amult;



	dpll_clk = omap2_get_dpll_rate(tclk);



	amult = cm_read_mod_reg(PLL_MOD, CM_CLKSEL2);

	amult &= OMAP24XX_CORE_CLK_SRC_MASK;

	dpll_clk *= amult;



	return dpll_clk;

}



static int omap2_enable_osc_ck(struct clk *clk)

{

	u32 pcc;
@@ -94,21 +109,6 @@ static void omap2_sys_clk_recalc(struct clk * clk) 
}

#endif	/* OLD_CK */



/* This actually returns the rate of core_ck, not dpll_ck. */

static u32 omap2_get_dpll_rate_24xx(struct clk *tclk)

{

	long long dpll_clk;

	u8 amult;



	dpll_clk = omap2_get_dpll_rate(tclk);



	amult = cm_read_mod_reg(PLL_MOD, CM_CLKSEL2);

	amult &= OMAP24XX_CORE_CLK_SRC_MASK;

	dpll_clk *= amult;



	return dpll_clk;

}



/* Enable an APLL if off */

static int omap2_clk_fixed_enable(struct clk *clk)

{

arch/arm/mach-omap2/clock24xx.h

+18 −19
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/mach-omap24xx/clock.h

 *  linux/arch/arm/mach-omap2/clock24xx.h

 *

 *  Copyright (C) 2005 Texas Instruments Inc.

 *  Richard Woodruff <r-woodruff2@ti.com>

 *  Created for OMAP2.

 *  Copyright (C) 2005-2008 Texas Instruments, Inc.

 *  Copyright (C) 2004-2008 Nokia Corporation

 *

 *  Copyright (C) 2004 Nokia corporation

 *  Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com>

 *  Based on clocks.h by Tony Lindgren, Gordon McNutt and RidgeRun, Inc

 *  Contacts:

 *  Richard Woodruff <r-woodruff2@ti.com>

 *  Paul Walmsley

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as