Revision 77831c20 hw/omap1.c

b/hw/omap1.c
27 27
#include "pc.h"
28 28
#include "blockdev.h"
29 29
#include "range.h"
30
#include "sysbus.h"
30 31

  
31 32
/* Should signal the TCMI/GPMC */
32 33
uint32_t omap_badwidth_read8(void *opaque, target_phys_addr_t addr)
......
3585 3586
    omap_uart_reset(mpu->uart[2]);
3586 3587
    omap_mmc_reset(mpu->mmc);
3587 3588
    omap_mpuio_reset(mpu->mpuio);
3588
    omap_gpio_reset(mpu->gpio);
3589 3589
    omap_uwire_reset(mpu->microwire);
3590 3590
    omap_pwl_reset(mpu);
3591 3591
    omap_pwt_reset(mpu);
......
3845 3845
                    s->irq[1][OMAP_INT_KEYBOARD], s->irq[1][OMAP_INT_MPUIO],
3846 3846
                    s->wakeup, omap_findclk(s, "clk32-kHz"));
3847 3847

  
3848
    s->gpio = omap_gpio_init(0xfffce000, s->irq[0][OMAP_INT_GPIO_BANK1],
3849
                    omap_findclk(s, "arm_gpio_ck"));
3848
    s->gpio = qdev_create(NULL, "omap-gpio");
3849
    qdev_prop_set_int32(s->gpio, "mpu_model", s->mpu_model);
3850
    qdev_init_nofail(s->gpio);
3851
    sysbus_connect_irq(sysbus_from_qdev(s->gpio), 0,
3852
                    s->irq[0][OMAP_INT_GPIO_BANK1]);
3853
    sysbus_mmio_map(sysbus_from_qdev(s->gpio), 0, 0xfffce000);
3850 3854

  
3851 3855
    s->microwire = omap_uwire_init(0xfffb3000, &s->irq[1][OMAP_INT_uWireTX],
3852 3856
                    s->drq[OMAP_DMA_UWIRE_TX], omap_findclk(s, "mpuper_ck"));

Also available in: Unified diff