Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c707d1f4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: sdhci-msm: add SDR104 CRC workaround enablement control" into msm-4.9

parents 33ff7ddd 7ae9c2c9

Documentation/devicetree/bindings/mmc/sdhci-msm.txt

+5 −0
Original line number Diff line number Diff line
@@ -72,6 +72,11 @@ Optional Properties: 
						during clock scaling. If this property is not

						defined, then it falls back to the default HS

						bus speed mode to maintain backward compatibility.

	- qcom,sdr104-wa: On Certain chipsets, SDR104 mode might be unstable causing CRC errors

			  on the interface. So there is a workaround implemented to skip printing

			  register dumps on CRC errors and also downgrade bus speed mode to

			  SDR50/DDR50 in case of continuous CRC errors. Set this flag to enable

			  this workaround.



In the following, <supply> can be vdd (flash core voltage) or vdd-io (I/O voltage).

	- qcom,<supply>-always-on - specifies whether supply should be kept "on" always.

drivers/mmc/host/sdhci-msm.c

+4 −0
Original line number Diff line number Diff line
@@ -1939,6 +1939,8 @@ struct sdhci_msm_pltfm_data *sdhci_msm_populate_pdata(struct device *dev, 
	if (of_get_property(np, "qcom,core_3_0v_support", NULL))

		pdata->core_3_0v_support = true;



	pdata->sdr104_wa = of_property_read_bool(np, "qcom,sdr104-wa");



	return pdata;

out:

	return NULL;
@@ -4422,6 +4424,8 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
	if (msm_host->pdata->nonhotplug)

		msm_host->mmc->caps2 |= MMC_CAP2_NONHOTPLUG;



	msm_host->mmc->sdr104_wa = msm_host->pdata->sdr104_wa;



	init_completion(&msm_host->pwr_irq_completion);



	if (gpio_is_valid(msm_host->pdata->status_gpio)) {

drivers/mmc/host/sdhci-msm.h

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ struct sdhci_msm_pltfm_data { 
	unsigned char sup_ice_clk_cnt;

	struct sdhci_msm_pm_qos_data pm_qos_data;

	bool core_3_0v_support;

	bool sdr104_wa;

};



struct sdhci_msm_bus_vote {

include/linux/mmc/host.h

+2 −0
Original line number Diff line number Diff line
@@ -587,6 +587,8 @@ struct mmc_host { 
	struct io_latency_state io_lat_s;

#endif



	bool sdr104_wa;



	/*

	 * Set to 1 to just stop the SDCLK to the card without

	 * actually disabling the clock from it's source.