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

Commit 530e544f authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP2+: clock: add interface clock type code with autoidle support 



Add interface clock type code with autoidle enable/disable support.
The clkops structures created in this file will be used for all
OMAP2/3 interface clocks with autoidle support.  They will enable the
clock framework to control interface clock autoidle directly.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Tested-by: default avatarRajendra Nayak <rnayak@ti.com>
Reviewed-by: default avatarKevin Hilman <khilman@ti.com>
parent cc1d230c

arch/arm/mach-omap2/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -110,19 +110,21 @@ obj-$(CONFIG_ARCH_OMAP3) += clockdomain.o \ 
obj-$(CONFIG_ARCH_OMAP4)		+= clockdomain.o \

					   clockdomain44xx.o \

					   clockdomains44xx_data.o



# Clock framework

obj-$(CONFIG_ARCH_OMAP2)		+= $(clock-common) clock2xxx.o \

					   clkt2xxx_sys.o \

					   clkt2xxx_dpllcore.o \

					   clkt2xxx_virt_prcm_set.o \

					   clkt2xxx_apll.o clkt2xxx_osc.o \

					   clkt2xxx_dpll.o

					   clkt2xxx_dpll.o clkt_iclk.o

obj-$(CONFIG_SOC_OMAP2420)		+= clock2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= clock2430.o clock2430_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(clock-common) clock3xxx.o \

					   clock34xx.o clkt34xx_dpll3m2.o \

					   clock3517.o clock36xx.o \

					   dpll3xxx.o clock3xxx_data.o

					   dpll3xxx.o clock3xxx_data.o \

					   clkt_iclk.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(clock-common) clock44xx_data.o \

					   dpll3xxx.o dpll44xx.o

arch/arm/mach-omap2/clkt_iclk.c

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

 * OMAP2/3 interface clock control

 *

 * Copyright (C) 2011 Nokia Corporation

 * 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

 * published by the Free Software Foundation.

 */

#undef DEBUG



#include <linux/kernel.h>

#include <linux/clk.h>

#include <linux/io.h>



#include <plat/clock.h>

#include <plat/prcm.h>



#include "clock.h"

#include "clock2xxx.h"

#include "cm2xxx_3xxx.h"

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



/* Private functions */



/* XXX */

void omap2_clkt_iclk_allow_idle(struct clk *clk)

{

	u32 v, r;



	r = ((__force u32)clk->enable_reg ^ (CM_AUTOIDLE ^ CM_ICLKEN));



	v = __raw_readl((__force void __iomem *)r);

	v |= (1 << clk->enable_bit);

	__raw_writel(v, (__force void __iomem *)r);

}



/* XXX */

void omap2_clkt_iclk_deny_idle(struct clk *clk)

{

	u32 v, r;



	r = ((__force u32)clk->enable_reg ^ (CM_AUTOIDLE ^ CM_ICLKEN));



	v = __raw_readl((__force void __iomem *)r);

	v &= ~(1 << clk->enable_bit);

	__raw_writel(v, (__force void __iomem *)r);

}



/* Public data */



const struct clkops clkops_omap2_iclk_dflt_wait = {

	.enable		= omap2_dflt_clk_enable,

	.disable	= omap2_dflt_clk_disable,

	.find_companion	= omap2_clk_dflt_find_companion,

	.find_idlest	= omap2_clk_dflt_find_idlest,

	.allow_idle	= omap2_clkt_iclk_allow_idle,

	.deny_idle	= omap2_clkt_iclk_deny_idle,

};



const struct clkops clkops_omap2_iclk_dflt = {

	.enable		= omap2_dflt_clk_enable,

	.disable	= omap2_dflt_clk_disable,

	.allow_idle	= omap2_clkt_iclk_allow_idle,

	.deny_idle	= omap2_clkt_iclk_deny_idle,

};



const struct clkops clkops_omap2_iclk_idle_only = {

	.allow_idle	= omap2_clkt_iclk_allow_idle,

	.deny_idle	= omap2_clkt_iclk_deny_idle,

};

arch/arm/mach-omap2/clock.h

+8 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *  linux/arch/arm/mach-omap2/clock.h

 *

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

 *  Copyright (C) 2004-2009 Nokia Corporation

 *  Copyright (C) 2004-2011 Nokia Corporation

 *

 *  Contacts:

 *  Richard Woodruff <r-woodruff2@ti.com>
@@ -86,6 +86,10 @@ long omap2_clksel_round_rate(struct clk *clk, unsigned long target_rate); 
int omap2_clksel_set_rate(struct clk *clk, unsigned long rate);

int omap2_clksel_set_parent(struct clk *clk, struct clk *new_parent);



/* clkt_iclk.c public functions */

extern void omap2_clkt_iclk_allow_idle(struct clk *clk);

extern void omap2_clkt_iclk_deny_idle(struct clk *clk);



u32 omap2_get_dpll_rate(struct clk *clk);

void omap2_init_dpll_parent(struct clk *clk);
@@ -148,6 +152,9 @@ extern void omap2_clk_exit_cpufreq_table(struct cpufreq_frequency_table **table) 
#define omap2_clk_exit_cpufreq_table	0

#endif



extern const struct clkops clkops_omap2_iclk_dflt_wait;

extern const struct clkops clkops_omap2_iclk_dflt;

extern const struct clkops clkops_omap2_iclk_idle_only;

extern const struct clkops clkops_omap2xxx_dpll_ops;

extern const struct clkops clkops_omap3_noncore_dpll_ops;

extern const struct clkops clkops_omap3_core_dpll_ops;