diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-03-03 14:14:44 +0100 |
|---|---|---|
| committer | Andrzej Zaborowski <balrog@zabor.org> | 2011-03-03 14:14:44 +0100 |
| commit | 797e9542f56b37632fddbfeb810d4a9ed1fc55ab (patch) | |
| tree | b37785b65b32315b155e15917a9c4c7a0999dc3f /hw/pxa2xx.c | |
| parent | d353eb43cffc4e8f44f3acba0d04743ba3f4aca1 (diff) | |
| download | qemu-797e9542f56b37632fddbfeb810d4a9ed1fc55ab.zip qemu-797e9542f56b37632fddbfeb810d4a9ed1fc55ab.tar.gz qemu-797e9542f56b37632fddbfeb810d4a9ed1fc55ab.tar.bz2 | |
pxa2xx_timer: switch to using qdev/vmstate
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
Diffstat (limited to 'hw/pxa2xx.c')
| -rw-r--r-- | hw/pxa2xx.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c index 6ff8131..7c31fab 100644 --- a/hw/pxa2xx.c +++ b/hw/pxa2xx.c @@ -2100,7 +2100,13 @@ PXA2xxState *pxa270_init(unsigned int sdram_size, const char *revision) s->dma = pxa27x_dma_init(0x40000000, qdev_get_gpio_in(s->pic, PXA2XX_PIC_DMA)); - pxa27x_timer_init(0x40a00000, s->pic); + sysbus_create_varargs("pxa27x-timer", 0x40a00000, + qdev_get_gpio_in(s->pic, PXA2XX_PIC_OST_0 + 0), + qdev_get_gpio_in(s->pic, PXA2XX_PIC_OST_0 + 1), + qdev_get_gpio_in(s->pic, PXA2XX_PIC_OST_0 + 2), + qdev_get_gpio_in(s->pic, PXA2XX_PIC_OST_0 + 3), + qdev_get_gpio_in(s->pic, PXA27X_PIC_OST_4_11), + NULL); s->gpio = pxa2xx_gpio_init(0x40e00000, s->env, s->pic, 121); @@ -2229,7 +2235,12 @@ PXA2xxState *pxa255_init(unsigned int sdram_size) s->dma = pxa255_dma_init(0x40000000, qdev_get_gpio_in(s->pic, PXA2XX_PIC_DMA)); - pxa25x_timer_init(0x40a00000, s->pic); + sysbus_create_varargs("pxa25x-timer", 0x40a00000, + qdev_get_gpio_in(s->pic, PXA2XX_PIC_OST_0 + 0), + qdev_get_gpio_in(s->pic, PXA2XX_PIC_OST_0 + 1), + qdev_get_gpio_in(s->pic, PXA2XX_PIC_OST_0 + 2), + qdev_get_gpio_in(s->pic, PXA2XX_PIC_OST_0 + 3), + NULL); s->gpio = pxa2xx_gpio_init(0x40e00000, s->env, s->pic, 85); |