diff options
| author | Philippe Mathieu-Daudé | 2020-07-05 14:24:24 +0200 |
|---|---|---|
| committer | Philippe Mathieu-Daudé | 2020-08-21 16:22:43 +0200 |
| commit | 26c607b86b7bb90ad75a15bc6172c28aa48c768c (patch) | |
| tree | d4465372d044588ab785b3b5dea6daee2d2e41f0 /hw/arm/realview.c | |
| parent | hw/sd/pl181: Expose a SDBus and connect the SDCard to it (diff) | |
| download | qemu-26c607b86b7bb90ad75a15bc6172c28aa48c768c.tar.gz qemu-26c607b86b7bb90ad75a15bc6172c28aa48c768c.tar.xz qemu-26c607b86b7bb90ad75a15bc6172c28aa48c768c.zip | |
hw/sd/pl181: Do not create SD card within the SD host controller
SD/MMC host controllers provide a SD Bus to plug SD cards,
but don't come with SD card plugged in :) Let the machine/board
model create and plug the SD cards when required.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200705204630.4133-8-f4bug@amsat.org>
Diffstat (limited to 'hw/arm/realview.c')
| -rw-r--r-- | hw/arm/realview.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 3e2360c261..5f1f36b15c 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -27,6 +27,7 @@ #include "hw/intc/realview_gic.h" #include "hw/irq.h" #include "hw/i2c/arm_sbcon_i2c.h" +#include "hw/sd/sd.h" #define SMP_BOOT_ADDR 0xe0000000 #define SMP_BOOTREG_ADDR 0x10000030 @@ -69,6 +70,7 @@ static void realview_init(MachineState *machine, qemu_irq mmc_irq[2]; PCIBus *pci_bus = NULL; NICInfo *nd; + DriveInfo *dinfo; I2CBus *i2c; int n; unsigned int smp_cpus = machine->smp.cpus; @@ -236,6 +238,16 @@ static void realview_init(MachineState *machine, qemu_irq_invert(qdev_get_gpio_in(gpio2, 0))); qdev_connect_gpio_out_named(dev, "card-read-only", 0, mmc_irq[0]); qdev_connect_gpio_out_named(dev, "card-inserted", 0, mmc_irq[1]); + dinfo = drive_get_next(IF_SD); + if (dinfo) { + DeviceState *card; + + card = qdev_new(TYPE_SD_CARD); + qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo), + &error_fatal); + qdev_realize_and_unref(card, qdev_get_child_bus(dev, "sd-bus"), + &error_fatal); + } sysbus_create_simple("pl031", 0x10017000, pic[10]); |