diff options
| author | Paul Brook <paul@codesourcery.com> | 2009-05-23 00:05:19 +0100 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2009-05-23 00:13:41 +0100 |
| commit | 02e2da45c4601909d5105838323d5c529ec7010b (patch) | |
| tree | e9b1099baa55c3f8084110feb28f57ede8d2de3a /hw/omap_i2c.c | |
| parent | 4856fcff8af1ba349baaf063af00f5e5d87a99f4 (diff) | |
Add common BusState
Implement and use a common device bus state. The main side-effect is
that creating a bus and attaching it to a parent device are no longer
separate operations. For legacy code we allow a NULL parent, but that
should go away eventually.
Also tweak creation code to veriry theat a device in on the right bus.
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/omap_i2c.c')
| -rw-r--r-- | hw/omap_i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/omap_i2c.c b/hw/omap_i2c.c index f98ac8d75b..c0dd3a5499 100644 --- a/hw/omap_i2c.c +++ b/hw/omap_i2c.c @@ -433,7 +433,7 @@ struct omap_i2c_s *omap_i2c_init(target_phys_addr_t base, s->irq = irq; s->drq[0] = dma[0]; s->drq[1] = dma[1]; - s->bus = i2c_init_bus(); + s->bus = i2c_init_bus(NULL, "i2c"); omap_i2c_reset(s); iomemtype = cpu_register_io_memory(0, omap_i2c_readfn, @@ -454,7 +454,7 @@ struct omap_i2c_s *omap2_i2c_init(struct omap_target_agent_s *ta, s->irq = irq; s->drq[0] = dma[0]; s->drq[1] = dma[1]; - s->bus = i2c_init_bus(); + s->bus = i2c_init_bus(NULL, "i2c"); omap_i2c_reset(s); iomemtype = l4_register_io_memory(0, omap_i2c_readfn, |