projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-rockchip-20200220' of https://gitlab.denx.de/u-boot/custodians...
[oweals/u-boot.git]
/
drivers
/
mmc
/
rpmb.c
diff --git
a/drivers/mmc/rpmb.c
b/drivers/mmc/rpmb.c
index 33371fe562e1124e46215104cca0d9092b353ce5..ee6dbe30db5e0bcb951c6f8bf8fa0c8f29f7f8cb 100644
(file)
--- a/
drivers/mmc/rpmb.c
+++ b/
drivers/mmc/rpmb.c
@@
-11,6
+11,7
@@
#include <common.h>
#include <memalign.h>
#include <mmc.h>
#include <common.h>
#include <memalign.h>
#include <mmc.h>
+#include <sdhci.h>
#include <u-boot/sha256.h>
#include "mmc_private.h"
#include <u-boot/sha256.h>
#include "mmc_private.h"
@@
-91,6
+92,7
@@
static int mmc_rpmb_request(struct mmc *mmc, const struct s_rpmb *s,
{
struct mmc_cmd cmd = {0};
struct mmc_data data;
{
struct mmc_cmd cmd = {0};
struct mmc_data data;
+ struct sdhci_host *host = mmc->priv;
int ret;
ret = mmc_set_blockcount(mmc, count, is_rel_write);
int ret;
ret = mmc_set_blockcount(mmc, count, is_rel_write);
@@
-105,6
+107,9
@@
static int mmc_rpmb_request(struct mmc *mmc, const struct s_rpmb *s,
cmd.cmdarg = 0;
cmd.resp_type = MMC_RSP_R1;
cmd.cmdarg = 0;
cmd.resp_type = MMC_RSP_R1;
+ if (host->quirks & SDHCI_QUIRK_BROKEN_R1B)
+ cmd.resp_type = MMC_RSP_R1;
+
data.src = (const char *)s;
data.blocks = 1;
data.blocksize = MMC_MAX_BLOCK_LEN;
data.src = (const char *)s;
data.blocks = 1;
data.blocksize = MMC_MAX_BLOCK_LEN;