Message ID | 20180108154303.6522-12-f4bug@amsat.org |
---|---|
State | New |
Headers | show |
Series | SDHCI: make it abstract, add inherited devices, add qtests | expand |
On Mon, Jan 8, 2018 at 7:42 AM, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/arm/exynos4210.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c > index e8e1d81e62..eb95131221 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,13 +376,10 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem) > BlockBackend *blk; > DriveInfo *di; > > - dev = qdev_create(NULL, TYPE_SYSBUS_SDHCI); > - qdev_prop_set_uint32(dev, "capareg", EXYNOS4210_SDHCI_CAPABILITIES); > - qdev_init_nofail(dev); > - > - busdev = SYS_BUS_DEVICE(dev); > - sysbus_mmio_map(busdev, 0, EXYNOS4210_SDHCI_ADDR(n)); > - sysbus_connect_irq(busdev, 0, s->irq_table[exynos4210_get_irq(29, n)]); > + dev = sysbus_create_varargs("samsung,exynos4210-dw-mshc", Isn't this a legacy function, shouldn't we be moving away from it? Alistair > + EXYNOS4210_SDHCI_ADDR(n), > + s->irq_table[exynos4210_get_irq(29, n)], > + NULL); > > di = drive_get(IF_SD, 0, n); > blk = di ? blk_by_legacy_dinfo(di) : NULL; > -- > 2.15.1 > >
diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index e8e1d81e62..eb95131221 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,13 +376,10 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem) BlockBackend *blk; DriveInfo *di; - dev = qdev_create(NULL, TYPE_SYSBUS_SDHCI); - qdev_prop_set_uint32(dev, "capareg", EXYNOS4210_SDHCI_CAPABILITIES); - qdev_init_nofail(dev); - - busdev = SYS_BUS_DEVICE(dev); - sysbus_mmio_map(busdev, 0, EXYNOS4210_SDHCI_ADDR(n)); - sysbus_connect_irq(busdev, 0, s->irq_table[exynos4210_get_irq(29, n)]); + dev = sysbus_create_varargs("samsung,exynos4210-dw-mshc", + EXYNOS4210_SDHCI_ADDR(n), + s->irq_table[exynos4210_get_irq(29, n)], + NULL); di = drive_get(IF_SD, 0, n); blk = di ? blk_by_legacy_dinfo(di) : NULL;
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/arm/exynos4210.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)