diff options
| author | Gwendal Grignou <gwendal@chromium.org> | 2015-07-25 02:26:03 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-07-30 19:58:01 +0000 |
| commit | a3a5c90b54670ddc865defc16757f1fef78ca322 (patch) | |
| tree | e3723836636aa3635cbd0eacb1e0895806dc49ff /driver/mag_bmm150.c | |
| parent | 5b71b33aba6cb0108a864cc7000918b8f06b139a (diff) | |
| download | chrome-ec-a3a5c90b54670ddc865defc16757f1fef78ca322.tar.gz | |
accel: mechanical changes from i2c_addr to addr
Encode both the I2C address and SPI GPIO CS in addr field.
Mechanical change to rename i2c_addr into addr.
BRANCH=smaug
TEST=compile
BUG=chrome-os-partner:42304
Change-Id: I1c7435398deacb27211445afa27a08716d224c06
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/288513
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Commit-Queue: David James <davidjames@chromium.org>
Diffstat (limited to 'driver/mag_bmm150.c')
| -rw-r--r-- | driver/mag_bmm150.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/driver/mag_bmm150.c b/driver/mag_bmm150.c index 54a4598e77..772b147d70 100644 --- a/driver/mag_bmm150.c +++ b/driver/mag_bmm150.c @@ -67,9 +67,9 @@ #define BMI150_READ_16BIT_COM_REG(store_, addr_) do { \ int val; \ - raw_mag_read8(s->i2c_addr, (addr_), &val); \ + raw_mag_read8(s->addr, (addr_), &val); \ store_ = val; \ - raw_mag_read8(s->i2c_addr, (addr_) + 1, &val); \ + raw_mag_read8(s->addr, (addr_) + 1, &val); \ store_ |= (val << 8); \ } while (0) @@ -81,9 +81,9 @@ int bmm150_init(const struct motion_sensor_t *s) struct bmm150_comp_registers *regs = BMM150_COMP_REG(s); /* Set the compass from Suspend to Sleep */ - ret = raw_mag_write8(s->i2c_addr, BMM150_PWR_CTRL, BMM150_PWR_ON); + ret = raw_mag_write8(s->addr, BMM150_PWR_CTRL, BMM150_PWR_ON); /* Now we can read the device id */ - ret = raw_mag_read8(s->i2c_addr, BMM150_CHIP_ID, &val); + ret = raw_mag_read8(s->addr, BMM150_CHIP_ID, &val); if (ret) return EC_ERROR_UNKNOWN; @@ -91,21 +91,21 @@ int bmm150_init(const struct motion_sensor_t *s) return EC_ERROR_ACCESS_DENIED; /* Read the private registers for compensation */ - ret = raw_mag_read8(s->i2c_addr, BMM150_REGA_DIG_X1, &val); + ret = raw_mag_read8(s->addr, BMM150_REGA_DIG_X1, &val); if (ret) return EC_ERROR_UNKNOWN; regs->dig1[X] = val; - raw_mag_read8(s->i2c_addr, BMM150_REGA_DIG_Y1, &val); + raw_mag_read8(s->addr, BMM150_REGA_DIG_Y1, &val); regs->dig1[Y] = val; - raw_mag_read8(s->i2c_addr, BMM150_REGA_DIG_X2, &val); + raw_mag_read8(s->addr, BMM150_REGA_DIG_X2, &val); regs->dig2[X] = val; - raw_mag_read8(s->i2c_addr, BMM150_REGA_DIG_Y2, &val); + raw_mag_read8(s->addr, BMM150_REGA_DIG_Y2, &val); regs->dig2[Y] = val; - raw_mag_read8(s->i2c_addr, BMM150_REGA_DIG_XY1, &val); + raw_mag_read8(s->addr, BMM150_REGA_DIG_XY1, &val); regs->dig_xy1 = val; - raw_mag_read8(s->i2c_addr, BMM150_REGA_DIG_XY2, &val); + raw_mag_read8(s->addr, BMM150_REGA_DIG_XY2, &val); regs->dig_xy2 = val; BMI150_READ_16BIT_COM_REG(regs->dig_z1, BMM150_REGA_DIG_Z1_LSB); @@ -117,7 +117,7 @@ int bmm150_init(const struct motion_sensor_t *s) /* * Set the compass forced mode, to sleep after each measure. */ - ret = raw_mag_write8(s->i2c_addr, BMM150_OP_CTRL, + ret = raw_mag_write8(s->addr, BMM150_OP_CTRL, BMM150_OP_MODE_FORCED << BMM150_OP_MODE_OFFSET); return ret; |