| Message ID | 20180111205626.23291-16-f4bug@amsat.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | SDHCI: clean Specs v1/v2, implement Spec v3 | expand |
On Thu, Jan 11, 2018 at 12:56 PM, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> Alistair > --- > hw/arm/xlnx-zynqmp.c | 38 +++++++++++++++++++++++++++----------- > 1 file changed, 27 insertions(+), 11 deletions(-) > > diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c > index 325642058b..dacf89c566 100644 > --- a/hw/arm/xlnx-zynqmp.c > +++ b/hw/arm/xlnx-zynqmp.c > @@ -381,22 +381,38 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) > sysbus_connect_irq(SYS_BUS_DEVICE(&s->sata), 0, gic_spi[SATA_INTR]); > > for (i = 0; i < XLNX_ZYNQMP_NUM_SDHCI; i++) { > - char *bus_name; > - > - object_property_set_bool(OBJECT(&s->sdhci[i]), true, > - "realized", &err); > + char *bus_name = g_strdup_printf("sd-bus%d", i); > + SysBusDevice *sbd = SYS_BUS_DEVICE(&s->sdhci[i]); > + Object *sdhci = OBJECT(&s->sdhci[i]); > + > + /* Compatible with: > + * - SD Host Controller Specification Version 3.00 > + * - SDIO Specification Version 3.0 > + * - eMMC Specification Version 4.51 > + * > + * Host clock rate variable between 0 and 208 MHz > + * Transfers the data in SDR104, SDR50, DDR50 modes > + * (SDR104 mode: up to 832Mbits/s using 4 parallel data lines) > + * Transfers the data in 1 bit and 4 bit SD modes > + * UHS speed modes, 1.8V > + * voltage switch, tuning commands > + */ > + object_property_set_uint(sdhci, 3, "sd-spec-version", &err); > + object_property_set_bool(sdhci, true, "suspend", &err); > + object_property_set_bool(sdhci, true, "1v8", &err); > + object_property_set_bool(sdhci, true, "64bit", &err); > + object_property_set_uint(sdhci, 0b111, "bus-speed", &err); > + object_property_set_uint(sdhci, 0b111, "driver-strength", &err); > + object_property_set_bool(sdhci, true, "realized", &err); > if (err) { > error_propagate(errp, err); > return; > } > - sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdhci[i]), 0, > - sdhci_addr[i]); > - sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci[i]), 0, > - gic_spi[sdhci_intr[i]]); > + sysbus_mmio_map(sbd, 0, sdhci_addr[i]); > + sysbus_connect_irq(sbd, 0, gic_spi[sdhci_intr[i]]); > + > /* Alias controller SD bus to the SoC itself */ > - bus_name = g_strdup_printf("sd-bus%d", i); > - object_property_add_alias(OBJECT(s), bus_name, > - OBJECT(&s->sdhci[i]), "sd-bus", > + object_property_add_alias(OBJECT(s), bus_name, sdhci, "sd-bus", > &error_abort); > g_free(bus_name); > } > -- > 2.15.1 > >
diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 325642058b..dacf89c566 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -381,22 +381,38 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) sysbus_connect_irq(SYS_BUS_DEVICE(&s->sata), 0, gic_spi[SATA_INTR]); for (i = 0; i < XLNX_ZYNQMP_NUM_SDHCI; i++) { - char *bus_name; - - object_property_set_bool(OBJECT(&s->sdhci[i]), true, - "realized", &err); + char *bus_name = g_strdup_printf("sd-bus%d", i); + SysBusDevice *sbd = SYS_BUS_DEVICE(&s->sdhci[i]); + Object *sdhci = OBJECT(&s->sdhci[i]); + + /* Compatible with: + * - SD Host Controller Specification Version 3.00 + * - SDIO Specification Version 3.0 + * - eMMC Specification Version 4.51 + * + * Host clock rate variable between 0 and 208 MHz + * Transfers the data in SDR104, SDR50, DDR50 modes + * (SDR104 mode: up to 832Mbits/s using 4 parallel data lines) + * Transfers the data in 1 bit and 4 bit SD modes + * UHS speed modes, 1.8V + * voltage switch, tuning commands + */ + object_property_set_uint(sdhci, 3, "sd-spec-version", &err); + object_property_set_bool(sdhci, true, "suspend", &err); + object_property_set_bool(sdhci, true, "1v8", &err); + object_property_set_bool(sdhci, true, "64bit", &err); + object_property_set_uint(sdhci, 0b111, "bus-speed", &err); + object_property_set_uint(sdhci, 0b111, "driver-strength", &err); + object_property_set_bool(sdhci, true, "realized", &err); if (err) { error_propagate(errp, err); return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdhci[i]), 0, - sdhci_addr[i]); - sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci[i]), 0, - gic_spi[sdhci_intr[i]]); + sysbus_mmio_map(sbd, 0, sdhci_addr[i]); + sysbus_connect_irq(sbd, 0, gic_spi[sdhci_intr[i]]); + /* Alias controller SD bus to the SoC itself */ - bus_name = g_strdup_printf("sd-bus%d", i); - object_property_add_alias(OBJECT(s), bus_name, - OBJECT(&s->sdhci[i]), "sd-bus", + object_property_add_alias(OBJECT(s), bus_name, sdhci, "sd-bus", &error_abort); g_free(bus_name); }
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/arm/xlnx-zynqmp.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-)