Commit 590d4b33 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MMC fixes from Ulf Hansson:
 "A couple of MMC host fixes intended for v4.12 rc3:

   - sdhci-xenon: Don't free data for phy allocated by devm*
   - sdhci-iproc: Suppress spurious interrupts
   - cavium: Fix probing race with regulator
   - cavium: Prevent crash with incomplete DT
   - cavium-octeon: Use proper GPIO name for power control
   - cavium-octeon: Fix interrupt enable code"

* tag 'mmc-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-iproc: suppress spurious interrupt with Multiblock read
  mmc: cavium: Fix probing race with regulator
  of/platform: Make of_platform_device_destroy globally visible
  mmc: cavium: Prevent crash with incomplete DT
  mmc: cavium-octeon: Use proper GPIO name for power control
  mmc: cavium-octeon: Fix interrupt enable code
  mmc: sdhci-xenon: kill xenon_clean_phy()
parents 56fff1bb f5f968f2

drivers/mmc/host/cavium-octeon.c

+12 −3
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static void octeon_mmc_release_bus(struct cvm_mmc_host *host) 
static void octeon_mmc_int_enable(struct cvm_mmc_host *host, u64 val)

{

	writeq(val, host->base + MIO_EMM_INT(host));

	if (!host->dma_active || (host->dma_active && !host->has_ciu3))

	if (!host->has_ciu3)

		writeq(val, host->base + MIO_EMM_INT_EN(host));

}
@@ -267,7 +267,7 @@ static int octeon_mmc_probe(struct platform_device *pdev) 
	}



	host->global_pwr_gpiod = devm_gpiod_get_optional(&pdev->dev,

							 "power-gpios",

							 "power",

							 GPIOD_OUT_HIGH);

	if (IS_ERR(host->global_pwr_gpiod)) {

		dev_err(&pdev->dev, "Invalid power GPIO\n");
@@ -288,11 +288,20 @@ static int octeon_mmc_probe(struct platform_device *pdev) 
		if (ret) {

			dev_err(&pdev->dev, "Error populating slots\n");

			octeon_mmc_set_shared_power(host, 0);

			return ret;

			goto error;

		}

		i++;

	}

	return 0;



error:

	for (i = 0; i < CAVIUM_MAX_MMC; i++) {

		if (host->slot[i])

			cvm_mmc_of_slot_remove(host->slot[i]);

		if (host->slot_pdev[i])

			of_platform_device_destroy(&host->slot_pdev[i]->dev, NULL);

	}

	return ret;

}



static int octeon_mmc_remove(struct platform_device *pdev)

drivers/mmc/host/cavium-thunderx.c

+6 −0
Original line number Diff line number Diff line
@@ -146,6 +146,12 @@ static int thunder_mmc_probe(struct pci_dev *pdev, 
	return 0;



error:

	for (i = 0; i < CAVIUM_MAX_MMC; i++) {

		if (host->slot[i])

			cvm_mmc_of_slot_remove(host->slot[i]);

		if (host->slot_pdev[i])

			of_platform_device_destroy(&host->slot_pdev[i]->dev, NULL);

	}

	clk_disable_unprepare(host->clk);

	return ret;

}

drivers/mmc/host/cavium.c

+10 −15
Original line number Diff line number Diff line
@@ -839,14 +839,14 @@ static void cvm_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
		cvm_mmc_reset_bus(slot);

		if (host->global_pwr_gpiod)

			host->set_shared_power(host, 0);

		else

		else if (!IS_ERR(mmc->supply.vmmc))

			mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);

		break;



	case MMC_POWER_UP:

		if (host->global_pwr_gpiod)

			host->set_shared_power(host, 1);

		else

		else if (!IS_ERR(mmc->supply.vmmc))

			mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd);

		break;

	}
@@ -968,20 +968,15 @@ static int cvm_mmc_of_parse(struct device *dev, struct cvm_mmc_slot *slot) 
		return -EINVAL;

	}



	mmc->supply.vmmc = devm_regulator_get_optional(dev, "vmmc");

	if (IS_ERR(mmc->supply.vmmc)) {

		if (PTR_ERR(mmc->supply.vmmc) == -EPROBE_DEFER)

			return -EPROBE_DEFER;

	ret = mmc_regulator_get_supply(mmc);

	if (ret == -EPROBE_DEFER)

		return ret;

	/*

	 * Legacy Octeon firmware has no regulator entry, fall-back to

	 * a hard-coded voltage to get a sane OCR.

	 */

	if (IS_ERR(mmc->supply.vmmc))

		mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;

	} else {

		ret = mmc_regulator_get_ocrmask(mmc->supply.vmmc);

		if (ret > 0)

			mmc->ocr_avail = ret;

	}



	/* Common MMC bindings */

	ret = mmc_of_parse(mmc);

drivers/mmc/host/sdhci-iproc.c

+2 −1
Original line number Diff line number Diff line
@@ -187,7 +187,8 @@ static const struct sdhci_iproc_data iproc_cygnus_data = { 
};



static const struct sdhci_pltfm_data sdhci_iproc_pltfm_data = {

	.quirks = SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK,

	.quirks = SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |

		  SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12,

	.quirks2 = SDHCI_QUIRK2_ACMD23_BROKEN,

	.ops = &sdhci_iproc_ops,

};

drivers/mmc/host/sdhci-xenon-phy.c

+1 −13
Original line number Diff line number Diff line
@@ -787,14 +787,6 @@ int xenon_phy_adj(struct sdhci_host *host, struct mmc_ios *ios) 
	return ret;

}



void xenon_clean_phy(struct sdhci_host *host)

{

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct xenon_priv *priv = sdhci_pltfm_priv(pltfm_host);



	kfree(priv->phy_params);

}



static int xenon_add_phy(struct device_node *np, struct sdhci_host *host,

			 const char *phy_name)

{
@@ -819,11 +811,7 @@ static int xenon_add_phy(struct device_node *np, struct sdhci_host *host, 
	if (ret)

		return ret;



	ret = xenon_emmc_phy_parse_param_dt(host, np, priv->phy_params);

	if (ret)

		xenon_clean_phy(host);



	return ret;

	return xenon_emmc_phy_parse_param_dt(host, np, priv->phy_params);

}



int xenon_phy_parse_dt(struct device_node *np, struct sdhci_host *host)

CRA Git | Maintained and supported by SUSTech CRA and CCSE