hw/dma/omap_dma: Drop model argument to omap_dma_init()
The model argument to omap_dma_init() is always omap_dma_3_1, and all we do with it now is assert this; drop the argument and the enum. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20260512203414.3633237-13-peter.maydell@linaro.org
Peter Maydell committed
May 12, 2026 at 21:34 UTC
9ae6151bd5e858042df948f6f35b848724e69169
3 files changed
+7
-15
hw/arm/omap1.c
+1
-1
@@ -3789,7 +3789,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *dram,
3789
}
3790
s->dma = omap_dma_init(0xfffed800, dma_irqs, system_memory,
3791
qdev_get_gpio_in(s->ih[0], OMAP_INT_DMA_LCD),
3792
- s, omap_findclk(s, "dma_ck"), omap_dma_3_1);
3792
+ s, omap_findclk(s, "dma_ck"));
3793
3794
s->port[emiff ].addr_valid = omap_validate_emiff_addr;
3795
s->port[emifs ].addr_valid = omap_validate_emifs_addr;
hw/dma/omap_dma.c
+3
-5
@@ -1169,15 +1169,13 @@ static void omap_dma_clk_update(void *opaque, int line, int on)
1169
}
1170
1171
struct soc_dma_s *omap_dma_init(hwaddr base, qemu_irq *irqs,
1172
- MemoryRegion *sysmem,
1173
- qemu_irq lcd_irq, struct omap_mpu_state_s *mpu, omap_clk clk,
1174
- enum omap_dma_model model)
1172
+ MemoryRegion *sysmem,
1173
+ qemu_irq lcd_irq,
1174
+ struct omap_mpu_state_s *mpu, omap_clk clk)
1175
{
1176
int num_irqs, memsize, i;
1177
struct omap_dma_s *s = g_new0(struct omap_dma_s, 1);
1178
1179
- assert(model == omap_dma_3_1);
1180
-
1179
num_irqs = 6;
1180
memsize = 0x800;
1181
s->mpu = mpu;
include/hw/arm/omap.h
+3
-9
@@ -172,17 +172,11 @@ void omap_gpio_set_clk(Omap1GpioState *gpio, omap_clk clk);
172
#define OMAP_INT_310_McBSP2RX_OF 31
173
174
/* omap_dma.c */
175
-enum omap_dma_model {
176
- omap_dma_3_0,
177
- omap_dma_3_1,
178
- omap_dma_3_2,
179
-};
180
-
175
struct soc_dma_s;
176
struct soc_dma_s *omap_dma_init(hwaddr base, qemu_irq *irqs,
183
- MemoryRegion *sysmem,
184
- qemu_irq lcd_irq, struct omap_mpu_state_s *mpu, omap_clk clk,
185
- enum omap_dma_model model);
177
+ MemoryRegion *sysmem,
178
+ qemu_irq lcd_irq,
179
+ struct omap_mpu_state_s *mpu, omap_clk clk);
180
void omap_dma_reset(struct soc_dma_s *s);
181
182
struct dma_irq_map {