[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v6 16/21] sdhci: remove the deprecated 'capareg' prope
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-arm] [PATCH v6 16/21] sdhci: remove the deprecated 'capareg' property |
Date: |
Thu, 11 Jan 2018 17:56:21 -0300 |
All SDHCI consumers have been upgraded to set correct properties.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
---
hw/sd/sdhci.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 6593f5d8b5..8e4805c84e 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1190,9 +1190,7 @@ static void sdhci_init_readonly_registers(SDHCIState *s,
Error **errp)
}
s->version = (SDHC_HCVER_VENDOR << 8) | (s->spec_version - 1);
- if (s->capareg == UINT64_MAX) {
- sdhci_init_capareg(s, errp);
- }
+ sdhci_init_capareg(s, errp);
}
static void sdhci_initfn(SDHCIState *s)
@@ -1338,9 +1336,6 @@ static Property sdhci_properties[] = {
DEFINE_PROP_UINT8("bus-speed", SDHCIState, cap.sdr, 0),
DEFINE_PROP_UINT8("driver-strength", SDHCIState, cap.strength, 0),
- /* capareg: deprecated */
- DEFINE_PROP_UINT64("capareg", SDHCIState, capareg, UINT64_MAX),
-
DEFINE_PROP_UINT64("maxcurr", SDHCIState, maxcurr, 0),
DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_quirk,
false),
--
2.15.1
- [Qemu-arm] [PATCH v6 09/21] sdhci: rename the hostctl1 register, (continued)
- [Qemu-arm] [PATCH v6 09/21] sdhci: rename the hostctl1 register, Philippe Mathieu-Daudé, 2018/01/11
- [Qemu-arm] [PATCH v6 10/21] hw/arm/exynos4210: implement SDHCI Spec v2, Philippe Mathieu-Daudé, 2018/01/11
- [Qemu-arm] [PATCH v6 11/21] hw/arm/xilinx_zynq: implement SDHCI Spec v2, Philippe Mathieu-Daudé, 2018/01/11
- [Qemu-arm] [PATCH v6 12/21] hw/arm/bcm2835_peripherals: implement SDHCI Spec v3, Philippe Mathieu-Daudé, 2018/01/11
- [Qemu-arm] [PATCH v6 13/21] hw/arm/bcm2835_peripherals: change maximum block size to 1kB, Philippe Mathieu-Daudé, 2018/01/11
- [Qemu-arm] [PATCH v6 14/21] hw/arm/fsl-imx6: implement SDHCI Spec v3, Philippe Mathieu-Daudé, 2018/01/11
- [Qemu-arm] [PATCH v6 15/21] hw/arm/xilinx_zynqmp: implement SDHCI Spec v3, Philippe Mathieu-Daudé, 2018/01/11
- [Qemu-arm] [PATCH v6 16/21] sdhci: remove the deprecated 'capareg' property,
Philippe Mathieu-Daudé <=
- [Qemu-arm] [PATCH v6 17/21] sdhci: add Spec v4.2 register definitions, Philippe Mathieu-Daudé, 2018/01/11
- [Qemu-arm] [PATCH v6 18/21] sdhci: implement the Host Control 2 register for the tunning sequence, Philippe Mathieu-Daudé, 2018/01/11
- [Qemu-arm] [PATCH v6 19/21] sdbus: add trace events, Philippe Mathieu-Daudé, 2018/01/11
- [Qemu-arm] [PATCH v6 20/21] sdhci: implement UHS-I voltage switch, Philippe Mathieu-Daudé, 2018/01/11
- [Qemu-arm] [PATCH v6 21/21] sdhci: implement CMD/DAT[] fields in the Present State register, Philippe Mathieu-Daudé, 2018/01/11