Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mmc-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC fixes from Ulf Hansson:
- meson-gx: Revert to earlier tuning process
- bcm2835: Don't overwrite max frequency unconditionally
* tag 'mmc-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
mmc: bcm2835: Don't overwrite max frequency unconditionally
Revert "mmc: meson-gx: include tx phase in the tuning process"
+3
-19
+2
-1
drivers/mmc/host/bcm2835.c
+2
-1
drivers/mmc/host/bcm2835.c
···
1265
1265
char pio_limit_string[20];
1266
1266
int ret;
1267
1267
1268
-
mmc->f_max = host->max_clk;
1268
+
if (!mmc->f_max || mmc->f_max > host->max_clk)
1269
+
mmc->f_max = host->max_clk;
1269
1270
mmc->f_min = host->max_clk / SDCDIV_MAX_CDIV;
1270
1271
1271
1272
mmc->max_busy_timeout = ~0 / (mmc->f_max / 1000);
+1
-18
drivers/mmc/host/meson-gx-mmc.c
+1
-18
drivers/mmc/host/meson-gx-mmc.c
···
717
717
static int meson_mmc_execute_tuning(struct mmc_host *mmc, u32 opcode)
718
718
{
719
719
struct meson_host *host = mmc_priv(mmc);
720
-
int ret;
721
-
722
-
/*
723
-
* If this is the initial tuning, try to get a sane Rx starting
724
-
* phase before doing the actual tuning.
725
-
*/
726
-
if (!mmc->doing_retune) {
727
-
ret = meson_mmc_clk_phase_tuning(mmc, opcode, host->rx_clk);
728
-
729
-
if (ret)
730
-
return ret;
731
-
}
732
-
733
-
ret = meson_mmc_clk_phase_tuning(mmc, opcode, host->tx_clk);
734
-
if (ret)
735
-
return ret;
736
720
737
721
return meson_mmc_clk_phase_tuning(mmc, opcode, host->rx_clk);
738
722
}
···
747
763
if (!IS_ERR(mmc->supply.vmmc))
748
764
mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd);
749
765
750
-
/* Reset phases */
766
+
/* Reset rx phase */
751
767
clk_set_phase(host->rx_clk, 0);
752
-
clk_set_phase(host->tx_clk, 270);
753
768
754
769
break;
755
770