Commit cbcf7833 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: omap2: simplify clock2xxx header 



Only one of the functions in clock2xxx.h is used in a file
other than the one it is declared in, so remove the extra
declarations, and make the symbols static.

Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent f2286d2b

arch/arm/mach-omap2/clkt2xxx_dpllcore.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/kernel.h>

#include <linux/errno.h>

#include <linux/clk.h>

#include <linux/clk/ti.h>

#include <linux/io.h>



#include "clock.h"

arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c

+8 −6
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
#include "sdrc.h"

#include "sram.h"



static u16 cpu_mask;



const struct prcm_config *curr_prcm_set;

const struct prcm_config *rate_table;
@@ -55,7 +57,7 @@ static unsigned long sys_ck_rate; 
 *

 * Set virt_prcm_set's rate to the mpu_speed field of the current PRCM set.

 */

unsigned long omap2_table_mpu_recalc(struct clk_hw *clk,

static unsigned long omap2_table_mpu_recalc(struct clk_hw *clk,

				     unsigned long parent_rate)

{

	return curr_prcm_set->mpu_speed;
@@ -68,7 +70,7 @@ unsigned long omap2_table_mpu_recalc(struct clk_hw *clk, 
 * Some might argue L3-DDR, others ARM, others IVA. This code is simple and

 * just uses the ARM rates.

 */

long omap2_round_to_table_rate(struct clk_hw *hw, unsigned long rate,

static long omap2_round_to_table_rate(struct clk_hw *hw, unsigned long rate,

			       unsigned long *parent_rate)

{

	const struct prcm_config *ptr;
@@ -92,7 +94,7 @@ long omap2_round_to_table_rate(struct clk_hw *hw, unsigned long rate, 
}



/* Sets basic clocks based on the specified rate */

int omap2_select_table_rate(struct clk_hw *hw, unsigned long rate,

static int omap2_select_table_rate(struct clk_hw *hw, unsigned long rate,

				   unsigned long parent_rate)

{

	u32 cur_rate, done_rate, bypass = 0;
@@ -167,7 +169,7 @@ int omap2_select_table_rate(struct clk_hw *hw, unsigned long rate, 
 * global to point to the active rate set when found; otherwise, sets

 * it to NULL.  No return value;

 */

void omap2xxx_clkt_vps_check_bootloader_rates(void)

static void omap2xxx_clkt_vps_check_bootloader_rates(void)

{

	const struct prcm_config *prcm = NULL;

	unsigned long rate;
@@ -193,7 +195,7 @@ void omap2xxx_clkt_vps_check_bootloader_rates(void) 
 * sys_ck rate, but before the virt_prcm_set clock rate is

 * recalculated.  No return value.

 */

void omap2xxx_clkt_vps_late_init(void)

static void omap2xxx_clkt_vps_late_init(void)

{

	struct clk *c;

arch/arm/mach-omap2/clock.c

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ 
#include "cm-regbits-34xx.h"

#include "common.h"



u16 cpu_mask;



/* DPLL valid Fint frequency band limits - from 34xx TRM Section 4.7.6.2 */

#define OMAP3430_DPLL_FINT_BAND1_MIN	750000

#define OMAP3430_DPLL_FINT_BAND1_MAX	2100000

arch/arm/mach-omap2/clock.h

+0 −2
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ 


extern struct ti_clk_ll_ops omap_clk_ll_ops;



extern u16 cpu_mask;



extern const struct clkops clkops_omap2_dflt_wait;

extern const struct clkops clkops_omap2_dflt;

arch/arm/mach-omap2/clock2xxx.h

+0 −29
Original line number Diff line number Diff line
@@ -12,35 +12,6 @@ 
#include <linux/clk-provider.h>

#include "clock.h"



unsigned long omap2_table_mpu_recalc(struct clk_hw *clk,

				     unsigned long parent_rate);

int omap2_select_table_rate(struct clk_hw *hw, unsigned long rate,

			    unsigned long parent_rate);

long omap2_round_to_table_rate(struct clk_hw *hw, unsigned long rate,

			       unsigned long *parent_rate);

unsigned long omap2xxx_sys_clk_recalc(struct clk_hw *clk,

				      unsigned long parent_rate);

unsigned long omap2_osc_clk_recalc(struct clk_hw *clk,

				   unsigned long parent_rate);

void omap2xxx_clkt_dpllcore_init(struct clk_hw *hw);

unsigned long omap2xxx_clk_get_core_rate(void);

u32 omap2xxx_get_sysclkdiv(void);

void omap2xxx_clk_prepare_for_reboot(void);

void omap2xxx_clkt_vps_check_bootloader_rates(void);

void omap2xxx_clkt_vps_late_init(void);



#ifdef CONFIG_SOC_OMAP2420

int omap2420_clk_init(void);

#else

#define omap2420_clk_init()	do { } while(0)

#endif



#ifdef CONFIG_SOC_OMAP2430

int omap2430_clk_init(void);

#else

#define omap2430_clk_init()	do { } while(0)

#endif



extern struct clk_hw *dclk_hw;



#endif