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

Merge tag 'mmc-v5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC host fixes from Ulf Hansson:

 - sdhci-msm: Silence warning about turning function into static

 - sdhci-pci-gli: Fix support for GL975x by enabling MSI interrupt

* tag 'mmc-v5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-pci-gli: Enable MSI interrupt for GL975x
  mmc: sdhci-msm: Mark sdhci_msm_cqe_disable static
parents 7de41b12 31e43f31

drivers/mmc/host/sdhci-msm.c

+1 −1
Original line number Diff line number Diff line
@@ -1590,7 +1590,7 @@ static u32 sdhci_msm_cqe_irq(struct sdhci_host *host, u32 intmask) 
	return 0;

}



void sdhci_msm_cqe_disable(struct mmc_host *mmc, bool recovery)

static void sdhci_msm_cqe_disable(struct mmc_host *mmc, bool recovery)

{

	struct sdhci_host *host = mmc_priv(mmc);

	unsigned long flags;

drivers/mmc/host/sdhci-pci-gli.c

+17 −0
Original line number Diff line number Diff line
@@ -262,10 +262,26 @@ static int gl9750_execute_tuning(struct sdhci_host *host, u32 opcode) 
	return 0;

}



static void gli_pcie_enable_msi(struct sdhci_pci_slot *slot)

{

	int ret;



	ret = pci_alloc_irq_vectors(slot->chip->pdev, 1, 1,

				    PCI_IRQ_MSI | PCI_IRQ_MSIX);

	if (ret < 0) {

		pr_warn("%s: enable PCI MSI failed, error=%d\n",

		       mmc_hostname(slot->host->mmc), ret);

		return;

	}



	slot->host->irq = pci_irq_vector(slot->chip->pdev, 0);

}



static int gli_probe_slot_gl9750(struct sdhci_pci_slot *slot)

{

	struct sdhci_host *host = slot->host;



	gli_pcie_enable_msi(slot);

	slot->host->mmc->caps2 |= MMC_CAP2_NO_SDIO;

	sdhci_enable_v4_mode(host);
@@ -276,6 +292,7 @@ static int gli_probe_slot_gl9755(struct sdhci_pci_slot *slot) 
{

	struct sdhci_host *host = slot->host;



	gli_pcie_enable_msi(slot);

	slot->host->mmc->caps2 |= MMC_CAP2_NO_SDIO;

	sdhci_enable_v4_mode(host);