diff options
| author | Philippe Mathieu-Daudé | 2018-02-08 17:48:11 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2018-02-13 16:15:08 +0100 |
| commit | ed6c5e93bbdc1ece5305c62016e9bddde4141154 (patch) | |
| tree | 6df1d73bfe247b9da661b1d493d5329fdcae295d /hw/arm/bcm2835_peripherals.c | |
| parent | sdhci: implement CMD/DAT[] fields in the Present State register (diff) | |
| download | qemu-ed6c5e93bbdc1ece5305c62016e9bddde4141154.tar.gz qemu-ed6c5e93bbdc1ece5305c62016e9bddde4141154.tar.xz qemu-ed6c5e93bbdc1ece5305c62016e9bddde4141154.zip | |
hw/arm/bcm2835_peripherals: implement SDHCI Spec v3
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Message-Id: <20180208164818.7961-24-f4bug@amsat.org>
Diffstat (limited to 'hw/arm/bcm2835_peripherals.c')
| -rw-r--r-- | hw/arm/bcm2835_peripherals.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c index 12e0dd11af..ca971e83e0 100644 --- a/hw/arm/bcm2835_peripherals.c +++ b/hw/arm/bcm2835_peripherals.c @@ -254,14 +254,19 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) memory_region_add_subregion(&s->peri_mr, RNG_OFFSET, sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->rng), 0)); - /* Extended Mass Media Controller */ - object_property_set_int(OBJECT(&s->sdhci), BCM2835_SDHC_CAPAREG, "capareg", - &err); - if (err) { - error_propagate(errp, err); - return; - } - + /* Extended Mass Media Controller + * + * Compatible with: + * - SD Host Controller Specification Version 3.0 Draft 1.0 + * - SDIO Specification Version 3.0 + * - MMC Specification Version 4.4 + * + * For the exact details please refer to the Arasan documentation: + * SD3.0_Host_AHB_eMMC4.4_Usersguide_ver5.9_jan11_10.pdf + */ + object_property_set_uint(OBJECT(&s->sdhci), 3, "sd-spec-version", &err); + object_property_set_uint(OBJECT(&s->sdhci), BCM2835_SDHC_CAPAREG, "capareg", + &err); object_property_set_bool(OBJECT(&s->sdhci), true, "pending-insert-quirk", &err); if (err) { |