From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePIpO-0005ma-Ih for qemu-devel@nongnu.org; Wed, 13 Dec 2017 21:00:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePIpL-0003Tf-H6 for qemu-devel@nongnu.org; Wed, 13 Dec 2017 21:00:50 -0500 Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Wed, 13 Dec 2017 23:00:19 -0300 Message-Id: <20171214020025.4004-3-f4bug@amsat.org> In-Reply-To: <20171214020025.4004-1-f4bug@amsat.org> References: <20171214020025.4004-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 2/8] sdhci: some ARM boards do support SD_HOST_SPECv3_VERS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alistair Francis , "Edgar E . Iglesias" , Prasad J Pandit , Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Andrzej Zaborowski , Andrew Baumann , Andrey Smirnov , Andrey Yurovsky , Clement Deschamps , Jean-Christophe Dubois , =?UTF-8?q?Gr=C3=A9gory=20Estrade?= , Igor Mitsyanko , Krzysztof Kozlowski Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, qemu-arm@nongnu.org, Peter Crosthwaite , Sai Pavan Boddu , "Edgar E. Iglesias" set the property with object_property_set_uint() or qdev_prop_set_uint8(). [Zynq part based on a patch from Alistair Francis from qemu/xilinx tag xilinx-v2015.2] Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/bcm2835_peripherals.c | 7 +++++++ hw/arm/fsl-imx6.c | 6 ++++++ hw/arm/xilinx_zynq.c | 2 ++ 3 files changed, 15 insertions(+) diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c index 60a0eec4d1..e686725015 100644 --- a/hw/arm/bcm2835_peripherals.c +++ b/hw/arm/bcm2835_peripherals.c @@ -264,6 +264,13 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) return; } + object_property_set_uint(OBJECT(&s->sdhci), SD_HOST_SPECv3_VERS, + "sd-spec-version", &err); + if (err) { + error_propagate(errp, err); + return; + } + object_property_set_bool(OBJECT(&s->sdhci), true, "realized", &err); if (err) { error_propagate(errp, err); diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index 59ef33efa9..c474e707af 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -348,6 +348,12 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) { FSL_IMX6_uSDHC4_ADDR, FSL_IMX6_uSDHC4_IRQ }, }; + object_property_set_uint(OBJECT(&s->esdhc[i]), SD_HOST_SPECv3_VERS, + "sd-spec-version", &err); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_bool(OBJECT(&s->esdhc[i]), true, "realized", &err); if (err) { error_propagate(errp, err); diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 9275ae6daf..0292feea74 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -250,6 +250,7 @@ static void zynq_init(MachineState *machine) dev = qdev_create(NULL, TYPE_SYSBUS_SDHCI); qdev_prop_set_string(dev, "sd-bus-name", "sd.0"); + qdev_prop_set_uint8(dev, "sd-spec-version", SD_HOST_SPECv3_VERS); qdev_init_nofail(dev); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xE0100000); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[56-IRQ_OFFSET]); @@ -262,6 +263,7 @@ static void zynq_init(MachineState *machine) object_property_set_bool(OBJECT(carddev), true, "realized", &error_fatal); dev = qdev_create(NULL, TYPE_SYSBUS_SDHCI); + qdev_prop_set_uint8(dev, "sd-spec-version", SD_HOST_SPECv3_VERS); qdev_prop_set_string(dev, "sd-bus-name", "sd.1"); qdev_init_nofail(dev); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xE0101000); -- 2.15.1