diff mbox

[v4,09/15] mmc: sdhci-pxav3: add quirks2

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

Commit Message

Kevin Liu Sept. 26, 2012, 11:38 a.m. UTC 
From: Kevin Liu <kliu5@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

Zhangfei Gao Sept. 27, 2012, 7:34 a.m. UTC | #1 
> 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;
>  };
>
Not find the patch using quirks2.
Could you merge the patch together?
--
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
Kevin Liu Sept. 28, 2012, 2:33 a.m. UTC | #2 
2012/9/27 zhangfei gao <zhangfei.gao@gmail.com>:
>> 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;
>>  };
>>
> Not find the patch using quirks2.
> Could you merge the patch together?
In my another patch "[PATCH v4 08/15] mmc: sdhci: enhance preset value
function", I introduced SDHCI_QUIRK2_PRESET_VALUE_BROKEN, which
located in quirks2. So I added this. We should not combine this
together.
--
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 mbox

Patch

diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index 75cc79b..04db9f1 100644
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -272,6 +272,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;
 };