Commit d7e44b86 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'mmc-v4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull two more MMC fixes from Ulf Hansson:
 "MMC core:
   - Fix block status codes

  MMC host:
   - sdhci-xenon: Fix SD bus voltage select"

* tag 'mmc-v4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-xenon: add set_power callback
  mmc: block: Fix block status codes
parents 381cce59 99c14fc3
...@@ -1213,7 +1213,7 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *mq, struct request *req) ...@@ -1213,7 +1213,7 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *mq, struct request *req)
break; break;
} }
mq_rq->drv_op_result = ret; mq_rq->drv_op_result = ret;
blk_end_request_all(req, ret); blk_end_request_all(req, ret ? BLK_STS_IOERR : BLK_STS_OK);
} }
static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req) static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
...@@ -1718,9 +1718,9 @@ static bool mmc_blk_rw_cmd_err(struct mmc_blk_data *md, struct mmc_card *card, ...@@ -1718,9 +1718,9 @@ static bool mmc_blk_rw_cmd_err(struct mmc_blk_data *md, struct mmc_card *card,
if (err) if (err)
req_pending = old_req_pending; req_pending = old_req_pending;
else else
req_pending = blk_end_request(req, 0, blocks << 9); req_pending = blk_end_request(req, BLK_STS_OK, blocks << 9);
} else { } else {
req_pending = blk_end_request(req, 0, brq->data.bytes_xfered); req_pending = blk_end_request(req, BLK_STS_OK, brq->data.bytes_xfered);
} }
return req_pending; return req_pending;
} }
......
...@@ -210,8 +210,27 @@ static void xenon_set_uhs_signaling(struct sdhci_host *host, ...@@ -210,8 +210,27 @@ static void xenon_set_uhs_signaling(struct sdhci_host *host,
sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2); sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2);
} }
static void xenon_set_power(struct sdhci_host *host, unsigned char mode,
unsigned short vdd)
{
struct mmc_host *mmc = host->mmc;
u8 pwr = host->pwr;
sdhci_set_power_noreg(host, mode, vdd);
if (host->pwr == pwr)
return;
if (host->pwr == 0)
vdd = 0;
if (!IS_ERR(mmc->supply.vmmc))
mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
}
static const struct sdhci_ops sdhci_xenon_ops = { static const struct sdhci_ops sdhci_xenon_ops = {
.set_clock = sdhci_set_clock, .set_clock = sdhci_set_clock,
.set_power = xenon_set_power,
.set_bus_width = sdhci_set_bus_width, .set_bus_width = sdhci_set_bus_width,
.reset = xenon_reset, .reset = xenon_reset,
.set_uhs_signaling = xenon_set_uhs_signaling, .set_uhs_signaling = xenon_set_uhs_signaling,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment