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

Commit 87a1b26c authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP2xxx clock: move osc_clk code into mach-omap2/clkt2xxx_osc.c 



Move the osc_clk clock functions from clock2xxx.c to
mach-omap2/clkt2xxx_osc.  This is intended to make the clock code
easier to understand, since all of the functions needed to manage the
osc_clk are now located in their own file, rather than being mixed
with other, unrelated functions.

Clock debugging is also now more finely-grained, since the DEBUG
macro can now be defined for osc_clk clocks alone.  This
should reduce unnecessary console noise when debugging.

Also, if at some future point the mach-omap2/ directory is split
into OMAP2/3/4 variants, this clkt file can be placed in the mach-omap2xxx/
directory, rather than shared with other chip types that don't use this
clock type.

Thanks to Alexander Shishkin <virtuoso@slind.org> for his comments to
improve the patch description.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Alexander Shishkin <virtuoso@slind.org>
parent 49214640

arch/arm/mach-omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ clock-common = clock.o clock_common_data.o \ 
					  clkt_clksel.o

clock-omap2xxx				= clkt2xxx_dpllcore.o \

					  clkt2xxx_virt_prcm_set.o \

					  clkt2xxx_apll.o

					  clkt2xxx_apll.o clkt2xxx_osc.o



obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(clock-common) \

			    $(clock-omap2xxx)

arch/arm/mach-omap2/clkt2xxx_osc.c

0 → 100644
+62 −0
Original line number Diff line number Diff line 
/*

 * OMAP2xxx osc_clk-specific clock code

 *

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

 * Copyright (C) 2004-2010 Nokia Corporation

 *

 * Contacts:

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

 * Paul Walmsley

 *

 * 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

 * published by the Free Software Foundation.

 */

#undef DEBUG



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/errno.h>

#include <linux/clk.h>

#include <linux/io.h>



#include <plat/clock.h>



#include "clock.h"

#include "clock2xxx.h"

#include "prm.h"

#include "prm-regbits-24xx.h"



static int omap2_enable_osc_ck(struct clk *clk)

{

	u32 pcc;



	pcc = __raw_readl(prcm_clksrc_ctrl);



	__raw_writel(pcc & ~OMAP_AUTOEXTCLKMODE_MASK, prcm_clksrc_ctrl);



	return 0;

}



static void omap2_disable_osc_ck(struct clk *clk)

{

	u32 pcc;



	pcc = __raw_readl(prcm_clksrc_ctrl);



	__raw_writel(pcc | OMAP_AUTOEXTCLKMODE_MASK, prcm_clksrc_ctrl);

}



const struct clkops clkops_oscck = {

	.enable		= omap2_enable_osc_ck,

	.disable	= omap2_disable_osc_ck,

};



unsigned long omap2_osc_clk_recalc(struct clk *clk)

{

	return omap2xxx_get_apll_clkin() * omap2xxx_get_sysclkdiv();

}

arch/arm/mach-omap2/clock2xxx.c

+2 −32
Original line number Diff line number Diff line
@@ -79,31 +79,6 @@ const struct clkops clkops_omap2430_i2chs_wait = { 
	.find_companion = omap2_clk_dflt_find_companion,

};



static int omap2_enable_osc_ck(struct clk *clk)

{

	u32 pcc;



	pcc = __raw_readl(prcm_clksrc_ctrl);



	__raw_writel(pcc & ~OMAP_AUTOEXTCLKMODE_MASK, prcm_clksrc_ctrl);



	return 0;

}



static void omap2_disable_osc_ck(struct clk *clk)

{

	u32 pcc;



	pcc = __raw_readl(prcm_clksrc_ctrl);



	__raw_writel(pcc | OMAP_AUTOEXTCLKMODE_MASK, prcm_clksrc_ctrl);

}



const struct clkops clkops_oscck = {

	.enable		= omap2_enable_osc_ck,

	.disable	= omap2_disable_osc_ck,

};



#ifdef OLD_CK

/* Recalculate SYST_CLK */

static void omap2_sys_clk_recalc(struct clk *clk)
@@ -116,7 +91,7 @@ static void omap2_sys_clk_recalc(struct clk *clk) 
}

#endif	/* OLD_CK */



static u32 omap2_get_sysclkdiv(void)

u32 omap2xxx_get_sysclkdiv(void)

{

	u32 div;
@@ -127,14 +102,9 @@ static u32 omap2_get_sysclkdiv(void) 
	return div;

}



unsigned long omap2_osc_clk_recalc(struct clk *clk)

{

	return omap2xxx_get_apll_clkin() * omap2_get_sysclkdiv();

}



unsigned long omap2_sys_clk_recalc(struct clk *clk)

{

	return clk->parent->rate / omap2_get_sysclkdiv();

	return clk->parent->rate / omap2xxx_get_sysclkdiv();

}



/*

arch/arm/mach-omap2/clock2xxx.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ unsigned long omap2_dpllcore_recalc(struct clk *clk); 
int omap2_reprogram_dpllcore(struct clk *clk, unsigned long rate);

unsigned long omap2xxx_clk_get_core_rate(struct clk *clk);

u32 omap2xxx_get_apll_clkin(void);

u32 omap2xxx_get_sysclkdiv(void);



/* REVISIT: These should be set dynamically for CONFIG_MULTI_OMAP2 */

#ifdef CONFIG_ARCH_OMAP2420