| Message ID | 1348818972-26711-11-git-send-email-keyuan.liu@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Sep 28, 2012 at 3:56 PM, Kevin Liu <keyuan.liu@gmail.com> wrote: > From: Kevin Liu <kliu5@marvell.com> > > Signed-off-by: Kevin Liu <kliu5@marvell.com> Acked-by: Zhangfei Gao <zhangfei.gao@marvell.com> > --- > drivers/mmc/host/sdhci-pxav3.c | 2 ++ > include/linux/platform_data/pxa_sdhci.h | 2 ++ > 2 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c > index ccd1906..60829c9 100644 > --- a/drivers/mmc/host/sdhci-pxav3.c > +++ b/drivers/mmc/host/sdhci-pxav3.c > @@ -280,6 +280,8 @@ static int __devinit sdhci_pxav3_probe(struct platform_device *pdev) > > if (pdata->quirks) > host->quirks |= pdata->quirks; > + if (pdata->quirks2) > + host->quirks2 |= pdata->quirks2; > if (pdata->host_caps) > host->mmc->caps |= pdata->host_caps; > if (pdata->host_caps2) > diff --git a/include/linux/platform_data/pxa_sdhci.h b/include/linux/platform_data/pxa_sdhci.h > index 59acd98..fdf38d6 100644 > --- a/include/linux/platform_data/pxa_sdhci.h > +++ b/include/linux/platform_data/pxa_sdhci.h > @@ -38,6 +38,7 @@ > * @max_speed: the maximum speed supported > * @host_caps: Standard MMC host capabilities bit field. > * @quirks: quirks of platfrom > + * @quirks2: quirks2 of platfrom > * @pm_caps: pm_caps of platfrom > */ > struct sdhci_pxa_platdata { > @@ -51,6 +52,7 @@ struct sdhci_pxa_platdata { > unsigned int host_caps; > unsigned int host_caps2; > unsigned int quirks; > + unsigned int quirks2; > unsigned int pm_caps; > }; > > -- > 1.7.0.4 > > -- > 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 -- 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
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index ccd1906..60829c9 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -280,6 +280,8 @@ static int __devinit sdhci_pxav3_probe(struct platform_device *pdev) if (pdata->quirks) host->quirks |= pdata->quirks; + if (pdata->quirks2) + host->quirks2 |= pdata->quirks2; if (pdata->host_caps) host->mmc->caps |= pdata->host_caps; if (pdata->host_caps2) diff --git a/include/linux/platform_data/pxa_sdhci.h b/include/linux/platform_data/pxa_sdhci.h index 59acd98..fdf38d6 100644 --- a/include/linux/platform_data/pxa_sdhci.h +++ b/include/linux/platform_data/pxa_sdhci.h @@ -38,6 +38,7 @@ * @max_speed: the maximum speed supported * @host_caps: Standard MMC host capabilities bit field. * @quirks: quirks of platfrom + * @quirks2: quirks2 of platfrom * @pm_caps: pm_caps of platfrom */ struct sdhci_pxa_platdata { @@ -51,6 +52,7 @@ struct sdhci_pxa_platdata { unsigned int host_caps; unsigned int host_caps2; unsigned int quirks; + unsigned int quirks2; unsigned int pm_caps; };