Commit 7c43d547 authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Paul Walmsley
Browse files

OMAP4: clock: Add dummy clock nodes for interface clocks 



On OMAP4 platform the iclk control is completly under hardware control
and no software control is available.

This difference w.r.t previous OMAP's needs all the common driver
accross OMAP's , cpu_is_xxxx() checks. To avoid poulluting the
drivers dummy clock nodes are created (The autogeneration
script has been updated accordingly).

Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
Signed-off-by: default avatarBenoit Cousson <b-cousson@ti.com>
[paul@pwsan.com: made OMAP1 dummy_ck common and edited patch to reuse that]
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 54776050

arch/arm/mach-omap1/clock.c

+0 −14
Original line number Diff line number Diff line
@@ -38,20 +38,6 @@ struct clk *api_ck_p, *ck_dpll1_p, *ck_ref_p; 
 * Omap1 specific clock functions

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



static int clk_omap1_dummy_enable(struct clk *clk)

{

	return 0;

}



static void clk_omap1_dummy_disable(struct clk *clk)

{

}



const struct clkops clkops_dummy = {

	.enable		= clk_omap1_dummy_enable,

	.disable	= clk_omap1_dummy_disable,

};



unsigned long omap1_uart_recalc(struct clk *clk)

{

	unsigned int val = __raw_readl(clk->enable_reg);

arch/arm/mach-omap1/clock_data.c

+0 −6
Original line number Diff line number Diff line
@@ -27,12 +27,6 @@ 
 * Omap1 clocks

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



/* XXX is this necessary? */

static struct clk dummy_ck = {

	.name	= "dummy",

	.ops	= &clkops_dummy,

};



static struct clk ck_ref = {

	.name		= "ck_ref",

	.ops		= &clkops_null,

arch/arm/mach-omap2/clock.h

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ void omap2_clk_print_new_rates(const char *hfclkin_ck_name, 
extern u8 cpu_mask;



extern const struct clkops clkops_omap2_dflt_wait;

extern const struct clkops clkops_dummy;

extern const struct clkops clkops_omap2_dflt;



extern struct clk_functions omap2_clk_functions;

arch/arm/mach-omap2/clock44xx_data.c

+35 −0
Original line number Diff line number Diff line
@@ -2645,6 +2645,41 @@ static struct omap_clk omap44xx_clks[] = { 
	CLK(NULL,	"usim_fclk",			&usim_fclk,	CK_443X),

	CLK(NULL,	"utmi_p1_gfclk_ck",		&utmi_p1_gfclk_ck,	CK_443X),

	CLK(NULL,	"utmi_p2_gfclk_ck",		&utmi_p2_gfclk_ck,	CK_443X),

	CLK(NULL,	"gpio1_dbck",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpio2_dbck",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpio3_dbck",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpio4_dbck",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpio5_dbck",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpio6_dbck",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpmc_ck",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt1_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt2_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt3_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt4_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt5_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt6_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt7_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt8_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt9_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt10_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt11_ick",			&dummy_ck,	CK_443X),

	CLK("i2c_omap.1",	"ick",				&dummy_ck,	CK_443X),

	CLK("i2c_omap.2",	"ick",				&dummy_ck,	CK_443X),

	CLK("i2c_omap.3",	"ick",				&dummy_ck,	CK_443X),

	CLK("i2c_omap.4",	"ick",				&dummy_ck,	CK_443X),

	CLK("omap-mcbsp.1",	"ick",				&dummy_ck,	CK_443X),

	CLK("omap-mcbsp.2",	"ick",				&dummy_ck,	CK_443X),

	CLK("omap-mcbsp.3",	"ick",				&dummy_ck,	CK_443X),

	CLK("omap-mcbsp.4",	"ick",				&dummy_ck,	CK_443X),

	CLK("omap-mcspi.1",	"ick",				&dummy_ck,	CK_443X),

	CLK("omap-mcspi.2",	"ick",				&dummy_ck,	CK_443X),

	CLK("omap-mcspi.3",	"ick",				&dummy_ck,	CK_443X),

	CLK("omap-mcspi.4",	"ick",				&dummy_ck,	CK_443X),

	CLK(NULL,	"uart1_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"uart2_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"uart3_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"uart4_ick",			&dummy_ck,	CK_443X),

	CLK("omap_wdt",	"ick",				&dummy_ck,	CK_443X),

};



int __init omap4xxx_clk_init(void)

arch/arm/plat-omap/clock.c

+10 −0
Original line number Diff line number Diff line
@@ -357,6 +357,16 @@ const struct clkops clkops_null = { 
	.disable	= clkll_disable_null,

};



/*

 * Dummy clock

 *

 * Used for clock aliases that are needed on some OMAPs, but not others

 */

struct clk dummy_ck = {

	.name	= "dummy",

	.ops	= &clkops_null,

};



#ifdef CONFIG_CPU_FREQ

void clk_init_cpufreq_table(struct cpufreq_frequency_table **table)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE