mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
mmc: sdhci-pxav3: transfer sdhci_pltfm_data as args to sdhci_pltfm_init
sdhci_pltfm_init can set host->ops and host->quirks if sdhci_pltfm_data is transfered as arguments. Then no need to set them manually in sdhci_pxav3_probe. Signed-off-by: Kevin Liu <kliu5@marvell.com> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
parent
c09fbd7451
commit
73b7afb976
1 changed files with 9 additions and 8 deletions
|
@ -174,6 +174,14 @@ static const struct sdhci_ops pxav3_sdhci_ops = {
|
|||
.get_max_clock = sdhci_pltfm_clk_get_max_clock,
|
||||
};
|
||||
|
||||
static struct sdhci_pltfm_data sdhci_pxav3_pdata = {
|
||||
.quirks = SDHCI_QUIRK_BROKEN_TIMEOUT_VAL
|
||||
| SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC
|
||||
| SDHCI_QUIRK_32BIT_ADMA_SIZE
|
||||
| SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
|
||||
.ops = &pxav3_sdhci_ops,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static const struct of_device_id sdhci_pxav3_of_match[] = {
|
||||
{
|
||||
|
@ -235,7 +243,7 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
|
|||
if (!pxa)
|
||||
return -ENOMEM;
|
||||
|
||||
host = sdhci_pltfm_init(pdev, NULL);
|
||||
host = sdhci_pltfm_init(pdev, &sdhci_pxav3_pdata);
|
||||
if (IS_ERR(host)) {
|
||||
kfree(pxa);
|
||||
return PTR_ERR(host);
|
||||
|
@ -252,11 +260,6 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
|
|||
pltfm_host->clk = clk;
|
||||
clk_prepare_enable(clk);
|
||||
|
||||
host->quirks = SDHCI_QUIRK_BROKEN_TIMEOUT_VAL
|
||||
| SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC
|
||||
| SDHCI_QUIRK_32BIT_ADMA_SIZE
|
||||
| SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN;
|
||||
|
||||
/* enable 1/8V DDR capable */
|
||||
host->mmc->caps |= MMC_CAP_1_8V_DDR;
|
||||
|
||||
|
@ -296,8 +299,6 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
|
|||
}
|
||||
}
|
||||
|
||||
host->ops = &pxav3_sdhci_ops;
|
||||
|
||||
sdhci_get_of_property(pdev);
|
||||
|
||||
pm_runtime_set_active(&pdev->dev);
|
||||
|
|
Loading…
Reference in a new issue