Revision 54e17933 hw/nseries.c
| b/hw/nseries.c | ||
|---|---|---|
| 45 | 45 |
uint32_t (*txrx)(void *opaque, uint32_t value, int len); |
| 46 | 46 |
uWireSlave *chip; |
| 47 | 47 |
} ts; |
| 48 |
i2c_bus *i2c; |
|
| 49 | 48 |
|
| 50 | 49 |
int keymap[0x80]; |
| 51 | 50 |
DeviceState *kbd; |
| ... | ... | |
| 194 | 193 |
{
|
| 195 | 194 |
DeviceState *dev; |
| 196 | 195 |
qemu_irq tmp_irq = qdev_get_gpio_in(s->cpu->gpio, N8X0_TMP105_GPIO); |
| 197 |
|
|
| 198 |
/* Attach the CPU on one end of our I2C bus. */ |
|
| 199 |
s->i2c = omap_i2c_bus(s->cpu->i2c[0]); |
|
| 196 |
i2c_bus *i2c = omap_i2c_bus(s->cpu->i2c[0]); |
|
| 200 | 197 |
|
| 201 | 198 |
/* Attach a menelaus PM chip */ |
| 202 |
dev = i2c_create_slave(s->i2c, "twl92230", N8X0_MENELAUS_ADDR);
|
|
| 199 |
dev = i2c_create_slave(i2c, "twl92230", N8X0_MENELAUS_ADDR); |
|
| 203 | 200 |
qdev_connect_gpio_out(dev, 3, |
| 204 | 201 |
qdev_get_gpio_in(s->cpu->ih[0], |
| 205 | 202 |
OMAP_INT_24XX_SYS_NIRQ)); |
| ... | ... | |
| 207 | 204 |
qemu_system_powerdown = qdev_get_gpio_in(dev, 3); |
| 208 | 205 |
|
| 209 | 206 |
/* Attach a TMP105 PM chip (A0 wired to ground) */ |
| 210 |
dev = i2c_create_slave(s->i2c, "tmp105", N8X0_TMP105_ADDR);
|
|
| 207 |
dev = i2c_create_slave(i2c, "tmp105", N8X0_TMP105_ADDR); |
|
| 211 | 208 |
qdev_connect_gpio_out(dev, 0, tmp_irq); |
| 212 | 209 |
} |
| 213 | 210 |
|
| ... | ... | |
| 391 | 388 |
|
| 392 | 389 |
/* Attach the LM8322 keyboard to the I2C bus, |
| 393 | 390 |
* should happen in n8x0_i2c_setup and s->kbd be initialised here. */ |
| 394 |
s->kbd = i2c_create_slave(s->i2c, "lm8323", N810_LM8323_ADDR); |
|
| 391 |
s->kbd = i2c_create_slave(omap_i2c_bus(s->cpu->i2c[0]), |
|
| 392 |
"lm8323", N810_LM8323_ADDR); |
|
| 395 | 393 |
qdev_connect_gpio_out(s->kbd, 0, kbd_irq); |
| 396 | 394 |
} |
| 397 | 395 |
|
Also available in: Unified diff