With incoming tuning support, the SDHCI flags computed inside
sdhci_transfer_* will depend on the specific MMC command that's due to
be sent, therefore add the command as parameter to the functions.
Signed-off-by: Ahmad Fatoum <a.fat...@pengutronix.de>
---
drivers/mci/am654-sdhci.c | 2 +-
drivers/mci/arasan-sdhci.c | 2 +-
drivers/mci/atmel-sdhci-common.c | 2 +-
drivers/mci/dwcmshc-sdhci.c | 2 +-
drivers/mci/imx-esdhc-common.c | 4 ++--
drivers/mci/mci-bcm2835.c | 2 +-
drivers/mci/rockchip-dwcmshc-sdhci.c | 2 +-
drivers/mci/sdhci.c | 14 ++++++++------
drivers/mci/sdhci.h | 10 ++++++----
9 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/drivers/mci/am654-sdhci.c b/drivers/mci/am654-sdhci.c
index 20dd03b83a9a..13c8876573c7 100644
--- a/drivers/mci/am654-sdhci.c
+++ b/drivers/mci/am654-sdhci.c
@@ -490,7 +490,7 @@ static int am654_sdhci_send_cmd(struct mci_host *mci,
struct mci_cmd *cmd,
sdhci_read_response(&host->sdhci, cmd);
sdhci_write32(&host->sdhci, SDHCI_INT_STATUS, SDHCI_INT_CMD_COMPLETE);
- ret = sdhci_transfer_data_dma(&host->sdhci, data, dma);
+ ret = sdhci_transfer_data_dma(&host->sdhci, cmd, data, dma);
error:
if (ret) {
diff --git a/drivers/mci/arasan-sdhci.c b/drivers/mci/arasan-sdhci.c
index 879339572b11..5774928e5a97 100644
--- a/drivers/mci/arasan-sdhci.c
+++ b/drivers/mci/arasan-sdhci.c
@@ -293,7 +293,7 @@ static int arasan_sdhci_send_cmd(struct mci_host *mci,
struct mci_cmd *cmd,
sdhci_write32(&host->sdhci, SDHCI_INT_STATUS, SDHCI_INT_CMD_COMPLETE);
if (data)
- ret = sdhci_transfer_data_dma(&host->sdhci, data, dma);
+ ret = sdhci_transfer_data_dma(&host->sdhci, cmd, data, dma);
error:
if (ret) {
diff --git a/drivers/mci/atmel-sdhci-common.c b/drivers/mci/atmel-sdhci-common.c
index 12b71bc2ded3..a3ed2730e527 100644
--- a/drivers/mci/atmel-sdhci-common.c
+++ b/drivers/mci/atmel-sdhci-common.c
@@ -128,7 +128,7 @@ int at91_sdhci_send_command(struct at91_sdhci *host, struct
mci_cmd *cmd,
sdhci_write32(sdhci, SDHCI_INT_STATUS, mask);
if (data)
- sdhci_transfer_data_pio(sdhci, data);
+ sdhci_transfer_data_pio(sdhci, cmd, data);
udelay(1000);
diff --git a/drivers/mci/dwcmshc-sdhci.c b/drivers/mci/dwcmshc-sdhci.c
index f6d559e393d4..174cc3f76816 100644
--- a/drivers/mci/dwcmshc-sdhci.c
+++ b/drivers/mci/dwcmshc-sdhci.c
@@ -160,7 +160,7 @@ static int do_send_cmd(struct mci_host *mci, struct mci_cmd
*cmd,
sdhci_read_response(&host->sdhci, cmd);
- ret = sdhci_transfer_data(&host->sdhci, data, dma);
+ ret = sdhci_transfer_data(&host->sdhci, cmd, data, dma);
error:
if (ret) {
sdhci_reset(&host->sdhci, SDHCI_RESET_CMD);
diff --git a/drivers/mci/imx-esdhc-common.c b/drivers/mci/imx-esdhc-common.c
index 18a9f3be7239..9526bcfea8c1 100644
--- a/drivers/mci/imx-esdhc-common.c
+++ b/drivers/mci/imx-esdhc-common.c
@@ -159,9 +159,9 @@ int __esdhc_send_cmd(struct fsl_esdhc_host *host, struct
mci_cmd *cmd,
/* Wait until all of the blocks are transferred */
if (data) {
if (esdhc_use_pio_mode())
- ret = sdhci_transfer_data_pio(&host->sdhci, data);
+ ret = sdhci_transfer_data_pio(&host->sdhci, cmd, data);
else
- ret = sdhci_transfer_data_dma(&host->sdhci, data, dma);
+ ret = sdhci_transfer_data_dma(&host->sdhci, cmd, data,
dma);
if (ret)
return ret;
diff --git a/drivers/mci/mci-bcm2835.c b/drivers/mci/mci-bcm2835.c
index ff4c6d803c32..cd4c1b866ca1 100644
--- a/drivers/mci/mci-bcm2835.c
+++ b/drivers/mci/mci-bcm2835.c
@@ -158,7 +158,7 @@ static int bcm2835_mci_request(struct mci_host *mci, struct
mci_cmd *cmd,
}
if (!ret && data)
- ret = sdhci_transfer_data_pio(&host->sdhci, data);
+ ret = sdhci_transfer_data_pio(&host->sdhci, cmd, data);
sdhci_write32(&host->sdhci, SDHCI_INT_STATUS, 0xFFFFFFFF);
if (ret) {
diff --git a/drivers/mci/rockchip-dwcmshc-sdhci.c
b/drivers/mci/rockchip-dwcmshc-sdhci.c
index a7da64f4d7db..2f8d5ec140b5 100644
--- a/drivers/mci/rockchip-dwcmshc-sdhci.c
+++ b/drivers/mci/rockchip-dwcmshc-sdhci.c
@@ -277,7 +277,7 @@ static int rk_sdhci_send_cmd(struct mci_host *mci, struct
mci_cmd *cmd,
sdhci_read_response(&host->sdhci, cmd);
sdhci_write32(&host->sdhci, SDHCI_INT_STATUS, SDHCI_INT_CMD_COMPLETE);
- ret = sdhci_transfer_data_dma(&host->sdhci, data, dma);
+ ret = sdhci_transfer_data_dma(&host->sdhci, cmd, data, dma);
error:
if (ret) {
diff --git a/drivers/mci/sdhci.c b/drivers/mci/sdhci.c
index 84acb3d163b5..55709e831a28 100644
--- a/drivers/mci/sdhci.c
+++ b/drivers/mci/sdhci.c
@@ -524,8 +524,8 @@ void sdhci_teardown_data(struct sdhci *sdhci,
dma_unmap_single(dev, dma, nbytes, DMA_TO_DEVICE);
}
-int sdhci_transfer_data_dma(struct sdhci *sdhci, struct mci_data *data,
- dma_addr_t dma)
+int sdhci_transfer_data_dma(struct sdhci *sdhci, struct mci_cmd *cmd,
+ struct mci_data *data, dma_addr_t dma)
{
struct device *dev = sdhci_dev(sdhci);
u64 start;
@@ -594,7 +594,8 @@ int sdhci_transfer_data_dma(struct sdhci *sdhci, struct
mci_data *data,
return ret;
}
-int sdhci_transfer_data_pio(struct sdhci *sdhci, struct mci_data *data)
+int sdhci_transfer_data_pio(struct sdhci *sdhci, struct mci_cmd *cmd,
+ struct mci_data *data)
{
unsigned int block = 0;
u32 stat, prs;
@@ -635,7 +636,8 @@ int sdhci_transfer_data_pio(struct sdhci *sdhci, struct
mci_data *data)
return 0;
}
-int sdhci_transfer_data(struct sdhci *sdhci, struct mci_data *data, dma_addr_t
dma)
+int sdhci_transfer_data(struct sdhci *sdhci, struct mci_cmd *cmd,
+ struct mci_data *data, dma_addr_t dma)
{
struct device *dev = sdhci_dev(sdhci);
@@ -643,9 +645,9 @@ int sdhci_transfer_data(struct sdhci *sdhci, struct
mci_data *data, dma_addr_t d
return 0;
if (dma_mapping_error(dev, dma))
- return sdhci_transfer_data_pio(sdhci, data);
+ return sdhci_transfer_data_pio(sdhci, cmd, data);
else
- return sdhci_transfer_data_dma(sdhci, data, dma);
+ return sdhci_transfer_data_dma(sdhci, cmd, data, dma);
}
int sdhci_reset(struct sdhci *sdhci, u8 mask)
diff --git a/drivers/mci/sdhci.h b/drivers/mci/sdhci.h
index 61058ca030a8..12ab8d148144 100644
--- a/drivers/mci/sdhci.h
+++ b/drivers/mci/sdhci.h
@@ -326,10 +326,12 @@ void sdhci_set_cmd_xfer_mode(struct sdhci *host, struct
mci_cmd *cmd,
void sdhci_setup_data_pio(struct sdhci *sdhci, struct mci_data *data);
void sdhci_setup_data_dma(struct sdhci *sdhci, struct mci_data *data,
dma_addr_t *dma);
void sdhci_teardown_data(struct sdhci *sdhci, struct mci_data *data,
dma_addr_t dma);
-int sdhci_transfer_data(struct sdhci *sdhci, struct mci_data *data, dma_addr_t
dma);
-int sdhci_transfer_data_pio(struct sdhci *sdhci, struct mci_data *data);
-int sdhci_transfer_data_dma(struct sdhci *sdhci, struct mci_data *data,
- dma_addr_t dma);
+int sdhci_transfer_data(struct sdhci *sdhci, struct mci_cmd *cmd,
+ struct mci_data *data, dma_addr_t dma);
+int sdhci_transfer_data_pio(struct sdhci *sdhci, struct mci_cmd *cmd,
+ struct mci_data *data);
+int sdhci_transfer_data_dma(struct sdhci *sdhci, struct mci_cmd *cmd,
+ struct mci_data *data, dma_addr_t dma);
int sdhci_reset(struct sdhci *sdhci, u8 mask);
u16 sdhci_calc_clk(struct sdhci *host, unsigned int clock,
unsigned int *actual_clock, unsigned int input_clock);
--
2.39.5
