On Mon, Jan 22, 2018 at 7:06 PM, Philippe Mathieu-Daudé <f4...@amsat.org> wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> > --- > hw/arm/bcm2835_peripherals.c | 21 +++++++++++++-------- > 1 file changed, 13 insertions(+), 8 deletions(-) > > diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c > index 12e0dd11af..0570cc4ad3 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 ¯\_(ツ)_/¯
I don't think we need the shrugging face in the comments. Otherwise: Reviewed-by: Alistair Francis <alistair.fran...@xilinx.com> Alistair > + */ > + 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) { > -- > 2.15.1 > >