diff options
author | Avi Kivity <avi@redhat.com> | 2011-08-30 14:46:53 +0300 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2011-09-21 11:14:38 +0300 |
commit | 90aeba9dac1e99bfbe2d44867ec44b32b0780577 (patch) | |
tree | e52b77a2a90a4c4f9af84d3242ce3129dede56df /hw/omap2.c | |
parent | 9898b79abe32c5521ef365207d8a1db6c3a6e206 (diff) | |
download | qemu-90aeba9dac1e99bfbe2d44867ec44b32b0780577.tar.gz qemu-90aeba9dac1e99bfbe2d44867ec44b32b0780577.tar.bz2 qemu-90aeba9dac1e99bfbe2d44867ec44b32b0780577.zip |
soc_dma: drop soc_dma_port_add_mem_ram()
It's a trivial wrapper for soc_dma_port_add_mem(), which makes
the memory API conversion more difficult because it takes a ram
addr_t. Drop.
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/omap2.c')
-rw-r--r-- | hw/omap2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/omap2.c b/hw/omap2.c index ca088d9f53..3d529cefd6 100644 --- a/hw/omap2.c +++ b/hw/omap2.c @@ -2284,8 +2284,10 @@ struct omap_mpu_state_s *omap2420_mpu_init(unsigned long sdram_size, s->port->addr_valid = omap2_validate_addr; /* Register SDRAM and SRAM ports for fast DMA transfers. */ - soc_dma_port_add_mem_ram(s->dma, q2_base, OMAP2_Q2_BASE, s->sdram_size); - soc_dma_port_add_mem_ram(s->dma, sram_base, OMAP2_SRAM_BASE, s->sram_size); + soc_dma_port_add_mem(s->dma, qemu_get_ram_ptr(q2_base), + OMAP2_Q2_BASE, s->sdram_size); + soc_dma_port_add_mem(s->dma, qemu_get_ram_ptr(sram_base), + OMAP2_SRAM_BASE, s->sram_size); s->uart[0] = omap2_uart_init(omap_l4ta(s->l4, 19), s->irq[0][OMAP_INT_24XX_UART1_IRQ], |