| Message ID | 20180111205626.23291-11-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> Acked-by: Alistair Francis <alistair.francis@xilinx.com> Alistair > --- > hw/arm/exynos4210.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c > index e8e1d81e62..0e6acac784 100644 > --- a/hw/arm/exynos4210.c > +++ b/hw/arm/exynos4210.c > @@ -75,7 +75,6 @@ > #define EXYNOS4210_INT_COMBINER_BASE_ADDR 0x10448000 > > /* SD/MMC host controllers */ > -#define EXYNOS4210_SDHCI_CAPABILITIES 0x05E80080 > #define EXYNOS4210_SDHCI_BASE_ADDR 0x12510000 > #define EXYNOS4210_SDHCI_ADDR(n) (EXYNOS4210_SDHCI_BASE_ADDR + \ > 0x00010000 * (n)) > @@ -377,8 +376,18 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem) > BlockBackend *blk; > DriveInfo *di; > > + /* Compatible with: > + * - SD Host Controller Specification Version 2.0 > + * - SDIO Specification Version 2.0 > + * - MMC Specification Version 4.3 > + * > + * - SDMA > + * - ADMA > + */ > dev = qdev_create(NULL, TYPE_SYSBUS_SDHCI); > - qdev_prop_set_uint32(dev, "capareg", EXYNOS4210_SDHCI_CAPABILITIES); > + qdev_prop_set_uint8(dev, "sd-spec-version", 2); > + qdev_prop_set_bit(dev, "suspend", true); > + qdev_prop_set_bit(dev, "1v8", true); > qdev_init_nofail(dev); > > busdev = SYS_BUS_DEVICE(dev); > -- > 2.15.1 > >
diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index e8e1d81e62..0e6acac784 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -75,7 +75,6 @@ #define EXYNOS4210_INT_COMBINER_BASE_ADDR 0x10448000 /* SD/MMC host controllers */ -#define EXYNOS4210_SDHCI_CAPABILITIES 0x05E80080 #define EXYNOS4210_SDHCI_BASE_ADDR 0x12510000 #define EXYNOS4210_SDHCI_ADDR(n) (EXYNOS4210_SDHCI_BASE_ADDR + \ 0x00010000 * (n)) @@ -377,8 +376,18 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem) BlockBackend *blk; DriveInfo *di; + /* Compatible with: + * - SD Host Controller Specification Version 2.0 + * - SDIO Specification Version 2.0 + * - MMC Specification Version 4.3 + * + * - SDMA + * - ADMA + */ dev = qdev_create(NULL, TYPE_SYSBUS_SDHCI); - qdev_prop_set_uint32(dev, "capareg", EXYNOS4210_SDHCI_CAPABILITIES); + qdev_prop_set_uint8(dev, "sd-spec-version", 2); + qdev_prop_set_bit(dev, "suspend", true); + qdev_prop_set_bit(dev, "1v8", true); qdev_init_nofail(dev); busdev = SYS_BUS_DEVICE(dev);
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/arm/exynos4210.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)