All SDHCI consumers have been upgraded to set correct properties.
Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Reviewed-by: Alistair Francis <alistair.fran...@xilinx.com>
---
hw/sd/sdhci.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index ec7430c83c..651f523089 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1184,7 +1184,6 @@ static inline unsigned int sdhci_get_fifolen(SDHCIState
*s)
static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp)
{
- uint64_t capab;
Error *local_err = NULL;
switch (s->spec_version) {
@@ -1196,20 +1195,11 @@ static void sdhci_init_readonly_registers(SDHCIState
*s, Error **errp)
}
s->version = (SDHC_HCVER_VENDOR << 8) | (s->spec_version - 1);
- capab = sdhci_init_capareg(s, &local_err);
+ s->capareg = sdhci_init_capareg(s, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
}
- if (s->capareg == UINT64_MAX) {
- s->capareg = capab;
- } else {
- capab = s->capareg & ~capab;
- if (capab) {
- error_setg(errp, "missing capability mask: 0x%" PRIx64, capab);
- return;
- }
- }
}
/* --- qdev common --- */
@@ -1239,9 +1229,6 @@ static void sdhci_init_readonly_registers(SDHCIState *s,
Error **errp)
DEFINE_PROP_UINT8("bus-speed", _state, cap.sdr, 0), \
DEFINE_PROP_UINT8("driver-strength", _state, cap.strength, 0), \
\
- /* deprecated: Capabilities registers provide information on supported
- * features of this specific host controller implementation */ \
- DEFINE_PROP_UINT64("capareg", _state, capareg, UINT64_MAX), \
DEFINE_PROP_UINT64("maxcurr", _state, maxcurr, 0)
static void sdhci_initfn(SDHCIState *s)
--
2.15.1
