evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

blackfin: bf60x: fix compiling warning

Browse source 
Fix several compiling warning for bf60x.

Signed-off-by: Bob Liu <lliubbo@gmail.com>
This commit is contained in:
Bob Liu 2012-05-17 14:21:22 +08:00
parent 93f89519fd
commit 3a3cf0d7b8
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/blackfin/kernel/gptimers.c
View file

@ -332,13 +332,15 @@ static void _disable_gptimers(uint16_t mask)
void disable_gptimers(uint16_t mask) void disable_gptimers(uint16_t mask)
{ {
#ifndef CONFIG_BF60x
int i; int i;
_disable_gptimers(mask); _disable_gptimers(mask);
#ifndef CONFIG_BF60x
for (i = 0; i < MAX_BLACKFIN_GPTIMERS; ++i) for (i = 0; i < MAX_BLACKFIN_GPTIMERS; ++i)
if (mask & (1 << i)) if (mask & (1 << i))
bfin_write(&group_regs[BFIN_TIMER_OCTET(i)]->status, trun_mask[i]); bfin_write(&group_regs[BFIN_TIMER_OCTET(i)]->status, trun_mask[i]);
SSYNC(); SSYNC();
#else
_disable_gptimers(mask);
#endif #endif
} }
EXPORT_SYMBOL(disable_gptimers); EXPORT_SYMBOL(disable_gptimers);

3
arch/blackfin/mach-bf609/boards/ezkit.c
View file

@ -105,6 +105,8 @@ static struct platform_device bfin_rotary_device = {
#if defined(CONFIG_STMMAC_ETH) || defined(CONFIG_STMMAC_ETH_MODULE) #if defined(CONFIG_STMMAC_ETH) || defined(CONFIG_STMMAC_ETH_MODULE)
#include <linux/stmmac.h> #include <linux/stmmac.h>
static unsigned short pins[] = P_RMII0;
static struct stmmac_mdio_bus_data phy_private_data = { static struct stmmac_mdio_bus_data phy_private_data = {
.bus_id = 0, .bus_id = 0,
.phy_mask = 1, .phy_mask = 1,
@ -1283,7 +1285,6 @@ static int __init ezkit_init(void)
ARRAY_SIZE(bfin_i2c_board_info1)); ARRAY_SIZE(bfin_i2c_board_info1));
#if defined(CONFIG_STMMAC_ETH) || defined(CONFIG_STMMAC_ETH_MODULE) #if defined(CONFIG_STMMAC_ETH) || defined(CONFIG_STMMAC_ETH_MODULE)
unsigned short pins[] = P_RMII0;
if (!peripheral_request_list(pins, "emac0")) if (!peripheral_request_list(pins, "emac0"))
printk(KERN_ERR "%s(): request emac pins failed\n", __func__); printk(KERN_ERR "%s(): request emac pins failed\n", __func__);
#endif #endif

7
arch/blackfin/mach-common/cpufreq.c
View file

@ -111,6 +111,7 @@ static unsigned int bfin_getfreq_khz(unsigned int cpu)
return get_cclk() / 1000; return get_cclk() / 1000;
} }
#ifdef CONFIG_BF60x
unsigned long cpu_set_cclk(int cpu, unsigned long new) unsigned long cpu_set_cclk(int cpu, unsigned long new)
{ {
struct clk *clk; struct clk *clk;
@ -124,11 +125,15 @@ unsigned long cpu_set_cclk(int cpu, unsigned long new)
clk_put(clk); clk_put(clk);
return ret; return ret;
} }
#endif
static int bfin_target(struct cpufreq_policy *poli, static int bfin_target(struct cpufreq_policy *poli,
unsigned int target_freq, unsigned int relation) unsigned int target_freq, unsigned int relation)
{ {
unsigned int index, plldiv, cpu; #ifndef CONFIG_BF60x
unsigned int plldiv;
#endif
unsigned int index, cpu;
unsigned long flags, cclk_hz; unsigned long flags, cclk_hz;
struct cpufreq_freqs freqs; struct cpufreq_freqs freqs;
static unsigned long lpj_ref; static unsigned long lpj_ref;