scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-27 10:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: rename I2C_PORT_HOST to I2C_PORT_MASTER

Browse Source 
Previously, it was really confusing whether I2C_PORT_HOST meant the
port where the EC was the master, or the port used to talk to the AP.

No functional changes, just a global find/replace and some tidying of
unused comments.

BUG=chrome-os-partner:18343
BRANCH=none
TEST=build all platforms; pass unit tests

Change-Id: Ia591ba4577d3399729556e0234ba0db3a0e3c5ea
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/174546
Reviewed-by: Alec Berg <alecaberg@chromium.org>
This commit is contained in:
Randall Spangler
2013-10-24 11:18:47 -07:00
committed by chrome-internal-fetch
parent 4a1ecb67f9
commit df541c6ffd
24 changed files with 60 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
board/daisy/board.h
View File

@@ -47,9 +47,9 @@ enum module_id {
#define KB_OUT_PORT_LIST GPIO_B, GPIO_C
/* Charging */
#define I2C_PORT_HOST 0 /* Note: some Daisy systems used port 1 */
#define I2C_PORT_BATTERY I2C_PORT_HOST
#define I2C_PORT_CHARGER I2C_PORT_HOST
#define I2C_PORT_MASTER 0 /* Note: some Daisy systems used port 1 */
#define I2C_PORT_BATTERY I2C_PORT_MASTER
#define I2C_PORT_CHARGER I2C_PORT_MASTER
#define I2C_PORT_SLAVE 1
/* Timer selection */

2
board/kirby/board.c
View File

@@ -136,7 +136,7 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
/* I2C ports */
const struct i2c_port_t i2c_ports[] = {
{"host", I2C_PORT_HOST, 100},
{"master", I2C_PORT_MASTER, 100},
};
const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);

18
board/kirby/board.h
View File

@@ -46,20 +46,10 @@ enum module_id {
/* Keyboard output port list */
#define KB_OUT_PORT_LIST GPIO_D
/*
* Charging.
*
* "HOST" means the port where the EC is the master, which has the battery,
* charger and PMU.
*
* "SLAVE" means the port where the EC is the slave, which has the AP (host
* processor).
*
* TODO: In this context, "host" is badly overloaded and confusing.
*/
#define I2C_PORT_HOST 0
#define I2C_PORT_BATTERY I2C_PORT_HOST
#define I2C_PORT_CHARGER I2C_PORT_HOST
/* Single I2C port, where the EC is the master. */
#define I2C_PORT_MASTER 0
#define I2C_PORT_BATTERY I2C_PORT_MASTER
#define I2C_PORT_CHARGER I2C_PORT_MASTER
/* Timer selection */
#define TIM_CLOCK_MSB 2

2
board/mccroskey/board.h
View File

@@ -45,7 +45,7 @@ enum module_id {
#define KB_OUT_PORT_LIST GPIO_C
/* EC is I2C master */
#define I2C_PORT_HOST 0
#define I2C_PORT_MASTER 0
#define I2C_PORT_SLAVE 0 /* needed for DMAC macros (ugh) */
#define GPIO_I2C2_SCL 0 /* unused, but must be defined anyway */
#define GPIO_I2C2_SDA 0 /* unused, but must be defined anyway */

2
board/nyan/board.c
View File

@@ -92,7 +92,7 @@ const int gpio_alt_funcs_count = ARRAY_SIZE(gpio_alt_funcs);
/* I2C ports */
const struct i2c_port_t i2c_ports[] = {
{"host", I2C_PORT_HOST, 100},
{"master", I2C_PORT_MASTER, 100},
};
const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);

20
board/nyan/board.h
View File

@@ -38,22 +38,10 @@ enum module_id {
/* Keyboard output port list */
#define KB_OUT_PORT_LIST GPIO_A, GPIO_B, GPIO_C
/*
* Charging.
*
* "HOST" means the port where the EC is the master, which has the battery,
* charger and PMU.
*
* "SLAVE" means the port where the EC is the slave, which has the AP (host
* processor).
*
* TODO: In this context, "host" is badly overloaded and confusing.
*/
#define I2C_PORT_HOST 0
#define I2C_PORT_BATTERY I2C_PORT_HOST
#define I2C_PORT_CHARGER I2C_PORT_HOST
#define I2C_PORT_SLAVE 1
#define I2C_PORTS_USED 1
/* Single I2C port, where the EC is the master. */
#define I2C_PORT_MASTER 0
#define I2C_PORT_BATTERY I2C_PORT_MASTER
#define I2C_PORT_CHARGER I2C_PORT_MASTER
/* Timer selection */
#define TIM_CLOCK_MSB 3

2
board/pit/board.c
View File

@@ -107,7 +107,7 @@ const struct battery_temperature_ranges bat_temp_ranges = {
/* I2C ports */
const struct i2c_port_t i2c_ports[] = {
{"host", I2C_PORT_HOST, 100},
{"master", I2C_PORT_MASTER, 100},
};
const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);

19
board/pit/board.h
View File

@@ -43,21 +43,10 @@ enum module_id {
/* Keyboard output port list */
#define KB_OUT_PORT_LIST GPIO_A, GPIO_B, GPIO_C
/*
* Charging.
*
* "HOST" means the port where the EC is the master, which has the battery,
* charger and PMU.
*
* "SLAVE" means the port where the EC is the slave, which has the AP (host
* processor).
*
* TODO: In this context, "host" is badly overloaded and confusing.
*/
#define I2C_PORT_HOST 0
#define I2C_PORT_BATTERY I2C_PORT_HOST
#define I2C_PORT_CHARGER I2C_PORT_HOST
#define I2C_PORT_SLAVE 1
/* Single I2C port, where the EC is the master. */
#define I2C_PORT_MASTER 0
#define I2C_PORT_BATTERY I2C_PORT_MASTER
#define I2C_PORT_CHARGER I2C_PORT_MASTER
/* Charger sense resistors */
#define CONFIG_CHARGER_SENSE_RESISTOR_AC 12

2
board/puppy/board.c
View File

@@ -105,7 +105,7 @@ const struct battery_temperature_ranges bat_temp_ranges = {
/* I2C ports */
const struct i2c_port_t i2c_ports[] = {
{"host", I2C_PORT_HOST, 100},
{"master", I2C_PORT_MASTER, 100},
};
const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);

19
board/puppy/board.h
View File

@@ -41,21 +41,10 @@ enum module_id {
/* Keyboard output port list */
#define KB_OUT_PORT_LIST GPIO_A, GPIO_B, GPIO_C
/*
* Charging.
*
* "HOST" means the port where the EC is the master, which has the battery,
* charger and PMU.
*
* "SLAVE" means the port where the EC is the slave, which has the AP (host
* processor).
*
* TODO: In this context, "host" is badly overloaded and confusing.
*/
#define I2C_PORT_HOST 0
#define I2C_PORT_BATTERY I2C_PORT_HOST
#define I2C_PORT_CHARGER I2C_PORT_HOST
#define I2C_PORT_SLAVE 1
/* Single I2C port, where the EC is the master. */
#define I2C_PORT_MASTER 0
#define I2C_PORT_BATTERY I2C_PORT_MASTER
#define I2C_PORT_CHARGER I2C_PORT_MASTER
/* Timer selection */
#define TIM_CLOCK_MSB 3

2
board/snow/board.c
View File

@@ -117,7 +117,7 @@ const struct battery_temperature_ranges bat_temp_ranges = {
/* I2C ports */
const struct i2c_port_t i2c_ports[] = {
{"host", I2C_PORT_HOST, 100},
{"master", I2C_PORT_MASTER, 100},
};
const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);

6
board/snow/board.h
View File

@@ -51,9 +51,9 @@ enum module_id {
#define KB_OUT_PORT_LIST GPIO_B, GPIO_C
/* Charging */
#define I2C_PORT_HOST 1
#define I2C_PORT_BATTERY I2C_PORT_HOST
#define I2C_PORT_CHARGER I2C_PORT_HOST
#define I2C_PORT_MASTER 1
#define I2C_PORT_BATTERY I2C_PORT_MASTER
#define I2C_PORT_CHARGER I2C_PORT_MASTER
#define I2C_PORT_SLAVE 1
#define GPIO_AP_CLAIM GPIO_SPI1_NSS /* AP claims bus */

2
board/spring/board.c
View File

@@ -127,7 +127,7 @@ BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);
/* I2C ports */
const struct i2c_port_t i2c_ports[] = {
{"host", I2C_PORT_HOST, 100},
{"master", I2C_PORT_MASTER, 100},
};
const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);

6
board/spring/board.h
View File

@@ -52,9 +52,9 @@ enum module_id {
#define KB_OUT_PORT_LIST GPIO_B, GPIO_C
/* Charging */
#define I2C_PORT_HOST 0
#define I2C_PORT_BATTERY I2C_PORT_HOST
#define I2C_PORT_CHARGER I2C_PORT_HOST
#define I2C_PORT_MASTER 0
#define I2C_PORT_BATTERY I2C_PORT_MASTER
#define I2C_PORT_CHARGER I2C_PORT_MASTER
#define I2C_PORT_SLAVE 1
/* Low battery threshold. In mAh. */

22
chip/stm32/i2c-stm32f.c
View File

@@ -65,10 +65,10 @@
((I2C_PORT_SLAVE) ? STM32_DMAC_I2C2_TX : STM32_DMAC_I2C1_TX)
#define DMAC_SLAVE_RX \
((I2C_PORT_SLAVE) ? STM32_DMAC_I2C2_RX : STM32_DMAC_I2C1_RX)
#define DMAC_HOST_TX \
((I2C_PORT_HOST) ? STM32_DMAC_I2C2_TX : STM32_DMAC_I2C1_TX)
#define DMAC_HOST_RX \
((I2C_PORT_HOST) ? STM32_DMAC_I2C2_RX : STM32_DMAC_I2C1_RX)
#define DMAC_MASTER_TX \
((I2C_PORT_MASTER) ? STM32_DMAC_I2C2_TX : STM32_DMAC_I2C1_TX)
#define DMAC_MASTER_RX \
((I2C_PORT_MASTER) ? STM32_DMAC_I2C2_RX : STM32_DMAC_I2C1_RX)
enum {
/*
@@ -728,10 +728,10 @@ static int i2c_master_transmit(int port, int slave_addr, const uint8_t *data,
/* Configure DMA channel for TX to host */
dma_prepare_tx(dma_tx_option + port, size, data);
dma_enable_tc_interrupt(DMAC_HOST_TX);
dma_enable_tc_interrupt(DMAC_MASTER_TX);
/* Start the DMA */
dma_go(dma_get_channel(DMAC_HOST_TX));
dma_go(dma_get_channel(DMAC_MASTER_TX));
/* Configuring i2c2 to use DMA */
STM32_I2C_CR2(port) |= CR2_DMAEN;
@@ -743,8 +743,8 @@ static int i2c_master_transmit(int port, int slave_addr, const uint8_t *data,
if (!rv_start)
rv = task_wait_event(DMA_TRANSFER_TIMEOUT_US);
dma_disable(DMAC_HOST_TX);
dma_disable_tc_interrupt(DMAC_HOST_TX);
dma_disable(DMAC_MASTER_TX);
dma_disable_tc_interrupt(DMAC_MASTER_TX);
STM32_I2C_CR2(port) &= ~CR2_DMAEN;
if (rv_start)
@@ -777,7 +777,7 @@ static int i2c_master_receive(int port, int slave_addr, uint8_t *data,
enable_ack(port);
dma_start_rx(dma_rx_option + port, size, data);
dma_enable_tc_interrupt(DMAC_HOST_RX);
dma_enable_tc_interrupt(DMAC_MASTER_RX);
STM32_I2C_CR2(port) |= CR2_DMAEN;
STM32_I2C_CR2(port) |= CR2_LAST;
@@ -786,8 +786,8 @@ static int i2c_master_receive(int port, int slave_addr, uint8_t *data,
if (!rv_start)
rv = task_wait_event(DMA_TRANSFER_TIMEOUT_US);
dma_disable(DMAC_HOST_RX);
dma_disable_tc_interrupt(DMAC_HOST_RX);
dma_disable(DMAC_MASTER_RX);
dma_disable_tc_interrupt(DMAC_MASTER_RX);
STM32_I2C_CR2(port) &= ~CR2_DMAEN;
disable_ack(port);

2
chip/stm32/i2c-stm32l.c
View File

@@ -534,7 +534,7 @@ DECLARE_HOOK(HOOK_INIT, i2c_init, HOOK_PRIO_DEFAULT);
static int command_i2cdump(int argc, char **argv)
{
dump_i2c_reg(I2C_PORT_HOST, "dump");
dump_i2c_reg(I2C_PORT_MASTER, "dump");
return EC_SUCCESS;
}
DECLARE_CONSOLE_COMMAND(i2cdump, command_i2cdump,

4
common/i2c_arbitration.c
View File

@@ -31,7 +31,7 @@ int i2c_claim(int port)
{
timestamp_t start;
if (port != I2C_PORT_HOST)
if (port != I2C_PORT_MASTER)
return EC_SUCCESS;
/* If AP is off, we have the bus */
@@ -79,7 +79,7 @@ int i2c_claim(int port)
void i2c_release(int port)
{
if (port == I2C_PORT_HOST) {
if (port == I2C_PORT_MASTER) {
/* Release our claim */
gpio_set_level(GPIO_EC_CLAIM, 1);
usleep(BUS_SLEW_DELAY_US);

6
driver/battery/bq27541.c
View File

@@ -42,17 +42,17 @@
static int bq27541_read(int offset, int *data)
{
return i2c_read16(I2C_PORT_HOST, BQ27541_ADDR, offset, data);
return i2c_read16(I2C_PORT_BATTERY, BQ27541_ADDR, offset, data);
}
static int bq27541_read8(int offset, int *data)
{
return i2c_read8(I2C_PORT_HOST, BQ27541_ADDR, offset, data);
return i2c_read8(I2C_PORT_BATTERY, BQ27541_ADDR, offset, data);
}
static int bq27541_write(int offset, int data)
{
return i2c_write16(I2C_PORT_HOST, BQ27541_ADDR, offset, data);
return i2c_write16(I2C_PORT_BATTERY, BQ27541_ADDR, offset, data);
}
int bq27541_probe(void)

4
driver/charger/bq24192.c
View File

@@ -38,12 +38,12 @@ static const int input_current_steps[] = {
int bq24192_read(int reg, int *value)
{
return i2c_read8(I2C_PORT_HOST, BQ24192_ADDR, reg, value);
return i2c_read8(I2C_PORT_CHARGER, BQ24192_ADDR, reg, value);
}
int bq24192_write(int reg, int value)
{
return i2c_write8(I2C_PORT_HOST, BQ24192_ADDR, reg, value);
return i2c_write8(I2C_PORT_CHARGER, BQ24192_ADDR, reg, value);
}
static int bq24192_watchdog_reset(void)

4
driver/led/lp5562.c
View File

@@ -17,12 +17,12 @@
inline int lp5562_write(uint8_t reg, uint8_t val)
{
return i2c_write8(I2C_PORT_HOST, LP5562_I2C_ADDR, reg, val);
return i2c_write8(I2C_PORT_MASTER, LP5562_I2C_ADDR, reg, val);
}
inline int lp5562_read(uint8_t reg, int *val)
{
return i2c_read8(I2C_PORT_HOST, LP5562_I2C_ADDR, reg, val);
return i2c_read8(I2C_PORT_MASTER, LP5562_I2C_ADDR, reg, val);
}
int lp5562_set_color(uint32_t rgb)

4
driver/usb_switch_tsu6721.c
View File

@@ -36,7 +36,7 @@ uint8_t tsu6721_read(uint8_t reg)
int res;
int val;
res = i2c_read8(I2C_PORT_HOST, TSU6721_I2C_ADDR, reg, &val);
res = i2c_read8(I2C_PORT_MASTER, TSU6721_I2C_ADDR, reg, &val);
if (res)
return 0xee;
@@ -47,7 +47,7 @@ int tsu6721_write(uint8_t reg, uint8_t val)
{
int res;
res = i2c_write8(I2C_PORT_HOST, TSU6721_I2C_ADDR, reg, val);
res = i2c_write8(I2C_PORT_MASTER, TSU6721_I2C_ADDR, reg, val);
if (res)
CPRINTF("[%T TSU6721 I2C write failed]\n");
return res;

2
test/led_spring.c
View File

@@ -59,7 +59,7 @@ static void set_battery_soc(int soc)
static int lp5562_i2c_write8(int port, int slave_addr, int offset, int data)
{
if (port != I2C_PORT_HOST || slave_addr != LP5562_I2C_ADDR)
if (port != I2C_PORT_MASTER || slave_addr != LP5562_I2C_ADDR)
return EC_ERROR_INVAL;
if (offset == lp5562_failed_i2c_reg)
return EC_ERROR_UNKNOWN;

2
test/sbs_charging.c
View File

@@ -105,7 +105,7 @@ static int test_charge_state(void)
/* Attach battery again, charging */
ccprintf("[CHARGING TEST] Attach battery\n");
test_attach_i2c(I2C_PORT_HOST, BATTERY_ADDR);
test_attach_i2c(I2C_PORT_BATTERY, BATTERY_ADDR);
state = wait_charging_state();
TEST_ASSERT(state == PWR_STATE_CHARGE);

6
test/test_config.h
View File

@@ -32,7 +32,7 @@
#define CONFIG_BATTERY_SMART
#define CONFIG_CHARGER_INPUT_CURRENT 4032
#define CONFIG_LED_DRIVER_LP5562
#define I2C_PORT_HOST 1
#define I2C_PORT_MASTER 1
#define I2C_PORT_BATTERY 1
#define I2C_PORT_CHARGER 1
#endif
@@ -44,7 +44,7 @@
#define CONFIG_CHARGER_INPUT_CURRENT 4032
#define CONFIG_CHARGER_DISCHARGE_ON_AC
int board_discharge_on_ac(int enabled);
#define I2C_PORT_HOST 1
#define I2C_PORT_MASTER 1
#define I2C_PORT_BATTERY 1
#define I2C_PORT_CHARGER 1
#endif
@@ -70,7 +70,7 @@ int board_discharge_on_ac(int enabled);
#define CONFIG_TEMP_SENSOR
#define I2C_PORT_BATTERY 1
#define I2C_PORT_CHARGER 1
#define I2C_PORT_HOST 1
#define I2C_PORT_MASTER 1
#endif
#endif /* __CROS_EC_TEST_CONFIG_H */