Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-20 20:04:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mmc: Drop unused mmc_send_tuning() cmd_error parameter

Browse source 
The cmd_error parameter is not used, remove it.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
This commit is contained in:
Marek Vasut 2024-02-20 09:36:23 +01:00 • committed by Jaehoon Chung
parent ee6cee125a
commit a3b2786651
10 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/mmc/am654_sdhci.c
View file

@ -390,7 +390,7 @@ static int am654_sdhci_execute_tuning(struct mmc *mmc, u8 opcode)
for (itap = 0; itap < ITAP_MAX; itap++) { for (itap = 0; itap < ITAP_MAX; itap++) {
am654_sdhci_write_itapdly(plat, itap); am654_sdhci_write_itapdly(plat, itap);
cur_val = !mmc_send_tuning(mmc, opcode, NULL); cur_val = !mmc_send_tuning(mmc, opcode);
if (cur_val && !prev_val) if (cur_val && !prev_val)
pass_window = itap; pass_window = itap;

2
drivers/mmc/fsl_esdhc.c
View file

@ -1123,7 +1123,7 @@ static int fsl_esdhc_execute_tuning(struct udevice *dev, uint32_t opcode)
esdhc_write32(&regs->irqstaten, IRQSTATEN_BRR); esdhc_write32(&regs->irqstaten, IRQSTATEN_BRR);
for (i = 0; i < MAX_TUNING_LOOP; i++) { for (i = 0; i < MAX_TUNING_LOOP; i++) {
mmc_send_tuning(mmc, opcode, NULL); mmc_send_tuning(mmc, opcode);
mdelay(1); mdelay(1);
val = esdhc_read32(&regs->autoc12err); val = esdhc_read32(&regs->autoc12err);

2
drivers/mmc/fsl_esdhc_imx.c
View file

@ -882,7 +882,7 @@ static int fsl_esdhc_execute_tuning(struct udevice *dev, uint32_t opcode)
esdhc_write32(&regs->mixctrl, val); esdhc_write32(&regs->mixctrl, val);
/* We are using STD tuning, no need to check return value */ /* We are using STD tuning, no need to check return value */
mmc_send_tuning(mmc, opcode, NULL); mmc_send_tuning(mmc, opcode);
ctrl = esdhc_read32(&regs->autoc12err); ctrl = esdhc_read32(&regs->autoc12err);
if ((!(ctrl & MIX_CTRL_EXE_TUNE)) && if ((!(ctrl & MIX_CTRL_EXE_TUNE)) &&

2
drivers/mmc/mmc.c
View file

@ -360,7 +360,7 @@ static const u8 tuning_blk_pattern_8bit[] = {
0xff, 0x77, 0x77, 0xff, 0x77, 0xbb, 0xdd, 0xee, 0xff, 0x77, 0x77, 0xff, 0x77, 0xbb, 0xdd, 0xee,
}; };
int mmc_send_tuning(struct mmc *mmc, u32 opcode, int *cmd_error) int mmc_send_tuning(struct mmc *mmc, u32 opcode)
{ {
struct mmc_cmd cmd; struct mmc_cmd cmd;
struct mmc_data data; struct mmc_data data;

21
drivers/mmc/mtk-sd.c
View file

@ -1131,7 +1131,7 @@ static int hs400_tune_response(struct udevice *dev, u32 opcode)
i << PAD_CMD_TUNE_RX_DLY3_S); i << PAD_CMD_TUNE_RX_DLY3_S);
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
mmc_send_tuning(mmc, opcode, &cmd_err); cmd_err = mmc_send_tuning(mmc, opcode);
if (!cmd_err) { if (!cmd_err) {
cmd_delay |= (1 << i); cmd_delay |= (1 << i);
} else { } else {
@ -1181,7 +1181,7 @@ static int msdc_tune_response(struct udevice *dev, u32 opcode)
i << MSDC_PAD_TUNE_CMDRDLY_S); i << MSDC_PAD_TUNE_CMDRDLY_S);
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
mmc_send_tuning(mmc, opcode, &cmd_err); cmd_err = mmc_send_tuning(mmc, opcode);
if (!cmd_err) { if (!cmd_err) {
rise_delay |= (1 << i); rise_delay |= (1 << i);
} else { } else {
@ -1203,7 +1203,7 @@ static int msdc_tune_response(struct udevice *dev, u32 opcode)
i << MSDC_PAD_TUNE_CMDRDLY_S); i << MSDC_PAD_TUNE_CMDRDLY_S);
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
mmc_send_tuning(mmc, opcode, &cmd_err); cmd_err = mmc_send_tuning(mmc, opcode);
if (!cmd_err) { if (!cmd_err) {
fall_delay |= (1 << i); fall_delay |= (1 << i);
} else { } else {
@ -1238,7 +1238,7 @@ skip_fall:
clrsetbits_le32(tune_reg, MSDC_PAD_TUNE_CMDRRDLY_M, clrsetbits_le32(tune_reg, MSDC_PAD_TUNE_CMDRRDLY_M,
i << MSDC_PAD_TUNE_CMDRRDLY_S); i << MSDC_PAD_TUNE_CMDRRDLY_S);
mmc_send_tuning(mmc, opcode, &cmd_err); cmd_err = mmc_send_tuning(mmc, opcode);
if (!cmd_err) if (!cmd_err)
internal_delay |= (1 << i); internal_delay |= (1 << i);
} }
@ -1264,7 +1264,6 @@ static int msdc_tune_data(struct udevice *dev, u32 opcode)
struct msdc_delay_phase final_rise_delay, final_fall_delay = { 0, }; struct msdc_delay_phase final_rise_delay, final_fall_delay = { 0, };
u8 final_delay, final_maxlen; u8 final_delay, final_maxlen;
void __iomem *tune_reg = &host->base->pad_tune; void __iomem *tune_reg = &host->base->pad_tune;
int cmd_err;
int i, ret; int i, ret;
if (host->dev_comp->pad_tune0) if (host->dev_comp->pad_tune0)
@ -1277,10 +1276,10 @@ static int msdc_tune_data(struct udevice *dev, u32 opcode)
clrsetbits_le32(tune_reg, MSDC_PAD_TUNE_DATRRDLY_M, clrsetbits_le32(tune_reg, MSDC_PAD_TUNE_DATRRDLY_M,
i << MSDC_PAD_TUNE_DATRRDLY_S); i << MSDC_PAD_TUNE_DATRRDLY_S);
ret = mmc_send_tuning(mmc, opcode, &cmd_err); ret = mmc_send_tuning(mmc, opcode);
if (!ret) { if (!ret) {
rise_delay |= (1 << i); rise_delay |= (1 << i);
} else if (cmd_err) { } else {
/* in this case, retune response is needed */ /* in this case, retune response is needed */
ret = msdc_tune_response(dev, opcode); ret = msdc_tune_response(dev, opcode);
if (ret) if (ret)
@ -1300,10 +1299,10 @@ static int msdc_tune_data(struct udevice *dev, u32 opcode)
clrsetbits_le32(tune_reg, MSDC_PAD_TUNE_DATRRDLY_M, clrsetbits_le32(tune_reg, MSDC_PAD_TUNE_DATRRDLY_M,
i << MSDC_PAD_TUNE_DATRRDLY_S); i << MSDC_PAD_TUNE_DATRRDLY_S);
ret = mmc_send_tuning(mmc, opcode, &cmd_err); ret = mmc_send_tuning(mmc, opcode);
if (!ret) { if (!ret) {
fall_delay |= (1 << i); fall_delay |= (1 << i);
} else if (cmd_err) { } else {
/* in this case, retune response is needed */ /* in this case, retune response is needed */
ret = msdc_tune_response(dev, opcode); ret = msdc_tune_response(dev, opcode);
if (ret) if (ret)
@ -1362,7 +1361,7 @@ static int msdc_tune_together(struct udevice *dev, u32 opcode)
for (i = 0; i < PAD_DELAY_MAX; i++) { for (i = 0; i < PAD_DELAY_MAX; i++) {
msdc_set_cmd_delay(host, i); msdc_set_cmd_delay(host, i);
msdc_set_data_delay(host, i); msdc_set_data_delay(host, i);
ret = mmc_send_tuning(mmc, opcode, NULL); ret = mmc_send_tuning(mmc, opcode);
if (!ret) if (!ret)
rise_delay |= (1 << i); rise_delay |= (1 << i);
} }
@ -1378,7 +1377,7 @@ static int msdc_tune_together(struct udevice *dev, u32 opcode)
for (i = 0; i < PAD_DELAY_MAX; i++) { for (i = 0; i < PAD_DELAY_MAX; i++) {
msdc_set_cmd_delay(host, i); msdc_set_cmd_delay(host, i);
msdc_set_data_delay(host, i); msdc_set_data_delay(host, i);
ret = mmc_send_tuning(mmc, opcode, NULL); ret = mmc_send_tuning(mmc, opcode);
if (!ret) if (!ret)
fall_delay |= (1 << i); fall_delay |= (1 << i);
} }

8
drivers/mmc/octeontx_hsmmc.c
View file

@ -1653,6 +1653,12 @@ static int octeontx_mmc_test_cmd(struct mmc *mmc, u32 opcode, int *statp)
return err; return err;
} }
static int octeontx_mmc_send_tuning(struct mmc *mmc, u32 opcode, int *error)
{
*error = 0;
return mmc_send_tuning(mmc, opcode);
}
static int octeontx_mmc_test_get_ext_csd(struct mmc *mmc, u32 opcode, static int octeontx_mmc_test_get_ext_csd(struct mmc *mmc, u32 opcode,
int *statp) int *statp)
{ {
@ -2006,7 +2012,7 @@ struct adj adj[] = {
{ "CMD_IN", 48, octeontx_mmc_test_cmd, MMC_CMD_SEND_STATUS, { "CMD_IN", 48, octeontx_mmc_test_cmd, MMC_CMD_SEND_STATUS,
false, false, false, 2, }, false, false, false, 2, },
/* { "CMD_OUT", 32, octeontx_mmc_test_cmd, MMC_CMD_SEND_STATUS, },*/ /* { "CMD_OUT", 32, octeontx_mmc_test_cmd, MMC_CMD_SEND_STATUS, },*/
{ "DATA_IN(HS200)", 16, mmc_send_tuning, { "DATA_IN(HS200)", 16, octeontx_mmc_send_tuning,
MMC_CMD_SEND_TUNING_BLOCK_HS200, false, true, false, 2, }, MMC_CMD_SEND_TUNING_BLOCK_HS200, false, true, false, 2, },
{ "DATA_IN", 16, octeontx_mmc_test_get_ext_csd, 0, false, false, { "DATA_IN", 16, octeontx_mmc_test_get_ext_csd, 0, false, false,
true, 2, }, true, 2, },

6
drivers/mmc/omap_hsmmc.c
View file

@ -666,7 +666,7 @@ static int omap_hsmmc_execute_tuning(struct udevice *dev, uint opcode)
while (phase_delay <= MAX_PHASE_DELAY) { while (phase_delay <= MAX_PHASE_DELAY) {
omap_hsmmc_set_dll(mmc, phase_delay); omap_hsmmc_set_dll(mmc, phase_delay);
cur_match = !mmc_send_tuning(mmc, opcode, NULL); cur_match = !mmc_send_tuning(mmc, opcode);
if (cur_match) { if (cur_match) {
if (prev_match) { if (prev_match) {
@ -731,7 +731,7 @@ static int omap_hsmmc_execute_tuning(struct udevice *dev, uint opcode)
*/ */
for (i = 3; i <= 10; i++) { for (i = 3; i <= 10; i++) {
omap_hsmmc_set_dll(mmc, phase_delay + i); omap_hsmmc_set_dll(mmc, phase_delay + i);
if (mmc_send_tuning(mmc, opcode, NULL)) { if (mmc_send_tuning(mmc, opcode)) {
if (temperature < 10000) if (temperature < 10000)
phase_delay += i + 6; phase_delay += i + 6;
else if (temperature < 20000) else if (temperature < 20000)
@ -749,7 +749,7 @@ static int omap_hsmmc_execute_tuning(struct udevice *dev, uint opcode)
for (i = 2; i >= -10; i--) { for (i = 2; i >= -10; i--) {
omap_hsmmc_set_dll(mmc, phase_delay + i); omap_hsmmc_set_dll(mmc, phase_delay + i);
if (mmc_send_tuning(mmc, opcode, NULL)) { if (mmc_send_tuning(mmc, opcode)) {
if (temperature < 10000) if (temperature < 10000)
phase_delay += i + 12; phase_delay += i + 12;
else if (temperature < 20000) else if (temperature < 20000)

2
drivers/mmc/renesas-sdhi.c
View file

@ -605,7 +605,7 @@ int renesas_sdhi_execute_tuning(struct udevice *dev, uint opcode)
caps = priv->caps; caps = priv->caps;
priv->caps &= ~TMIO_SD_CAP_DMA_INTERNAL; priv->caps &= ~TMIO_SD_CAP_DMA_INTERNAL;
ret = mmc_send_tuning(mmc, opcode, NULL); ret = mmc_send_tuning(mmc, opcode);
priv->caps = caps; priv->caps = caps;

2
drivers/mmc/sdhci-cadence.c
View file

@ -224,7 +224,7 @@ static int __maybe_unused sdhci_cdns_execute_tuning(struct udevice *dev,
for (i = 0; i < SDHCI_CDNS_MAX_TUNING_LOOP; i++) { for (i = 0; i < SDHCI_CDNS_MAX_TUNING_LOOP; i++) {
if (sdhci_cdns_set_tune_val(plat, i) || if (sdhci_cdns_set_tune_val(plat, i) ||
mmc_send_tuning(mmc, opcode, NULL)) { /* bad */ mmc_send_tuning(mmc, opcode)) { /* bad */
cur_streak = 0; cur_streak = 0;
} else { /* good */ } else { /* good */
cur_streak++; cur_streak++;

2
include/mmc.h
View file

@ -795,7 +795,7 @@ int mmc_unbind(struct udevice *dev);
int mmc_initialize(struct bd_info *bis); int mmc_initialize(struct bd_info *bis);
int mmc_init_device(int num); int mmc_init_device(int num);
int mmc_init(struct mmc *mmc); int mmc_init(struct mmc *mmc);
int mmc_send_tuning(struct mmc *mmc, u32 opcode, int *cmd_error); int mmc_send_tuning(struct mmc *mmc, u32 opcode);
int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data); int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data);
int mmc_deinit(struct mmc *mmc); int mmc_deinit(struct mmc *mmc);