diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2011-09-23 09:44:38 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2011-09-23 09:44:38 +0000 |
| commit | 0919ac787641db11024912651f3bc5764d4f1286 (patch) | |
| tree | fa2c3c45aa6e2dab88e724c50a042482ffdba461 /hw/nseries.c | |
| parent | 53bb614ee344c2eb37cf5a79d56c945d7661fcf5 (diff) | |
omap_intc: Qdevify
Convert the omap_intc devices to qdev. This includes adding
a 'revision' property which will be needed for omap3.
The bulk of this patch is the replacement of "s->irq[x][y]"
with "qdev_get_gpio_in(s->ih[x], y)" now that the interrupt
controller exposes its input lines as qdev gpio inputs.
The devices are named "omap-intc" and "omap2-intc", following
the filename and the OMAP2/3 hardware names, although some
internal functions are still named "omap_inth_*".
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/nseries.c')
| -rw-r--r-- | hw/nseries.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/nseries.c b/hw/nseries.c index af287dd6dc..eb991431a4 100644 --- a/hw/nseries.c +++ b/hw/nseries.c @@ -199,7 +199,9 @@ static void n8x0_i2c_setup(struct n800_s *s) /* Attach a menelaus PM chip */ dev = i2c_create_slave(s->i2c, "twl92230", N8X0_MENELAUS_ADDR); - qdev_connect_gpio_out(dev, 3, s->cpu->irq[0][OMAP_INT_24XX_SYS_NIRQ]); + qdev_connect_gpio_out(dev, 3, + qdev_get_gpio_in(s->cpu->ih[0], + OMAP_INT_24XX_SYS_NIRQ)); /* Attach a TMP105 PM chip (A0 wired to ground) */ dev = i2c_create_slave(s->i2c, "tmp105", N8X0_TMP105_ADDR); |