GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sconfig: Add 10bit addressing mode to i2c device type 

Use the second token for an i2c device entry in devicetree.cb to
indicate if it should use 10-bit addressing or 7-bit.  The default if
not provided is to use 7-bit addressing, but it can be changed to
10-bit addressing with the ".1" suffix.  For example:

chip drivers/i2c/generic
  device i2c 3a.1 on end
end

Change-Id: I1d81a7e154fbc040def4d99ad07966fac242a472
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://review.coreboot.org/14788
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Duncan Laurie 2016-05-07 19:49:37 -07:00 committed by Duncan Laurie
parent b1fb0152bf
commit b7ce5fe311
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/device/device_util.c
View File

@ -202,7 +202,7 @@ u32 dev_path_encode(device_t dev)
ret |= dev->path.pnp.port << 8 | dev->path.pnp.device; ret |= dev->path.pnp.port << 8 | dev->path.pnp.device;
break; break;
case DEVICE_PATH_I2C: case DEVICE_PATH_I2C:
ret |= dev->bus->secondary << 8 | dev->path.pnp.device; ret |= dev->path.i2c.mode_10bit << 8 | dev->path.i2c.device;
break; break;
case DEVICE_PATH_APIC: case DEVICE_PATH_APIC:
ret |= dev->path.apic.apic_id; ret |= dev->path.apic.apic_id;
@ -334,7 +334,8 @@ int path_eq(struct device_path *path1, struct device_path *path2)
(path1->pnp.device == path2->pnp.device); (path1->pnp.device == path2->pnp.device);
break; break;
case DEVICE_PATH_I2C: case DEVICE_PATH_I2C:
equal = (path1->i2c.device == path2->i2c.device); equal = (path1->i2c.device == path2->i2c.device) &&
(path1->i2c.mode_10bit == path2->i2c.mode_10bit);
break; break;
case DEVICE_PATH_APIC: case DEVICE_PATH_APIC:
equal = (path1->apic.apic_id == path2->apic.apic_id); equal = (path1->apic.apic_id == path2->apic.apic_id);

1
src/include/device/path.h
View File

@ -53,6 +53,7 @@ struct pnp_path
struct i2c_path struct i2c_path
{ {
unsigned device; unsigned device;
unsigned mode_10bit;
}; };
struct apic_path struct apic_path

2
util/sconfig/main.c
View File

@ -257,7 +257,7 @@ struct device *new_device(struct device *parent, struct device *busdev, const in
break; break;
case I2C: case I2C:
new_d->path = ".type=DEVICE_PATH_I2C,{.i2c={ .device = 0x%x }}"; new_d->path = ".type=DEVICE_PATH_I2C,{.i2c={ .device = 0x%x, .mode_10bit = %d }}";
break; break;
case APIC: case APIC: