Commit baaa2567 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MMC fixes from Ulf Hansson:

 - mtk-sd: Cleanup the wakeup configuration in error/remove-path

 - sdhci-tegra: Correct quirk for ADMA2 length

* tag 'mmc-v6.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: mtk-sd: disable wakeup in .remove() and in the error path of .probe()
  mmc: sdhci-tegra: Remove SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC quirk
parents a0db71c7 f3d87abe

drivers/mmc/host/mtk-sd.c

+2 −0
Original line number Diff line number Diff line
@@ -3070,6 +3070,7 @@ static int msdc_drv_probe(struct platform_device *pdev) 
	msdc_gate_clock(host);

	platform_set_drvdata(pdev, NULL);

release_mem:

	device_init_wakeup(&pdev->dev, false);

	if (host->dma.gpd)

		dma_free_coherent(&pdev->dev,

			2 * sizeof(struct mt_gpdma_desc),
@@ -3103,6 +3104,7 @@ static void msdc_drv_remove(struct platform_device *pdev) 
			host->dma.gpd, host->dma.gpd_addr);

	dma_free_coherent(&pdev->dev, MAX_BD_NUM * sizeof(struct mt_bdma_desc),

			  host->dma.bd, host->dma.bd_addr);

	device_init_wakeup(&pdev->dev, false);

}



static void msdc_save_reg(struct msdc_host *host)

drivers/mmc/host/sdhci-tegra.c

+0 −1
Original line number Diff line number Diff line
@@ -1525,7 +1525,6 @@ static const struct sdhci_pltfm_data sdhci_tegra186_pdata = { 
	.quirks = SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |

		  SDHCI_QUIRK_SINGLE_POWER_WRITE |

		  SDHCI_QUIRK_NO_HISPD_BIT |

		  SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |

		  SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,

	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |

		   SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER,