| Message ID | 1374712691-12807-1-git-send-email-Haijun.Zhang@freescale.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jul 25, 2013 at 08:38:11AM +0800, Haijun Zhang wrote: > Add voltage-range support in esdhc of T4, So we can choose > to read voltages from dts file as one optional. > If we can get a valid voltage-range from device node, we use > this voltage as the final voltage support. Else we still read > from capacity or from other provider. > > Signed-off-by: Haijun Zhang <haijun.zhang@freescale.com> > Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com> Development process nitpick... The code originated from me, but I did not sign off this patch... Per Documentation/SubmittingPatches: The Signed-off-by: tag indicates that the signer was involved in the development of the patch, or that he/she was in the patch's delivery path. The order of the sign-off lines also has a meaning. Putting my sign off below yours means that I was not only involved in the development of the patch but also somehow approved the patch (but I did not :). [..] > +void sdhci_get_voltage(struct platform_device *pdev) You still duplicate the code... Per my previous email, this should probably go into mmc/core (with the function renamed to something more generic, of course.) Thanks, Anton -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 07/27/2013 03:18 AM, Anton Vorontsov wrote: > On Thu, Jul 25, 2013 at 08:38:11AM +0800, Haijun Zhang wrote: >> Add voltage-range support in esdhc of T4, So we can choose >> to read voltages from dts file as one optional. >> If we can get a valid voltage-range from device node, we use >> this voltage as the final voltage support. Else we still read >> from capacity or from other provider. >> >> Signed-off-by: Haijun Zhang <haijun.zhang@freescale.com> >> Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com> > Development process nitpick... > > The code originated from me, but I did not sign off this patch... > > Per Documentation/SubmittingPatches: > > The Signed-off-by: tag indicates that the signer was involved in the > development of the patch, or that he/she was in the patch's delivery path. > > The order of the sign-off lines also has a meaning. Putting my sign off > below yours means that I was not only involved in the development of the > patch but also somehow approved the patch (but I did not :). > > [..] >> +void sdhci_get_voltage(struct platform_device *pdev) > You still duplicate the code... Per my previous email, this should > probably go into mmc/core (with the function renamed to something more > generic, of course.) > > Thanks, > > Anton > Thanks Anton. I'll correct this and resend the patch.
diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index 15039e2..cdfb08b 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -304,6 +304,7 @@ static int sdhci_esdhc_probe(struct platform_device *pdev) return PTR_ERR(host); sdhci_get_of_property(pdev); + sdhci_get_voltage(pdev); np = pdev->dev.of_node; if (of_device_is_compatible(np, "fsl,p2020-esdhc")) { diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c index e2065a4..4682aba 100644 --- a/drivers/mmc/host/sdhci-pltfm.c +++ b/drivers/mmc/host/sdhci-pltfm.c @@ -109,10 +109,42 @@ void sdhci_get_of_property(struct platform_device *pdev) host->mmc->pm_caps |= MMC_PM_WAKE_SDIO_IRQ; } } + +void sdhci_get_voltage(struct platform_device *pdev) +{ + struct sdhci_host *host = platform_get_drvdata(pdev); + const u32 *voltage_ranges; + int num_ranges, i; + struct device_node *np; + + np = pdev->dev.of_node; + voltage_ranges = of_get_property(np, "voltage-ranges", &num_ranges); + num_ranges = num_ranges / sizeof(*voltage_ranges) / 2; + if (!voltage_ranges || !num_ranges) { + dev_info(&pdev->dev, "OF: voltage-ranges unspecified\n"); + return; + } + + for (i = 0; i < num_ranges; i++) { + const int j = i * 2; + u32 mask; + + mask = mmc_vddrange_to_ocrmask(be32_to_cpu(voltage_ranges[j]), + be32_to_cpu(voltage_ranges[j + 1])); + if (!mask) { + dev_err(&pdev->dev, + "OF: voltage-range #%d is invalid\n", i); + return; + } + host->ocr_mask |= mask; + } +} #else void sdhci_get_of_property(struct platform_device *pdev) {} +void sdhci_get_voltage(struct platform_device *pdev) {} #endif /* CONFIG_OF */ EXPORT_SYMBOL_GPL(sdhci_get_of_property); +EXPORT_SYMBOL_GPL(sdhci_get_voltage); struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev, const struct sdhci_pltfm_data *pdata, diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h index e15ced79..aba8253 100644 --- a/drivers/mmc/host/sdhci-pltfm.h +++ b/drivers/mmc/host/sdhci-pltfm.h @@ -92,6 +92,7 @@ static inline void sdhci_be32bs_writeb(struct sdhci_host *host, u8 val, int reg) #endif /* CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER */ extern void sdhci_get_of_property(struct platform_device *pdev); +extern void sdhci_get_voltage(struct platform_device *pdev); extern struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev, const struct sdhci_pltfm_data *pdata, diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index a78bd4f..57541e0 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -3119,6 +3119,9 @@ int sdhci_add_host(struct sdhci_host *host) SDHCI_MAX_CURRENT_MULTIPLIER; } + if (host->ocr_mask) + ocr_avail = host->ocr_mask; + mmc->ocr_avail = ocr_avail; mmc->ocr_avail_sdio = ocr_avail; if (host->ocr_avail_sdio) diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index e3c6a74..3e781b8 100644 --- a/include/linux/mmc/sdhci.h +++ b/include/linux/mmc/sdhci.h @@ -171,6 +171,7 @@ struct sdhci_host { unsigned int ocr_avail_sdio; /* OCR bit masks */ unsigned int ocr_avail_sd; unsigned int ocr_avail_mmc; + u32 ocr_mask; /* available voltages */ wait_queue_head_t buf_ready_int; /* Waitqueue for Buffer Read Ready interrupt */ unsigned int tuning_done; /* Condition flag set when CMD19 succeeds */