brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

trab: rename spi_init()

Browse Source 
The local board-specific spi_init() function conflicts with the common SPI
layer, so rename it to something board-specific.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2009-08-13 00:32:14 -04:00 committed by Wolfgang Denk
parent 253cb831f5
commit f6e3a1fa92
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
board/trab/cmd_trab.c
View File

@ -106,7 +106,7 @@ extern int i2c_write (uchar, uint, int , uchar* , int);
extern int i2c_read (uchar, uint, int , uchar* , int); extern int i2c_read (uchar, uint, int , uchar* , int);
extern void tsc2000_reg_init (void); extern void tsc2000_reg_init (void);
extern s32 tsc2000_contact_temp (void); extern s32 tsc2000_contact_temp (void);
extern void spi_init(void); extern void tsc2000_spi_init(void);
/* function declarations */ /* function declarations */
int do_dip (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); int do_dip (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
@ -175,7 +175,7 @@ int do_burn_in (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
led_init (); led_init ();
global_vars_init (); global_vars_init ();
test_function_table_init (); test_function_table_init ();
spi_init (); tsc2000_spi_init ();
if (global_vars_write_to_eeprom () != 0) { if (global_vars_write_to_eeprom () != 0) {
printf ("%s: error writing global_vars to eeprom\n", printf ("%s: error writing global_vars to eeprom\n",
@ -336,7 +336,7 @@ int do_contact_temp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return 1; return 1;
} }
spi_init (); tsc2000_spi_init ();
contact_temp = tsc2000_contact_temp(); contact_temp = tsc2000_contact_temp();
printf ("%d degree C * 100\n", contact_temp) ; printf ("%d degree C * 100\n", contact_temp) ;
@ -859,7 +859,7 @@ int do_temp_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
delay = simple_strtoul(argv[1], NULL, 10); delay = simple_strtoul(argv[1], NULL, 10);
} }
spi_init (); tsc2000_spi_init ();
while (1) { while (1) {
#if defined(CONFIG_CMD_DATE) #if defined(CONFIG_CMD_DATE)

2
board/trab/trab_fkt.c
View File

@ -729,7 +729,7 @@ int do_dac (char **argv)
int brightness; int brightness;
/* initialize SPI */ /* initialize SPI */
spi_init (); tsc2000_spi_init ();
if (((brightness = simple_strtoul (argv[2], NULL, 10)) < 0) || if (((brightness = simple_strtoul (argv[2], NULL, 10)) < 0) ||
(brightness > 255)) { (brightness > 255)) {

2
board/trab/tsc2000.c
View File

@ -42,7 +42,7 @@
*/ */
#define MAX_DEVIATION 18 /* unit: DIGITs of adc; 18 DIGIT = 0.5 °C */ #define MAX_DEVIATION 18 /* unit: DIGITs of adc; 18 DIGIT = 0.5 °C */
void spi_init(void) void tsc2000_spi_init(void)
{ {
S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO(); S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
S3C24X0_SPI * const spi = S3C24X0_GetBase_SPI(); S3C24X0_SPI * const spi = S3C24X0_GetBase_SPI();

2
board/trab/tsc2000.h
View File

@ -121,7 +121,7 @@ void tsc2000_set_range (unsigned int);
void tsc2000_reg_init (void); void tsc2000_reg_init (void);
s32 tsc2000_contact_temp (void); s32 tsc2000_contact_temp (void);
void spi_wait_transmit_done (void); void spi_wait_transmit_done (void);
void spi_init(void); void tsc2000_spi_init(void);
int tsc2000_interpolate(long value, long data[][2], long *result); int tsc2000_interpolate(long value, long data[][2], long *result);
void adc_wait_conversion_done(void); void adc_wait_conversion_done(void);