mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 00:33:55 -06:00
pxa2xx_pic: update to use qdev
Use qdev/sysbus framework to handle pxa2xx-pic. Instead of exposing IRQs via array, reference them via qdev_get_gpio_in(). Patch has been modified by the committer. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
This commit is contained in:
Dmitry Eremin-Solenikov
Andrzej Zaborowski
parent
3e1dbc3bd4
commit
e1f8c729fa
6 changed files with 113 additions and 93 deletions
76
hw/pxa2xx.c
76
hw/pxa2xx.c
|
|
@ -888,7 +888,7 @@ static int pxa2xx_ssp_init(SysBusDevice *dev)
|
|||
|
||||
static inline void pxa2xx_rtc_int_update(PXA2xxState *s)
|
||||
{
|
||||
qemu_set_irq(s->pic[PXA2XX_PIC_RTCALARM], !!(s->rtsr & 0x2553));
|
||||
qemu_set_irq(s->rtc_irq, !!(s->rtsr & 0x2553));
|
||||
}
|
||||
|
||||
static void pxa2xx_rtc_hzupdate(PXA2xxState *s)
|
||||
|
|
@ -1197,6 +1197,8 @@ static void pxa2xx_rtc_init(PXA2xxState *s)
|
|||
s->rtc_swal1 = qemu_new_timer(rt_clock, pxa2xx_rtc_swal1_tick, s);
|
||||
s->rtc_swal2 = qemu_new_timer(rt_clock, pxa2xx_rtc_swal2_tick, s);
|
||||
s->rtc_pi = qemu_new_timer(rt_clock, pxa2xx_rtc_pi_tick, s);
|
||||
|
||||
s->rtc_irq = qdev_get_gpio_in(s->pic, PXA2XX_PIC_RTCALARM);
|
||||
}
|
||||
|
||||
static void pxa2xx_rtc_save(QEMUFile *f, void *opaque)
|
||||
|
|
@ -2095,10 +2097,10 @@ PXA2xxState *pxa270_init(unsigned int sdram_size, const char *revision)
|
|||
|
||||
s->pic = pxa2xx_pic_init(0x40d00000, s->env);
|
||||
|
||||
s->dma = pxa27x_dma_init(0x40000000, s->pic[PXA2XX_PIC_DMA]);
|
||||
s->dma = pxa27x_dma_init(0x40000000,
|
||||
qdev_get_gpio_in(s->pic, PXA2XX_PIC_DMA));
|
||||
|
||||
pxa27x_timer_init(0x40a00000, &s->pic[PXA2XX_PIC_OST_0],
|
||||
s->pic[PXA27X_PIC_OST_4_11]);
|
||||
pxa27x_timer_init(0x40a00000, s->pic);
|
||||
|
||||
s->gpio = pxa2xx_gpio_init(0x40e00000, s->env, s->pic, 121);
|
||||
|
||||
|
|
@ -2108,26 +2110,28 @@ PXA2xxState *pxa270_init(unsigned int sdram_size, const char *revision)
|
|||
exit(1);
|
||||
}
|
||||
s->mmc = pxa2xx_mmci_init(0x41100000, dinfo->bdrv,
|
||||
s->pic[PXA2XX_PIC_MMC], s->dma);
|
||||
qdev_get_gpio_in(s->pic, PXA2XX_PIC_MMC), s->dma);
|
||||
|
||||
for (i = 0; pxa270_serial[i].io_base; i ++)
|
||||
if (serial_hds[i])
|
||||
#ifdef TARGET_WORDS_BIGENDIAN
|
||||
serial_mm_init(pxa270_serial[i].io_base, 2,
|
||||
s->pic[pxa270_serial[i].irqn], 14857000/16,
|
||||
serial_hds[i], 1, 1);
|
||||
qdev_get_gpio_in(s->pic, pxa270_serial[i].irqn),
|
||||
14857000 / 16, serial_hds[i], 1, 1);
|
||||
#else
|
||||
serial_mm_init(pxa270_serial[i].io_base, 2,
|
||||
s->pic[pxa270_serial[i].irqn], 14857000/16,
|
||||
serial_hds[i], 1, 0);
|
||||
qdev_get_gpio_in(s->pic, pxa270_serial[i].irqn),
|
||||
14857000 / 16, serial_hds[i], 1, 0);
|
||||
#endif
|
||||
else
|
||||
break;
|
||||
if (serial_hds[i])
|
||||
s->fir = pxa2xx_fir_init(0x40800000, s->pic[PXA2XX_PIC_ICP],
|
||||
s->fir = pxa2xx_fir_init(0x40800000,
|
||||
qdev_get_gpio_in(s->pic, PXA2XX_PIC_ICP),
|
||||
s->dma, serial_hds[i]);
|
||||
|
||||
s->lcd = pxa2xx_lcdc_init(0x44000000, s->pic[PXA2XX_PIC_LCD]);
|
||||
s->lcd = pxa2xx_lcdc_init(0x44000000,
|
||||
qdev_get_gpio_in(s->pic, PXA2XX_PIC_LCD));
|
||||
|
||||
s->cm_base = 0x41300000;
|
||||
s->cm_regs[CCCR >> 2] = 0x02000210; /* 416.0 MHz */
|
||||
|
|
@ -2159,13 +2163,13 @@ PXA2xxState *pxa270_init(unsigned int sdram_size, const char *revision)
|
|||
for (i = 0; pxa27x_ssp[i].io_base; i ++) {
|
||||
DeviceState *dev;
|
||||
dev = sysbus_create_simple("pxa2xx-ssp", pxa27x_ssp[i].io_base,
|
||||
s->pic[pxa27x_ssp[i].irqn]);
|
||||
qdev_get_gpio_in(s->pic, pxa27x_ssp[i].irqn));
|
||||
s->ssp[i] = (SSIBus *)qdev_get_child_bus(dev, "ssi");
|
||||
}
|
||||
|
||||
if (usb_enabled) {
|
||||
sysbus_create_simple("sysbus-ohci", 0x4c000000,
|
||||
s->pic[PXA2XX_PIC_USBH1]);
|
||||
qdev_get_gpio_in(s->pic, PXA2XX_PIC_USBH1));
|
||||
}
|
||||
|
||||
s->pcmcia[0] = pxa2xx_pcmcia_init(0x20000000);
|
||||
|
|
@ -2179,12 +2183,16 @@ PXA2xxState *pxa270_init(unsigned int sdram_size, const char *revision)
|
|||
register_savevm(NULL, "pxa2xx_rtc", 0, 0, pxa2xx_rtc_save,
|
||||
pxa2xx_rtc_load, s);
|
||||
|
||||
s->i2c[0] = pxa2xx_i2c_init(0x40301600, s->pic[PXA2XX_PIC_I2C], 0xffff);
|
||||
s->i2c[1] = pxa2xx_i2c_init(0x40f00100, s->pic[PXA2XX_PIC_PWRI2C], 0xff);
|
||||
s->i2c[0] = pxa2xx_i2c_init(0x40301600,
|
||||
qdev_get_gpio_in(s->pic, PXA2XX_PIC_I2C), 0xffff);
|
||||
s->i2c[1] = pxa2xx_i2c_init(0x40f00100,
|
||||
qdev_get_gpio_in(s->pic, PXA2XX_PIC_PWRI2C), 0xff);
|
||||
|
||||
s->i2s = pxa2xx_i2s_init(0x40400000, s->pic[PXA2XX_PIC_I2S], s->dma);
|
||||
s->i2s = pxa2xx_i2s_init(0x40400000,
|
||||
qdev_get_gpio_in(s->pic, PXA2XX_PIC_I2S), s->dma);
|
||||
|
||||
s->kp = pxa27x_keypad_init(0x41500000, s->pic[PXA2XX_PIC_KEYPAD]);
|
||||
s->kp = pxa27x_keypad_init(0x41500000,
|
||||
qdev_get_gpio_in(s->pic, PXA2XX_PIC_KEYPAD));
|
||||
|
||||
/* GPIO1 resets the processor */
|
||||
/* The handler can be overridden by board-specific code */
|
||||
|
|
@ -2218,9 +2226,10 @@ PXA2xxState *pxa255_init(unsigned int sdram_size)
|
|||
|
||||
s->pic = pxa2xx_pic_init(0x40d00000, s->env);
|
||||
|
||||
s->dma = pxa255_dma_init(0x40000000, s->pic[PXA2XX_PIC_DMA]);
|
||||
s->dma = pxa255_dma_init(0x40000000,
|
||||
qdev_get_gpio_in(s->pic, PXA2XX_PIC_DMA));
|
||||
|
||||
pxa25x_timer_init(0x40a00000, &s->pic[PXA2XX_PIC_OST_0]);
|
||||
pxa25x_timer_init(0x40a00000, s->pic);
|
||||
|
||||
s->gpio = pxa2xx_gpio_init(0x40e00000, s->env, s->pic, 85);
|
||||
|
||||
|
|
@ -2230,27 +2239,29 @@ PXA2xxState *pxa255_init(unsigned int sdram_size)
|
|||
exit(1);
|
||||
}
|
||||
s->mmc = pxa2xx_mmci_init(0x41100000, dinfo->bdrv,
|
||||
s->pic[PXA2XX_PIC_MMC], s->dma);
|
||||
qdev_get_gpio_in(s->pic, PXA2XX_PIC_MMC), s->dma);
|
||||
|
||||
for (i = 0; pxa255_serial[i].io_base; i ++)
|
||||
if (serial_hds[i]) {
|
||||
#ifdef TARGET_WORDS_BIGENDIAN
|
||||
serial_mm_init(pxa255_serial[i].io_base, 2,
|
||||
s->pic[pxa255_serial[i].irqn], 14745600/16,
|
||||
serial_hds[i], 1, 1);
|
||||
qdev_get_gpio_in(s->pic, pxa255_serial[i].irqn),
|
||||
14745600 / 16, serial_hds[i], 1, 1);
|
||||
#else
|
||||
serial_mm_init(pxa255_serial[i].io_base, 2,
|
||||
s->pic[pxa255_serial[i].irqn], 14745600/16,
|
||||
serial_hds[i], 1, 0);
|
||||
qdev_get_gpio_in(s->pic, pxa255_serial[i].irqn),
|
||||
14745600 / 16, serial_hds[i], 1, 0);
|
||||
#endif
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
if (serial_hds[i])
|
||||
s->fir = pxa2xx_fir_init(0x40800000, s->pic[PXA2XX_PIC_ICP],
|
||||
s->fir = pxa2xx_fir_init(0x40800000,
|
||||
qdev_get_gpio_in(s->pic, PXA2XX_PIC_ICP),
|
||||
s->dma, serial_hds[i]);
|
||||
|
||||
s->lcd = pxa2xx_lcdc_init(0x44000000, s->pic[PXA2XX_PIC_LCD]);
|
||||
s->lcd = pxa2xx_lcdc_init(0x44000000,
|
||||
qdev_get_gpio_in(s->pic, PXA2XX_PIC_LCD));
|
||||
|
||||
s->cm_base = 0x41300000;
|
||||
s->cm_regs[CCCR >> 2] = 0x02000210; /* 416.0 MHz */
|
||||
|
|
@ -2282,13 +2293,13 @@ PXA2xxState *pxa255_init(unsigned int sdram_size)
|
|||
for (i = 0; pxa255_ssp[i].io_base; i ++) {
|
||||
DeviceState *dev;
|
||||
dev = sysbus_create_simple("pxa2xx-ssp", pxa255_ssp[i].io_base,
|
||||
s->pic[pxa255_ssp[i].irqn]);
|
||||
qdev_get_gpio_in(s->pic, pxa255_ssp[i].irqn));
|
||||
s->ssp[i] = (SSIBus *)qdev_get_child_bus(dev, "ssi");
|
||||
}
|
||||
|
||||
if (usb_enabled) {
|
||||
sysbus_create_simple("sysbus-ohci", 0x4c000000,
|
||||
s->pic[PXA2XX_PIC_USBH1]);
|
||||
qdev_get_gpio_in(s->pic, PXA2XX_PIC_USBH1));
|
||||
}
|
||||
|
||||
s->pcmcia[0] = pxa2xx_pcmcia_init(0x20000000);
|
||||
|
|
@ -2302,10 +2313,13 @@ PXA2xxState *pxa255_init(unsigned int sdram_size)
|
|||
register_savevm(NULL, "pxa2xx_rtc", 0, 0, pxa2xx_rtc_save,
|
||||
pxa2xx_rtc_load, s);
|
||||
|
||||
s->i2c[0] = pxa2xx_i2c_init(0x40301600, s->pic[PXA2XX_PIC_I2C], 0xffff);
|
||||
s->i2c[1] = pxa2xx_i2c_init(0x40f00100, s->pic[PXA2XX_PIC_PWRI2C], 0xff);
|
||||
s->i2c[0] = pxa2xx_i2c_init(0x40301600,
|
||||
qdev_get_gpio_in(s->pic, PXA2XX_PIC_I2C), 0xffff);
|
||||
s->i2c[1] = pxa2xx_i2c_init(0x40f00100,
|
||||
qdev_get_gpio_in(s->pic, PXA2XX_PIC_PWRI2C), 0xff);
|
||||
|
||||
s->i2s = pxa2xx_i2s_init(0x40400000, s->pic[PXA2XX_PIC_I2S], s->dma);
|
||||
s->i2s = pxa2xx_i2s_init(0x40400000,
|
||||
qdev_get_gpio_in(s->pic, PXA2XX_PIC_I2S), s->dma);
|
||||
|
||||
/* GPIO1 resets the processor */
|
||||
/* The handler can be overridden by board-specific code */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue