From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: Alistair Francis <alistair.francis@xilinx.com>,
Peter Maydell <peter.maydell@linaro.org>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-devel@nongnu.org,
"Edgar E . Iglesias" <edgar.iglesias@xilinx.com>,
"Andrey Smirnov" <andrew.smirnov@gmail.com>,
"Kevin O'Connor" <kevin@koconnor.net>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [Qemu-devel] [PATCH v7 10/14] sdhci: rename the SDHC_CAPAB register
Date: Sat, 13 Jan 2018 02:07:13 -0300 [thread overview]
Message-ID: <20180113050717.22969-11-f4bug@amsat.org> (raw)
In-Reply-To: <20180113050717.22969-1-f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
---
hw/sd/sdhci-internal.h | 2 +-
hw/sd/sdhci.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h
index e941bc2386..fc807f08f3 100644
--- a/hw/sd/sdhci-internal.h
+++ b/hw/sd/sdhci-internal.h
@@ -174,7 +174,7 @@
#define SDHC_ACMD12ERRSTS 0x3C
/* HWInit Capabilities Register 0x05E80080 */
-#define SDHC_CAPAREG 0x40
+#define SDHC_CAPAB 0x40
#define SDHC_CAN_DO_DMA 0x00400000
#define SDHC_CAN_DO_ADMA2 0x00080000
#define SDHC_CAN_DO_ADMA1 0x00100000
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index e8f4a3478a..3df33f5e93 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -898,7 +898,7 @@ static uint64_t sdhci_read(void *opaque, hwaddr offset, unsigned size)
case SDHC_ACMD12ERRSTS:
ret = s->acmd12errsts;
break;
- case SDHC_CAPAREG:
+ case SDHC_CAPAB:
ret = s->capareg;
break;
case SDHC_MAXCURR:
--
2.15.1
next prev parent reply other threads:[~2018-01-13 5:08 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-13 5:07 [Qemu-devel] [PATCH v7 00/14] SDHCI: housekeeping (part 1) Philippe Mathieu-Daudé
2018-01-13 5:07 ` [Qemu-devel] [PATCH v7 01/14] sdhci: clean up includes Philippe Mathieu-Daudé
2018-01-13 5:07 ` [Qemu-devel] [PATCH v7 02/14] sdhci: remove dead code Philippe Mathieu-Daudé
2018-01-13 5:07 ` [Qemu-devel] [PATCH v7 03/14] sdhci: refactor same sysbus/pci properties into a common one Philippe Mathieu-Daudé
2018-01-13 5:07 ` [Qemu-devel] [PATCH v7 04/14] sdhci: refactor common sysbus/pci class_init() into sdhci_common_class_init() Philippe Mathieu-Daudé
2018-01-13 5:07 ` [Qemu-devel] [PATCH v7 05/14] sdhci: refactor common sysbus/pci realize() into sdhci_common_realize() Philippe Mathieu-Daudé
2018-01-13 5:07 ` [Qemu-devel] [PATCH v7 06/14] sdhci: refactor common sysbus/pci unrealize() into sdhci_common_unrealize() Philippe Mathieu-Daudé
2018-01-13 5:07 ` [Qemu-devel] [PATCH v7 07/14] sdhci: use qemu_log_mask(UNIMP) instead of fprintf() Philippe Mathieu-Daudé
2018-01-13 5:07 ` [Qemu-devel] [PATCH v7 08/14] sdhci: convert the DPRINT() calls into trace events Philippe Mathieu-Daudé
2018-01-13 5:07 ` [Qemu-devel] [PATCH v7 09/14] sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h" Philippe Mathieu-Daudé
2018-01-13 5:07 ` Philippe Mathieu-Daudé [this message]
2018-01-13 5:07 ` [Qemu-devel] [PATCH v7 11/14] sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only Philippe Mathieu-Daudé
2018-01-13 5:07 ` [Qemu-devel] [PATCH v7 12/14] sdhci: Implement write method of ACMD12ERRSTS register Philippe Mathieu-Daudé
2018-01-13 5:07 ` [Qemu-devel] [PATCH v7 13/14] sdhci: fix the PCI device, using the PCI address space for DMA Philippe Mathieu-Daudé
2018-01-15 13:50 ` Peter Maydell
2018-01-13 5:07 ` [Qemu-devel] [PATCH v7 14/14] sdhci: add a 'dma' property to the sysbus devices Philippe Mathieu-Daudé
2018-01-15 13:51 ` [Qemu-devel] [PATCH v7 00/14] SDHCI: housekeeping (part 1) Peter Maydell
2018-01-15 14:04 ` Philippe Mathieu-Daudé
2018-01-15 14:47 ` Peter Maydell
2018-01-15 15:17 ` Philippe Mathieu-Daudé
2018-01-15 16:22 ` Paolo Bonzini
2018-01-15 16:24 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180113050717.22969-11-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=alistair.francis@xilinx.com \
--cc=andrew.smirnov@gmail.com \
--cc=edgar.iglesias@xilinx.com \
--cc=kevin@koconnor.net \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).