Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-25 22:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

i2c: fti2c010: cosmetic: coding style cleanup

Browse source 
Coding style cleanup

Signed-off-by: Kuo-Jung Su <dantesu@faraday-tech.com>
Cc: Heiko Schocher <hs@denx.de>
This commit is contained in:
Kuo-Jung Su 2013-12-02 16:02:56 +08:00 committed by Heiko Schocher
parent a6756bbdac
commit e6d3ab8909
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/i2c/fti2c010.c
View file

@ -18,22 +18,23 @@
#endif #endif
#ifndef CONFIG_SYS_I2C_SPEED #ifndef CONFIG_SYS_I2C_SPEED
#define CONFIG_SYS_I2C_SPEED 50000 #define CONFIG_SYS_I2C_SPEED 5000
#endif #endif
#ifndef CONFIG_FTI2C010_FREQ #ifndef CONFIG_FTI2C010_CLOCK
#define CONFIG_FTI2C010_FREQ clk_get_rate("I2C") #define CONFIG_FTI2C010_CLOCK clk_get_rate("I2C")
#endif #endif
/* command timeout */ #ifndef CONFIG_FTI2C010_TIMEOUT
#define CFG_CMD_TIMEOUT 10 /* ms */ #define CONFIG_FTI2C010_TIMEOUT 10 /* ms */
#endif
/* 7-bit chip address + 1-bit read/write */ /* 7-bit dev address + 1-bit read/write */
#define I2C_RD(chip) ((((chip) << 1) & 0xff) | 1) #define I2C_RD(dev) ((((dev) << 1) & 0xfe) | 1)
#define I2C_WR(chip) (((chip) << 1) & 0xff) #define I2C_WR(dev) (((dev) << 1) & 0xfe)
struct fti2c010_chip { struct fti2c010_chip {
void __iomem *regs; struct fti2c010_regs *regs;
uint bus; uint bus;
uint speed; uint speed;
}; };
@ -41,25 +42,25 @@ struct fti2c010_chip {
static struct fti2c010_chip chip_list[] = { static struct fti2c010_chip chip_list[] = {
{ {
.bus = 0, .bus = 0,
.regs = (void __iomem *)CONFIG_FTI2C010_BASE, .regs = (struct fti2c010_regs *)CONFIG_FTI2C010_BASE,
}, },
#ifdef CONFIG_I2C_MULTI_BUS #ifdef CONFIG_I2C_MULTI_BUS
# ifdef CONFIG_FTI2C010_BASE1 # ifdef CONFIG_FTI2C010_BASE1
{ {
.bus = 1, .bus = 1,
.regs = (void __iomem *)CONFIG_FTI2C010_BASE1, .regs = (struct fti2c010_regs *)CONFIG_FTI2C010_BASE1,
}, },
# endif # endif
# ifdef CONFIG_FTI2C010_BASE2 # ifdef CONFIG_FTI2C010_BASE2
{ {
.bus = 2, .bus = 2,
.regs = (void __iomem *)CONFIG_FTI2C010_BASE2, .regs = (struct fti2c010_regs *)CONFIG_FTI2C010_BASE2,
}, },
# endif # endif
# ifdef CONFIG_FTI2C010_BASE3 # ifdef CONFIG_FTI2C010_BASE3
{ {
.bus = 3, .bus = 3,
.regs = (void __iomem *)CONFIG_FTI2C010_BASE3, .regs = (struct fti2c010_regs *)CONFIG_FTI2C010_BASE3,
}, },
# endif # endif
#endif /* #ifdef CONFIG_I2C_MULTI_BUS */ #endif /* #ifdef CONFIG_I2C_MULTI_BUS */
@ -73,7 +74,7 @@ static int fti2c010_wait(uint32_t mask)
uint32_t stat, ts; uint32_t stat, ts;
struct fti2c010_regs *regs = curr->regs; struct fti2c010_regs *regs = curr->regs;
for (ts = get_timer(0); get_timer(ts) < CFG_CMD_TIMEOUT; ) { for (ts = get_timer(0); get_timer(ts) < CONFIG_FTI2C010_TIMEOUT; ) {
stat = readl(&regs->sr); stat = readl(&regs->sr);
if ((stat & mask) == mask) { if ((stat & mask) == mask) {
ret = 0; ret = 0;
@ -324,7 +325,7 @@ uint i2c_get_bus_num(void)
int i2c_set_bus_speed(uint speed) int i2c_set_bus_speed(uint speed)
{ {
struct fti2c010_regs *regs = curr->regs; struct fti2c010_regs *regs = curr->regs;
uint clk = CONFIG_FTI2C010_FREQ; uint clk = CONFIG_FTI2C010_CLOCK;
uint gsr = 0, tsr = 32; uint gsr = 0, tsr = 32;
uint spd, div; uint spd, div;