Message ID | 20171229174933.1781-14-f4bug@amsat.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, Dec 29, 2017 at 9:49 AM, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> Alistair > --- > 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 df240ea046..b7475a1b7b 100644 > --- a/hw/sd/sdhci-internal.h > +++ b/hw/sd/sdhci-internal.h > @@ -176,7 +176,7 @@ FIELD(SDHC_PRNSTS, WRITE_PROTECT, 19, 1); > #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 b5ecbc9969..604ad525f6 100644 > --- a/hw/sd/sdhci.c > +++ b/hw/sd/sdhci.c > @@ -903,7 +903,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 > >
diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index df240ea046..b7475a1b7b 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -176,7 +176,7 @@ FIELD(SDHC_PRNSTS, WRITE_PROTECT, 19, 1); #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 b5ecbc9969..604ad525f6 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -903,7 +903,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:
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/sd/sdhci-internal.h | 2 +- hw/sd/sdhci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)