0155-mmc-mediatek-add-busy_check-support.patch 2.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667
  1. From 788d269aee4c612d5cd97b896ea5d22f19137097 Mon Sep 17 00:00:00 2001
  2. From: Chaotian Jing <[email protected]>
  3. Date: Mon, 16 Oct 2017 09:46:34 +0800
  4. Subject: [PATCH 155/224] mmc: mediatek: add busy_check support
  5. bit7 of PATCH_BIT1 has different meaning in new design, to
  6. compatible with previous platform, clear this bit in new
  7. platform.
  8. Signed-off-by: Chaotian Jing <[email protected]>
  9. Tested-by: Sean Wang <[email protected]>
  10. Signed-off-by: Ulf Hansson <[email protected]>
  11. ---
  12. drivers/mmc/host/mtk-sd.c | 7 +++++++
  13. 1 file changed, 7 insertions(+)
  14. --- a/drivers/mmc/host/mtk-sd.c
  15. +++ b/drivers/mmc/host/mtk-sd.c
  16. @@ -316,6 +316,7 @@ struct mtk_mmc_compatible {
  17. u32 pad_tune_reg;
  18. bool async_fifo;
  19. bool data_tune;
  20. + bool busy_check;
  21. };
  22. struct msdc_tune_para {
  23. @@ -380,6 +381,7 @@ static const struct mtk_mmc_compatible m
  24. .pad_tune_reg = MSDC_PAD_TUNE,
  25. .async_fifo = false,
  26. .data_tune = false,
  27. + .busy_check = false,
  28. };
  29. static const struct mtk_mmc_compatible mt8173_compat = {
  30. @@ -388,6 +390,7 @@ static const struct mtk_mmc_compatible m
  31. .pad_tune_reg = MSDC_PAD_TUNE,
  32. .async_fifo = false,
  33. .data_tune = false,
  34. + .busy_check = false,
  35. };
  36. static const struct mtk_mmc_compatible mt2701_compat = {
  37. @@ -396,6 +399,7 @@ static const struct mtk_mmc_compatible m
  38. .pad_tune_reg = MSDC_PAD_TUNE0,
  39. .async_fifo = true,
  40. .data_tune = true,
  41. + .busy_check = false,
  42. };
  43. static const struct mtk_mmc_compatible mt2712_compat = {
  44. @@ -404,6 +408,7 @@ static const struct mtk_mmc_compatible m
  45. .pad_tune_reg = MSDC_PAD_TUNE0,
  46. .async_fifo = true,
  47. .data_tune = true,
  48. + .busy_check = true,
  49. };
  50. static const struct of_device_id msdc_of_ids[] = {
  51. @@ -1275,6 +1280,8 @@ static void msdc_init_hw(struct msdc_hos
  52. sdr_set_field(host->base + MSDC_PATCH_BIT, MSDC_CKGEN_MSDC_DLY_SEL, 1);
  53. writel(0xffff4089, host->base + MSDC_PATCH_BIT1);
  54. sdr_set_bits(host->base + EMMC50_CFG0, EMMC50_CFG_CFCSTS_SEL);
  55. + if (host->dev_comp->busy_check)
  56. + sdr_clr_bits(host->base + MSDC_PATCH_BIT1, (1 << 7));
  57. if (host->dev_comp->async_fifo) {
  58. sdr_set_field(host->base + MSDC_PATCH_BIT2,
  59. MSDC_PB2_RESPWAIT, 3);