motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-21 17:11:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/arm/omap1: Inline creation of MMC

Browse source 
Our style for other conversions of OMAP devices to qdev has been to
inline the creation and wiring into omap310_mpu_init() -- see for
instance the handling of omap-intc, omap-gpio and omap_i2c. Do
the same for omap-mmc.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20250128104519.3981448-7-peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Peter Maydell 2025-01-28 10:45:14 +00:00 • committed by Philippe Mathieu-Daudé
parent 3102d81fc7
commit 9c2fce87fc
2 changed files with 11 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hw/arm/omap1.c
View file

@ -3981,10 +3981,17 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *dram,
if (!dinfo && !qtest_enabled()) { if (!dinfo && !qtest_enabled()) {
warn_report("missing SecureDigital device"); warn_report("missing SecureDigital device");
} }
s->mmc = omap_mmc_init(0xfffb7800, system_memory,
qdev_get_gpio_in(s->ih[1], OMAP_INT_OQN), s->mmc = qdev_new(TYPE_OMAP_MMC);
&s->drq[OMAP_DMA_MMC_TX], sysbus_realize_and_unref(SYS_BUS_DEVICE(s->mmc), &error_fatal);
omap_findclk(s, "mmc_ck")); omap_mmc_set_clk(s->mmc, omap_findclk(s, "mmc_ck"));
memory_region_add_subregion(system_memory, 0xfffb7800,
sysbus_mmio_get_region(SYS_BUS_DEVICE(s->mmc), 0));
qdev_connect_gpio_out_named(s->mmc, "dma-tx", 0, s->drq[OMAP_DMA_MMC_TX]);
qdev_connect_gpio_out_named(s->mmc, "dma-rx", 0, s->drq[OMAP_DMA_MMC_RX]);
sysbus_connect_irq(SYS_BUS_DEVICE(s->mmc), 0,
qdev_get_gpio_in(s->ih[1], OMAP_INT_OQN));
if (dinfo) { if (dinfo) {
DeviceState *card = qdev_new(TYPE_SD_CARD); DeviceState *card = qdev_new(TYPE_SD_CARD);

22
hw/sd/omap_mmc.c
View file

@ -590,28 +590,6 @@ void omap_mmc_set_clk(DeviceState *dev, omap_clk clk)
s->clk = clk; s->clk = clk;
} }
DeviceState *omap_mmc_init(hwaddr base,
MemoryRegion *sysmem,
qemu_irq irq, qemu_irq dma[], omap_clk clk)
{
DeviceState *dev;
OMAPMMCState *s;
dev = qdev_new(TYPE_OMAP_MMC);
s = OMAP_MMC(dev);
sysbus_realize_and_unref(SYS_BUS_DEVICE(s), &error_fatal);
omap_mmc_set_clk(dev, clk);
memory_region_add_subregion(sysmem, base,
sysbus_mmio_get_region(SYS_BUS_DEVICE(s), 0));
qdev_connect_gpio_out_named(dev, "dma-tx", 0, dma[0]);
qdev_connect_gpio_out_named(dev, "dma-rx", 0, dma[1]);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);
return dev;
}
static void omap_mmc_reset_hold(Object *obj, ResetType type) static void omap_mmc_reset_hold(Object *obj, ResetType type)
{ {
OMAPMMCState *s = OMAP_MMC(obj); OMAPMMCState *s = OMAP_MMC(obj);