diff options
| author | wdenk <wdenk> | 2003-03-14 20:47:52 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-03-14 20:47:52 +0000 |
| commit | 06d01dbe000057e5df4af0f113242f0eba716340 (patch) | |
| tree | 9188617ad1907e44f41910b99af9bde7258338f9 /drivers | |
| parent | 09127c60964c47621937ada7b0ccbf0c26329376 (diff) | |
| download | blackbird-obmc-uboot-06d01dbe000057e5df4af0f113242f0eba716340.tar.gz blackbird-obmc-uboot-06d01dbe000057e5df4af0f113242f0eba716340.zip | |
* Avoid flicker on the TRAB's VFD by synchronizing the enable with
the HSYNC/VSYNC. Requires new CPLD code (Version 101 for Rev. 100
boards, version 153 for Rev. 200 boards).
* Patch by Vladimir Gurevich, 12 Mar 2003:
Fix relocation problem of statically initialized string pointers
in common/cmd_pci.c
* Patch by Kai-Uwe Blöm, 12 Mar 2003:
Cleanup & bug fixes for JFFS2 code:
- the memory mangement was broken. It caused havoc on malloc by
writing beyond the block boundaries.
- the length calculation for files was wrong, sometimes resulting
in short file reads.
- data copying now optionally takes fragment version numbers into
account, to avoid copying from older data.
See doc/README.JFFS2 for details.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cs8900.c | 4 | ||||
| -rw-r--r-- | drivers/cs8900.h | 2 | ||||
| -rw-r--r-- | drivers/s3c24x0_i2c.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/cs8900.c b/drivers/cs8900.c index b9fac8c54b..d35332c830 100644 --- a/drivers/cs8900.c +++ b/drivers/cs8900.c @@ -296,7 +296,7 @@ int cs8900_e2prom_read(unsigned char addr, unsigned short *value) /* write a 16-bit word into the EEPROM */ /***********************************************************/ -void cs8900_e2prom_write(unsigned char addr, unsigned short value) +int cs8900_e2prom_write(unsigned char addr, unsigned short value) { cs8900_e2prom_ready(); put_reg(PP_EECMD, EEPROM_WRITE_EN); @@ -307,7 +307,7 @@ void cs8900_e2prom_write(unsigned char addr, unsigned short value) put_reg(PP_EECMD, EEPROM_WRITE_DIS); cs8900_e2prom_ready(); - return; + return 0; } #endif /* COMMANDS & CFG_NET */ diff --git a/drivers/cs8900.h b/drivers/cs8900.h index dbfda3c15b..d772cad667 100644 --- a/drivers/cs8900.h +++ b/drivers/cs8900.h @@ -253,6 +253,6 @@ #define EEPROM_ERASE_CMD 0x0300 extern int cs8900_e2prom_read(uchar, ushort *); -extern void cs8900_e2prom_write(uchar, ushort); +extern int cs8900_e2prom_write(uchar, ushort); #endif /* CONFIG_DRIVER_CS8900 */ diff --git a/drivers/s3c24x0_i2c.c b/drivers/s3c24x0_i2c.c index bf435c9839..b50176118a 100644 --- a/drivers/s3c24x0_i2c.c +++ b/drivers/s3c24x0_i2c.c @@ -64,10 +64,12 @@ static int GetIICSDA(void) return (rGPEDAT & 0x8000) >> 15; } +#if 0 static void SetIICSDA(int x) { rGPEDAT = (rGPEDAT & ~0x8000) | (x&1) << 15; } +#endif static void SetIICSCL(int x) { |
