Commit 437f629d authored by Stephen Boyd's avatar Stephen Boyd Committed by David Brown
Browse files

msm: clock: Remove unused code and definitions 



This code is dead or otherwise useless so just remove it.

Reviewed-by: default avatarSaravana Kannan <skannan@codeaurora.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent 5c548add

arch/arm/mach-msm/board-msm8x60.c

+0 −4
Original line number Diff line number Diff line
@@ -28,10 +28,6 @@ 
#include <mach/board.h>

#include <mach/msm_iomap.h>



unsigned long clk_get_max_axi_khz(void)

{

	return 0;

}



static void __init msm8x60_map_io(void)

{

arch/arm/mach-msm/clock.c

+2 −18
Original line number Diff line number Diff line
@@ -36,13 +36,6 @@ static LIST_HEAD(clocks); 
struct clk *msm_clocks;

unsigned msm_num_clocks;



/*

 * Bitmap of enabled clocks, excluding ACPU which is always

 * enabled

 */

static DECLARE_BITMAP(clock_map_enabled, NR_CLKS);

static DEFINE_SPINLOCK(clock_map_lock);



/*

 * Standard clock functions defined in include/linux/clk.h

 */
@@ -77,12 +70,8 @@ int clk_enable(struct clk *clk) 
	unsigned long flags;

	spin_lock_irqsave(&clocks_lock, flags);

	clk->count++;

	if (clk->count == 1) {

	if (clk->count == 1)

		clk->ops->enable(clk->id);

		spin_lock(&clock_map_lock);

		clock_map_enabled[BIT_WORD(clk->id)] |= BIT_MASK(clk->id);

		spin_unlock(&clock_map_lock);

	}

	spin_unlock_irqrestore(&clocks_lock, flags);

	return 0;

}
@@ -94,12 +83,8 @@ void clk_disable(struct clk *clk) 
	spin_lock_irqsave(&clocks_lock, flags);

	BUG_ON(clk->count == 0);

	clk->count--;

	if (clk->count == 0) {

	if (clk->count == 0)

		clk->ops->disable(clk->id);

		spin_lock(&clock_map_lock);

		clock_map_enabled[BIT_WORD(clk->id)] &= ~BIT_MASK(clk->id);

		spin_unlock(&clock_map_lock);

	}

	spin_unlock_irqrestore(&clocks_lock, flags);

}

EXPORT_SYMBOL(clk_disable);
@@ -196,7 +181,6 @@ void __init msm_clock_init(struct clk *clock_tbl, unsigned num_clocks) 
{

	unsigned n;



	spin_lock_init(&clocks_lock);

	mutex_lock(&clocks_mutex);

	msm_clocks = clock_tbl;

	msm_num_clocks = num_clocks;

arch/arm/mach-msm/clock.h

+0 −42
Original line number Diff line number Diff line
@@ -59,51 +59,9 @@ struct clk { 
	struct device *dev;

};



#define A11S_CLK_CNTL_ADDR		(MSM_CSR_BASE + 0x100)

#define A11S_CLK_SEL_ADDR		(MSM_CSR_BASE + 0x104)

#define A11S_VDD_SVS_PLEVEL_ADDR	(MSM_CSR_BASE + 0x124)



#ifdef CONFIG_DEBUG_FS

#define CLOCK_DBG_NAME(x) .dbg_name = x,

#else

#define CLOCK_DBG_NAME(x)

#endif



#define CLOCK(clk_name, clk_id, clk_dev, clk_flags) {	\

	.name = clk_name, \

	.id = clk_id, \

	.flags = clk_flags, \

	.dev = clk_dev, \

	 CLOCK_DBG_NAME(#clk_id) \

	}



#define OFF CLKFLAG_AUTO_OFF

#define CLK_MIN CLKFLAG_MIN

#define CLK_MAX CLKFLAG_MAX

#define CLK_MINMAX (CLK_MIN | CLK_MAX)

#define NR_CLKS	P_NR_CLKS



enum {

	PLL_0 = 0,

	PLL_1,

	PLL_2,

	PLL_3,

	PLL_4,

	PLL_5,

	PLL_6,

	NUM_PLL

};



enum clkvote_client {

	CLKVOTE_ACPUCLK = 0,

	CLKVOTE_PMQOS,

	CLKVOTE_MAX,

};



int msm_clock_require_tcxo(unsigned long *reason, int nbits);

int msm_clock_get_name(uint32_t id, char *name, uint32_t size);

int ebi1_clk_set_min_rate(enum clkvote_client client, unsigned long rate);

unsigned long clk_get_max_axi_khz(void);



#endif