summaryrefslogtreecommitdiffstats
path: root/hw/arm/bcm2836.c
diff options
context:
space:
mode:
authorAndrew Baumann2016-02-24 22:58:48 +0100
committerPeter Maydell2016-02-26 16:09:42 +0100
commita55b53a2f46bc5350ec0c3ae8d0cd82eff95a7e8 (patch)
tree419e3a8fd442aaeb0fc93b119974908f4e8a4597 /hw/arm/bcm2836.c
parentARM: PL061: Checking register r/w accesses to reserved area (diff)
downloadqemu-a55b53a2f46bc5350ec0c3ae8d0cd82eff95a7e8.tar.gz
qemu-a55b53a2f46bc5350ec0c3ae8d0cd82eff95a7e8.tar.xz
qemu-a55b53a2f46bc5350ec0c3ae8d0cd82eff95a7e8.zip
raspi: fix SD card with recent sdhci changes
Recent changes to sdhci broke SD on raspi. This change mirrors the logic to create the SD card device at the board level. Signed-off-by: Andrew Baumann <Andrew.Baumann@microsoft.com> Message-id: 1456351128-5560-1-git-send-email-Andrew.Baumann@microsoft.com Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/bcm2836.c')
-rw-r--r--hw/arm/bcm2836.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c
index 15c7622ad1..032143905e 100644
--- a/hw/arm/bcm2836.c
+++ b/hw/arm/bcm2836.c
@@ -73,6 +73,13 @@ static void bcm2836_realize(DeviceState *dev, Error **errp)
return;
}
+ object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->peripherals),
+ "sd-bus", &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+
sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->peripherals), 0,
BCM2836_PERI_BASE, 1);