V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

mmc: omap3: make local symbols static 

Make driver local variables and functions static and
remove them from the arch header.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Tested-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
This commit is contained in:
Grazvydas Ignotas 2010-08-11 15:51:12 -07:00 committed by Sandeep Paulraj
parent 69a2a4d9a5
commit 8bbf4307c7
2 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/mmc/omap3_mmc.c
View File

@ -33,7 +33,7 @@
#include "omap3_mmc.h" #include "omap3_mmc.h"
const unsigned short mmc_transspeed_val[15][4] = { static const unsigned short mmc_transspeed_val[15][4] = {
{CLKD(10, 1), CLKD(10, 10), CLKD(10, 100), CLKD(10, 1000)}, {CLKD(10, 1), CLKD(10, 10), CLKD(10, 100), CLKD(10, 1000)},
{CLKD(12, 1), CLKD(12, 10), CLKD(12, 100), CLKD(12, 1000)}, {CLKD(12, 1), CLKD(12, 10), CLKD(12, 100), CLKD(12, 1000)},
{CLKD(13, 1), CLKD(13, 10), CLKD(13, 100), CLKD(13, 1000)}, {CLKD(13, 1), CLKD(13, 10), CLKD(13, 100), CLKD(13, 1000)},
@ -51,7 +51,7 @@ const unsigned short mmc_transspeed_val[15][4] = {
{CLKD(80, 1), CLKD(80, 10), CLKD(80, 100), CLKD(80, 1000)} {CLKD(80, 1), CLKD(80, 10), CLKD(80, 100), CLKD(80, 1000)}
}; };
mmc_card_data cur_card_data; static mmc_card_data cur_card_data;
static block_dev_desc_t mmc_blk_dev; static block_dev_desc_t mmc_blk_dev;
static hsmmc_t *mmc_base = (hsmmc_t *)OMAP_HSMMC1_BASE; static hsmmc_t *mmc_base = (hsmmc_t *)OMAP_HSMMC1_BASE;
@ -80,7 +80,7 @@ block_dev_desc_t *mmc_get_dev(int dev)
return (block_dev_desc_t *) &mmc_blk_dev; return (block_dev_desc_t *) &mmc_blk_dev;
} }
unsigned char mmc_board_init(void) static unsigned char mmc_board_init(void)
{ {
#if defined(CONFIG_TWL4030_POWER) #if defined(CONFIG_TWL4030_POWER)
twl4030_power_mmc_init(); twl4030_power_mmc_init();
@ -114,7 +114,7 @@ unsigned char mmc_board_init(void)
return 1; return 1;
} }
void mmc_init_stream(void) static void mmc_init_stream(void)
{ {
writel(readl(&mmc_base->con) | INIT_INITSTREAM, &mmc_base->con); writel(readl(&mmc_base->con) | INIT_INITSTREAM, &mmc_base->con);
@ -129,7 +129,7 @@ void mmc_init_stream(void)
writel(readl(&mmc_base->con) & ~INIT_INITSTREAM, &mmc_base->con); writel(readl(&mmc_base->con) & ~INIT_INITSTREAM, &mmc_base->con);
} }
unsigned char mmc_clock_config(unsigned int iclk, unsigned short clk_div) static unsigned char mmc_clock_config(unsigned int iclk, unsigned short clk_div)
{ {
unsigned int val; unsigned int val;
@ -158,7 +158,7 @@ unsigned char mmc_clock_config(unsigned int iclk, unsigned short clk_div)
return 1; return 1;
} }
unsigned char mmc_init_setup(void) static unsigned char mmc_init_setup(void)
{ {
unsigned int reg_val; unsigned int reg_val;
@ -192,7 +192,7 @@ unsigned char mmc_init_setup(void)
return 1; return 1;
} }
unsigned char mmc_send_cmd(unsigned int cmd, unsigned int arg, static unsigned char mmc_send_cmd(unsigned int cmd, unsigned int arg,
unsigned int *response) unsigned int *response)
{ {
unsigned int mmc_stat; unsigned int mmc_stat;
@ -228,7 +228,7 @@ unsigned char mmc_send_cmd(unsigned int cmd, unsigned int arg,
return 1; return 1;
} }
unsigned char mmc_read_data(unsigned int *output_buf) static unsigned char mmc_read_data(unsigned int *output_buf)
{ {
unsigned int mmc_stat; unsigned int mmc_stat;
unsigned int read_count = 0; unsigned int read_count = 0;
@ -269,7 +269,7 @@ unsigned char mmc_read_data(unsigned int *output_buf)
return 1; return 1;
} }
unsigned char mmc_detect_card(mmc_card_data *mmc_card_cur) static unsigned char mmc_detect_card(mmc_card_data *mmc_card_cur)
{ {
unsigned char err; unsigned char err;
unsigned int argument = 0; unsigned int argument = 0;
@ -380,7 +380,7 @@ unsigned char mmc_detect_card(mmc_card_data *mmc_card_cur)
return 1; return 1;
} }
unsigned char mmc_read_cardsize(mmc_card_data *mmc_dev_data, static unsigned char mmc_read_cardsize(mmc_card_data *mmc_dev_data,
mmc_csd_reg_t *cur_csd) mmc_csd_reg_t *cur_csd)
{ {
mmc_extended_csd_reg_t ext_csd; mmc_extended_csd_reg_t ext_csd;
@ -434,8 +434,8 @@ unsigned char mmc_read_cardsize(mmc_card_data *mmc_dev_data,
return 1; return 1;
} }
unsigned char omap_mmc_read_sect(unsigned int start_sec, unsigned int num_bytes, static unsigned char omap_mmc_read_sect(unsigned int start_sec,
mmc_card_data *mmc_c, unsigned int num_bytes, mmc_card_data *mmc_c,
unsigned long *output_buf) unsigned long *output_buf)
{ {
unsigned char err; unsigned char err;
@ -472,7 +472,7 @@ unsigned char omap_mmc_read_sect(unsigned int start_sec, unsigned int num_bytes,
return 1; return 1;
} }
unsigned char configure_mmc(mmc_card_data *mmc_card_cur) static unsigned char configure_mmc(mmc_card_data *mmc_card_cur)
{ {
unsigned char ret_val; unsigned char ret_val;
unsigned int argument; unsigned int argument;
@ -541,8 +541,9 @@ unsigned char configure_mmc(mmc_card_data *mmc_card_cur)
return 1; return 1;
} }
unsigned long mmc_bread(int dev_num, unsigned long blknr, lbaint_t blkcnt,
void *dst) static unsigned long mmc_bread(int dev_num, unsigned long blknr,
lbaint_t blkcnt, void *dst)
{ {
omap_mmc_read_sect(blknr, (blkcnt * MMCSD_SECTOR_SIZE), &cur_card_data, omap_mmc_read_sect(blknr, (blkcnt * MMCSD_SECTOR_SIZE), &cur_card_data,
(unsigned long *) dst); (unsigned long *) dst);

9
drivers/mmc/omap3_mmc.h
View File

@ -230,13 +230,4 @@ typedef union {
mmc_csd_reg_t Card_CSD; mmc_csd_reg_t Card_CSD;
} mmc_resp_t; } mmc_resp_t;
extern mmc_card_data mmc_dev;
unsigned char mmc_lowlevel_init(void);
unsigned char mmc_send_command(unsigned int cmd, unsigned int arg,
unsigned int *response);
unsigned char mmc_setup_clock(unsigned int iclk, unsigned short clkd);
unsigned char mmc_set_opendrain(unsigned char state);
unsigned char mmc_read_data(unsigned int *output_buf);
#endif /* MMC_H */ #endif /* MMC_H */