diff mbox

[v6,09/14] mmc: sdhci-pxav3: add quirks2

Message ID 1350471893-29633-10-git-send-email-keyuan.liu@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Kevin Liu Oct. 17, 2012, 11:04 a.m. UTC
From: Kevin Liu <kliu5@marvell.com>

Acked-by:  Zhangfei Gao <zhangfei.gao@marvell.com>
Signed-off-by: Kevin Liu <kliu5@marvell.com>
---
 drivers/mmc/host/sdhci-pxav3.c          |    2 ++
 include/linux/platform_data/pxa_sdhci.h |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

Comments

Chris Ball Nov. 17, 2012, 10:09 p.m. UTC | #1
Hi,

On Wed, Oct 17 2012, Kevin Liu wrote:
> From: Kevin Liu <kliu5@marvell.com>
>
> Acked-by:  Zhangfei Gao <zhangfei.gao@marvell.com>
> Signed-off-by: Kevin Liu <kliu5@marvell.com>
> ---
>  drivers/mmc/host/sdhci-pxav3.c          |    2 ++
>  include/linux/platform_data/pxa_sdhci.h |    2 ++
>  2 files changed, 4 insertions(+), 0 deletions(-)

It looks like you aren't using any of the quirks in quirks2, is that
right?  I'm still hoping we might be able to get rid of quirks2, so
I'd rather wait until you need it (or we get rid of it) before applying
this.

- Chris.
Kevin Liu Nov. 19, 2012, 2:34 a.m. UTC | #2
2012/11/18 Chris Ball <cjb@laptop.org>:
> Hi,
>
> On Wed, Oct 17 2012, Kevin Liu wrote:
>> From: Kevin Liu <kliu5@marvell.com>
>>
>> Acked-by:  Zhangfei Gao <zhangfei.gao@marvell.com>
>> Signed-off-by: Kevin Liu <kliu5@marvell.com>
>> ---
>>  drivers/mmc/host/sdhci-pxav3.c          |    2 ++
>>  include/linux/platform_data/pxa_sdhci.h |    2 ++
>>  2 files changed, 4 insertions(+), 0 deletions(-)
>
> It looks like you aren't using any of the quirks in quirks2, is that
> right?  I'm still hoping we might be able to get rid of quirks2, so
> I'd rather wait until you need it (or we get rid of it) before applying
> this.
>

My previous patch "[PATCH v6 08/14] mmc: sdhci: enhance preset value
function" introduced a quirk SDHCI_QUIRK2_PRESET_VALUE_BROKEN, which
aim to disable preset feature since the preset setting is fixed only
for 200Mhz base clock on pxav3 platform. So we should disable preset
if the base clock is other than 200Mhz.

Thanks
Kevin
--
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
Chris Ball Nov. 25, 2012, 7:26 p.m. UTC | #3
Hi,

On Sun, Nov 18 2012, Kevin Liu wrote:
>>> From: Kevin Liu <kliu5@marvell.com>
>>>
>>> Acked-by:  Zhangfei Gao <zhangfei.gao@marvell.com>
>>> Signed-off-by: Kevin Liu <kliu5@marvell.com>
>>> ---
>>>  drivers/mmc/host/sdhci-pxav3.c          |    2 ++
>>>  include/linux/platform_data/pxa_sdhci.h |    2 ++
>>>  2 files changed, 4 insertions(+), 0 deletions(-)
>>
>> It looks like you aren't using any of the quirks in quirks2, is that
>> right?  I'm still hoping we might be able to get rid of quirks2, so
>> I'd rather wait until you need it (or we get rid of it) before applying
>> this.
>
> My previous patch "[PATCH v6 08/14] mmc: sdhci: enhance preset value
> function" introduced a quirk SDHCI_QUIRK2_PRESET_VALUE_BROKEN, which
> aim to disable preset feature since the preset setting is fixed only
> for 200Mhz base clock on pxav3 platform. So we should disable preset
> if the base clock is other than 200Mhz.

Thanks, pushed to mmc-next for 3.8.

- Chris.
diff mbox

Patch

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;
 };