projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ppc/85xx: Simplify the top makefile for 36-bit config for MPC8572DS
[oweals/u-boot.git]
/
cpu
/
mpc8260
/
i2c.c
diff --git
a/cpu/mpc8260/i2c.c
b/cpu/mpc8260/i2c.c
index a96fbf841e0a90c4e4d32dc55941de539c5897c8..d2bdcc2d827f99e1560a334f996a9f1f860c79ba 100644
(file)
--- a/
cpu/mpc8260/i2c.c
+++ b/
cpu/mpc8260/i2c.c
@@
-37,7
+37,7
@@
DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_I2C_MULTI_BUS)
DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_I2C_MULTI_BUS)
-static unsigned int i2c_bus_num __attribute__ ((section ("data"))) = 0;
+static unsigned int i2c_bus_num __attribute__ ((section ("
.
data"))) = 0;
#endif /* CONFIG_I2C_MULTI_BUS */
/* uSec to wait between polls of the i2c */
#endif /* CONFIG_I2C_MULTI_BUS */
/* uSec to wait between polls of the i2c */
@@
-54,13
+54,10
@@
static unsigned int i2c_bus_num __attribute__ ((section ("data"))) = 0;
/*-----------------------------------------------------------------------
* Set default values
*/
/*-----------------------------------------------------------------------
* Set default values
*/
-#ifndef C
FG
_I2C_SPEED
-#define C
FG_I2C_SPEED
50000
+#ifndef C
ONFIG_SYS
_I2C_SPEED
+#define C
ONFIG_SYS_I2C_SPEED
50000
#endif
#endif
-#ifndef CFG_I2C_SLAVE
-#define CFG_I2C_SLAVE 0xFE
-#endif
/*-----------------------------------------------------------------------
*/
/*-----------------------------------------------------------------------
*/
@@
-176,7
+173,7
@@
i2c_roundrate(int hz, int speed, int filter, int modval,
*/
static int i2c_setrate(int hz, int speed)
{
*/
static int i2c_setrate(int hz, int speed)
{
- immap_t *immap = (immap_t *)C
FG
_IMMR ;
+ immap_t *immap = (immap_t *)C
ONFIG_SYS
_IMMR ;
volatile i2c8260_t *i2c = (i2c8260_t *)&immap->im_i2c;
int brgval,
modval, /* 0-3 */
volatile i2c8260_t *i2c = (i2c8260_t *)&immap->im_i2c;
int brgval,
modval, /* 0-3 */
@@
-219,7
+216,7
@@
static int i2c_setrate(int hz, int speed)
void i2c_init(int speed, int slaveadd)
{
void i2c_init(int speed, int slaveadd)
{
- volatile immap_t *immap = (immap_t *)C
FG
_IMMR ;
+ volatile immap_t *immap = (immap_t *)C
ONFIG_SYS
_IMMR ;
volatile cpm8260_t *cp = (cpm8260_t *)&immap->im_cpm;
volatile i2c8260_t *i2c = (i2c8260_t *)&immap->im_i2c;
volatile iic_t *iip;
volatile cpm8260_t *cp = (cpm8260_t *)&immap->im_cpm;
volatile i2c8260_t *i2c = (i2c8260_t *)&immap->im_i2c;
volatile iic_t *iip;
@@
-227,7
+224,7
@@
void i2c_init(int speed, int slaveadd)
volatile I2C_BD *rxbd, *txbd;
uint dpaddr;
volatile I2C_BD *rxbd, *txbd;
uint dpaddr;
-#ifdef C
FG
_I2C_INIT_BOARD
+#ifdef C
ONFIG_SYS
_I2C_INIT_BOARD
/* call board specific i2c bus reset routine before accessing the */
/* environment, which might be in a chip on that bus. For details */
/* about this problem see doc/I2C_Edge_Conditions. */
/* call board specific i2c bus reset routine before accessing the */
/* environment, which might be in a chip on that bus. For details */
/* about this problem see doc/I2C_Edge_Conditions. */
@@
-270,7
+267,7
@@
void i2c_init(int speed, int slaveadd)
* divide BRGCLK by 1)
*/
PRINTD(("[I2C] Setting rate...\n"));
* divide BRGCLK by 1)
*/
PRINTD(("[I2C] Setting rate...\n"));
- i2c_setrate (gd->brg_clk, C
FG
_I2C_SPEED) ;
+ i2c_setrate (gd->brg_clk, C
ONFIG_SYS
_I2C_SPEED) ;
/* Set I2C controller in master mode */
i2c->i2c_i2com = 0x01;
/* Set I2C controller in master mode */
i2c->i2c_i2com = 0x01;
@@
-309,7
+306,7
@@
void i2c_init(int speed, int slaveadd)
static
void i2c_newio(i2c_state_t *state)
{
static
void i2c_newio(i2c_state_t *state)
{
- volatile immap_t *immap = (immap_t *)C
FG
_IMMR ;
+ volatile immap_t *immap = (immap_t *)C
ONFIG_SYS
_IMMR ;
volatile iic_t *iip;
uint dpaddr;
volatile iic_t *iip;
uint dpaddr;
@@
-494,7
+491,7
@@
int i2c_receive(i2c_state_t *state,
static
int i2c_doio(i2c_state_t *state)
{
static
int i2c_doio(i2c_state_t *state)
{
- volatile immap_t *immap = (immap_t *)C
FG
_IMMR ;
+ volatile immap_t *immap = (immap_t *)C
ONFIG_SYS
_IMMR ;
volatile iic_t *iip;
volatile i2c8260_t *i2c = (i2c8260_t *)&immap->im_i2c;
volatile I2C_BD *txbd, *rxbd;
volatile iic_t *iip;
volatile i2c8260_t *i2c = (i2c8260_t *)&immap->im_i2c;
volatile I2C_BD *txbd, *rxbd;
@@
-667,7
+664,7
@@
i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
xaddr[2] = (addr >> 8) & 0xFF;
xaddr[3] = addr & 0xFF;
xaddr[2] = (addr >> 8) & 0xFF;
xaddr[3] = addr & 0xFF;
-#ifdef C
FG
_I2C_EEPROM_ADDR_OVERFLOW
+#ifdef C
ONFIG_SYS
_I2C_EEPROM_ADDR_OVERFLOW
/*
* EEPROM chips that implement "address overflow" are ones
* like Catalyst 24WC04/08/16 which has 9/10/11 bits of address
/*
* EEPROM chips that implement "address overflow" are ones
* like Catalyst 24WC04/08/16 which has 9/10/11 bits of address
@@
-679,7
+676,7
@@
i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
* be one byte because the extra address bits are hidden in the
* chip address.
*/
* be one byte because the extra address bits are hidden in the
* chip address.
*/
- chip |= ((addr >> (alen * 8)) & C
FG
_I2C_EEPROM_ADDR_OVERFLOW);
+ chip |= ((addr >> (alen * 8)) & C
ONFIG_SYS
_I2C_EEPROM_ADDR_OVERFLOW);
#endif
i2c_newio(&state);
#endif
i2c_newio(&state);
@@
-716,7
+713,7
@@
i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
xaddr[2] = (addr >> 8) & 0xFF;
xaddr[3] = addr & 0xFF;
xaddr[2] = (addr >> 8) & 0xFF;
xaddr[3] = addr & 0xFF;
-#ifdef C
FG
_I2C_EEPROM_ADDR_OVERFLOW
+#ifdef C
ONFIG_SYS
_I2C_EEPROM_ADDR_OVERFLOW
/*
* EEPROM chips that implement "address overflow" are ones
* like Catalyst 24WC04/08/16 which has 9/10/11 bits of address
/*
* EEPROM chips that implement "address overflow" are ones
* like Catalyst 24WC04/08/16 which has 9/10/11 bits of address
@@
-728,7
+725,7
@@
i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
* be one byte because the extra address bits are hidden in the
* chip address.
*/
* be one byte because the extra address bits are hidden in the
* chip address.
*/
- chip |= ((addr >> (alen * 8)) & C
FG
_I2C_EEPROM_ADDR_OVERFLOW);
+ chip |= ((addr >> (alen * 8)) & C
ONFIG_SYS
_I2C_EEPROM_ADDR_OVERFLOW);
#endif
i2c_newio(&state);
#endif
i2c_newio(&state);
@@
-753,22
+750,6
@@
i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
return 0;
}
return 0;
}
-uchar
-i2c_reg_read(uchar chip, uchar reg)
-{
- uchar buf;
-
- i2c_read(chip, reg, 1, &buf, 1);
-
- return (buf);
-}
-
-void
-i2c_reg_write(uchar chip, uchar reg, uchar val)
-{
- i2c_write(chip, reg, 1, &val, 1);
-}
-
#if defined(CONFIG_I2C_MULTI_BUS)
/*
* Functions for multiple I2C bus handling
#if defined(CONFIG_I2C_MULTI_BUS)
/*
* Functions for multiple I2C bus handling
@@
-781,7
+762,7
@@
unsigned int i2c_get_bus_num(void)
int i2c_set_bus_num(unsigned int bus)
{
#if defined(CONFIG_I2C_MUX)
int i2c_set_bus_num(unsigned int bus)
{
#if defined(CONFIG_I2C_MUX)
- if (bus < C
FG
_MAX_I2C_BUS) {
+ if (bus < C
ONFIG_SYS
_MAX_I2C_BUS) {
i2c_bus_num = bus;
} else {
int ret;
i2c_bus_num = bus;
} else {
int ret;
@@
-793,25
+774,12
@@
int i2c_set_bus_num(unsigned int bus)
return ret;
}
#else
return ret;
}
#else
- if (bus >= C
FG
_MAX_I2C_BUS)
+ if (bus >= C
ONFIG_SYS
_MAX_I2C_BUS)
return -1;
i2c_bus_num = bus;
#endif
return 0;
}
return -1;
i2c_bus_num = bus;
#endif
return 0;
}
-/* TODO: add 100/400k switching */
-unsigned int i2c_get_bus_speed(void)
-{
- return CFG_I2C_SPEED;
-}
-
-int i2c_set_bus_speed(unsigned int speed)
-{
- if (speed != CFG_I2C_SPEED)
- return -1;
-
- return 0;
-}
#endif /* CONFIG_I2C_MULTI_BUS */
#endif /* CONFIG_HARD_I2C */
#endif /* CONFIG_I2C_MULTI_BUS */
#endif /* CONFIG_HARD_I2C */