[PATCH v2] mmc: sdhci-pci: Add support for Intel Quark X1000 SDIO host controller

[PATCH v2] mmc: sdhci-pci: Add support for Intel Quark X1000 SDIO host controller

[Chen, Alvin]

From: "Alvin (Weike) Chen" <alvin.chen@intel.com>

Hi,
Intel Quark X1000 consists of one SDIO host controller which can be PCI enumerated. 
SDHCI-PCI layer doesn't support it. Thus, we add support for Intel Quark X1000 SDIO as well.

Derek Browne (1):
  Quark SDIO host controller

 drivers/mmc/host/sdhci-pci.c |   12 ++++++++++++
 drivers/mmc/host/sdhci-pci.h |    1 +
 2 files changed, 13 insertions(+)

-- 
1.7.9.5

[PATCH v2] mmc: sdhci-pci: SDIO host controller support for Intel Quark X1000

[Chen, Alvin]

From: Derek Browne <Derek.Browne@intel.com>

This patch is to enable SDIO host controller for Intel Quark X1000.

Signed-off-by: Derek Browne <Derek.Browne@intel.com>
Signed-off-by: Alvin (Weike) Chen <alvin.chen@intel.com>
---
changelog v2:
*Delete '#define PCI_DEVICE_ID_INTEL_QUARK_ILB 0x095E' from 'include/linux/pci_ids.h'.
*Move '#define PCI_DEVICE_ID_INTEL_QRK_SD 0x08A7' from 'include/linux/pci_ids.h' 
 to 'driver/mmc/host/sdhci-pci.h'.
*Update the subject and description.

 drivers/mmc/host/sdhci-pci.c |   12 ++++++++++++
 drivers/mmc/host/sdhci-pci.h |    1 +
 2 files changed, 13 insertions(+)

diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 52c42fc..1aeeefc 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -103,6 +103,10 @@ static const struct sdhci_pci_fixes sdhci_cafe = {
 			  SDHCI_QUIRK_BROKEN_TIMEOUT_VAL,
 };
 
+static const struct sdhci_pci_fixes sdhci_intel_qrk = {
+	.quirks		= SDHCI_QUIRK_NO_HISPD_BIT,
+};
+
 static int mrst_hc_probe_slot(struct sdhci_pci_slot *slot)
 {
 	slot->host->mmc->caps |= MMC_CAP_8_BIT_DATA;
@@ -753,6 +757,14 @@ static const struct pci_device_id pci_ids[] = {
 
 	{
 		.vendor		= PCI_VENDOR_ID_INTEL,
+		.device		= PCI_DEVICE_ID_INTEL_QRK_SD,
+		.subvendor	= PCI_ANY_ID,
+		.subdevice	= PCI_ANY_ID,
+		.driver_data	= (kernel_ulong_t)&sdhci_intel_qrk,
+	},
+
+	{
+		.vendor		= PCI_VENDOR_ID_INTEL,
 		.device		= PCI_DEVICE_ID_INTEL_MRST_SD0,
 		.subvendor	= PCI_ANY_ID,
 		.subdevice	= PCI_ANY_ID,
diff --git a/drivers/mmc/host/sdhci-pci.h b/drivers/mmc/host/sdhci-pci.h
index 6d71871..c101477 100644
--- a/drivers/mmc/host/sdhci-pci.h
+++ b/drivers/mmc/host/sdhci-pci.h
@@ -17,6 +17,7 @@
 #define PCI_DEVICE_ID_INTEL_CLV_SDIO2	0x08fb
 #define PCI_DEVICE_ID_INTEL_CLV_EMMC0	0x08e5
 #define PCI_DEVICE_ID_INTEL_CLV_EMMC1	0x08e6
+#define PCI_DEVICE_ID_INTEL_QRK_SD	0x08A7
 
 /*
  * PCI registers
-- 
1.7.9.5

Re: [PATCH v2] mmc: sdhci-pci: SDIO host controller support for Intel Quark X1000

[Ulf Hansson]

On 24 June 2014 15:56, Chen, Alvin <alvin.chen@intel.com> wrote:
> From: Derek Browne <Derek.Browne@intel.com>
>
> This patch is to enable SDIO host controller for Intel Quark X1000.
>
> Signed-off-by: Derek Browne <Derek.Browne@intel.com>
> Signed-off-by: Alvin (Weike) Chen <alvin.chen@intel.com>

Thanks! Applied for next.

Kind regards
Uffe

> ---
> changelog v2:
> *Delete '#define PCI_DEVICE_ID_INTEL_QUARK_ILB 0x095E' from 'include/linux/pci_ids.h'.
> *Move '#define PCI_DEVICE_ID_INTEL_QRK_SD 0x08A7' from 'include/linux/pci_ids.h'
>  to 'driver/mmc/host/sdhci-pci.h'.
> *Update the subject and description.
>
>  drivers/mmc/host/sdhci-pci.c |   12 ++++++++++++
>  drivers/mmc/host/sdhci-pci.h |    1 +
>  2 files changed, 13 insertions(+)
>
> diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
> index 52c42fc..1aeeefc 100644
> --- a/drivers/mmc/host/sdhci-pci.c
> +++ b/drivers/mmc/host/sdhci-pci.c
> @@ -103,6 +103,10 @@ static const struct sdhci_pci_fixes sdhci_cafe = {
>                           SDHCI_QUIRK_BROKEN_TIMEOUT_VAL,
>  };
>
> +static const struct sdhci_pci_fixes sdhci_intel_qrk = {
> +       .quirks         = SDHCI_QUIRK_NO_HISPD_BIT,
> +};
> +
>  static int mrst_hc_probe_slot(struct sdhci_pci_slot *slot)
>  {
>         slot->host->mmc->caps |= MMC_CAP_8_BIT_DATA;
> @@ -753,6 +757,14 @@ static const struct pci_device_id pci_ids[] = {
>
>         {
>                 .vendor         = PCI_VENDOR_ID_INTEL,
> +               .device         = PCI_DEVICE_ID_INTEL_QRK_SD,
> +               .subvendor      = PCI_ANY_ID,
> +               .subdevice      = PCI_ANY_ID,
> +               .driver_data    = (kernel_ulong_t)&sdhci_intel_qrk,
> +       },
> +
> +       {
> +               .vendor         = PCI_VENDOR_ID_INTEL,
>                 .device         = PCI_DEVICE_ID_INTEL_MRST_SD0,
>                 .subvendor      = PCI_ANY_ID,
>                 .subdevice      = PCI_ANY_ID,
> diff --git a/drivers/mmc/host/sdhci-pci.h b/drivers/mmc/host/sdhci-pci.h
> index 6d71871..c101477 100644
> --- a/drivers/mmc/host/sdhci-pci.h
> +++ b/drivers/mmc/host/sdhci-pci.h
> @@ -17,6 +17,7 @@
>  #define PCI_DEVICE_ID_INTEL_CLV_SDIO2  0x08fb
>  #define PCI_DEVICE_ID_INTEL_CLV_EMMC0  0x08e5
>  #define PCI_DEVICE_ID_INTEL_CLV_EMMC1  0x08e6
> +#define PCI_DEVICE_ID_INTEL_QRK_SD     0x08A7
>
>  /*
>   * PCI registers
> --
> 1.7.9.5
>
> --
> 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

RE: [PATCH v2] mmc: sdhci-pci: SDIO host controller support for Intel Quark X1000

[Ong, Boon Leong]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 957 bytes --]

> -----Original Message-----
> From: Ulf Hansson [mailto:ulf.hansson@linaro.org]
> Sent: Wednesday, July 02, 2014 5:01 PM
> To: Chen, Alvin
> Cc: Chris Ball; linux-mmc; linux-kernel@vger.kernel.org; Ong, Boon Leong
> Subject: Re: [PATCH v2] mmc: sdhci-pci: SDIO host controller support for Intel
> Quark X1000
> 
> On 24 June 2014 15:56, Chen, Alvin <alvin.chen@intel.com> wrote:
> > From: Derek Browne <Derek.Browne@intel.com>
> >
> > This patch is to enable SDIO host controller for Intel Quark X1000.
> >
> > Signed-off-by: Derek Browne <Derek.Browne@intel.com>
> > Signed-off-by: Alvin (Weike) Chen <alvin.chen@intel.com>
> 
> Thanks! Applied for next.
> 

Hi Ulf, 
	For this patch, are you in progress of getting it into v3.17  merge window?
	Just want to follow-up.

Many thanks
Boon Leong

ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

RE: [PATCH v2] mmc: sdhci-pci: SDIO host controller support for Intel Quark X1000

[Ong, Boon Leong]

> -----Original Message-----
> From: Ulf Hansson [mailto:ulf.hansson@linaro.org]
> Sent: Wednesday, July 02, 2014 5:01 PM
> To: Chen, Alvin
> Cc: Chris Ball; linux-mmc; linux-kernel@vger.kernel.org; Ong, Boon Leong
> Subject: Re: [PATCH v2] mmc: sdhci-pci: SDIO host controller support for Intel
> Quark X1000
> 
> On 24 June 2014 15:56, Chen, Alvin <alvin.chen@intel.com> wrote:
> > From: Derek Browne <Derek.Browne@intel.com>
> >
> > This patch is to enable SDIO host controller for Intel Quark X1000.
> >
> > Signed-off-by: Derek Browne <Derek.Browne@intel.com>
> > Signed-off-by: Alvin (Weike) Chen <alvin.chen@intel.com>
> 
> Thanks! Applied for next.
> 

Hi Ulf, 
	For this patch, are you in progress of getting it into v3.17  merge window?
	Just want to follow-up.

Many thanks
Boon Leong

RE: [PATCH v2] mmc: sdhci-pci: SDIO host controller support for Intel Quark X1000

[Chen, Alvin]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 1576 bytes --]

Hi Ulf,

Any update for this patch? Just want to follow-up.



Best regards，Alvin Chen
ICFS Platform Engineering Solution
Flex Services (CMMI Level 3, IQA2005, IQA2008), Greater Asia Region Intel Information Technology Tel. 010-82171960
inet.8-7581960
Email. alvin.chen@intel.com 

> -----Original Message-----
> From: Ong, Boon Leong
> Sent: Wednesday, August 6, 2014 3:32 PM
> To: Ulf Hansson
> Cc: Chris Ball; linux-mmc; linux-kernel@vger.kernel.org; Chen, Alvin
> Subject: RE: [PATCH v2] mmc: sdhci-pci: SDIO host controller support for Intel
> Quark X1000
> 
> > -----Original Message-----
> > From: Ulf Hansson [mailto:ulf.hansson@linaro.org]
> > Sent: Wednesday, July 02, 2014 5:01 PM
> > To: Chen, Alvin
> > Cc: Chris Ball; linux-mmc; linux-kernel@vger.kernel.org; Ong, Boon
> > Leong
> > Subject: Re: [PATCH v2] mmc: sdhci-pci: SDIO host controller support
> > for Intel Quark X1000
> >
> > On 24 June 2014 15:56, Chen, Alvin <alvin.chen@intel.com> wrote:
> > > From: Derek Browne <Derek.Browne@intel.com>
> > >
> > > This patch is to enable SDIO host controller for Intel Quark X1000.
> > >
> > > Signed-off-by: Derek Browne <Derek.Browne@intel.com>
> > > Signed-off-by: Alvin (Weike) Chen <alvin.chen@intel.com>
> >
> > Thanks! Applied for next.
> >
> 
> Hi Ulf,
> 	For this patch, are you in progress of getting it into v3.17  merge
> window?
> 	Just want to follow-up.
> 
> Many thanks
> Boon Leong

ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

RE: [PATCH v2] mmc: sdhci-pci: SDIO host controller support for Intel Quark X1000

[Chen, Alvin]

Hi Ulf,

Any update for this patch? Just want to follow-up.



Best regards，Alvin Chen
ICFS Platform Engineering Solution
Flex Services (CMMI Level 3, IQA2005, IQA2008), Greater Asia Region Intel Information Technology Tel. 010-82171960
inet.8-7581960
Email. alvin.chen@intel.com 

> -----Original Message-----
> From: Ong, Boon Leong
> Sent: Wednesday, August 6, 2014 3:32 PM
> To: Ulf Hansson
> Cc: Chris Ball; linux-mmc; linux-kernel@vger.kernel.org; Chen, Alvin
> Subject: RE: [PATCH v2] mmc: sdhci-pci: SDIO host controller support for Intel
> Quark X1000
> 
> > -----Original Message-----
> > From: Ulf Hansson [mailto:ulf.hansson@linaro.org]
> > Sent: Wednesday, July 02, 2014 5:01 PM
> > To: Chen, Alvin
> > Cc: Chris Ball; linux-mmc; linux-kernel@vger.kernel.org; Ong, Boon
> > Leong
> > Subject: Re: [PATCH v2] mmc: sdhci-pci: SDIO host controller support
> > for Intel Quark X1000
> >
> > On 24 June 2014 15:56, Chen, Alvin <alvin.chen@intel.com> wrote:
> > > From: Derek Browne <Derek.Browne@intel.com>
> > >
> > > This patch is to enable SDIO host controller for Intel Quark X1000.
> > >
> > > Signed-off-by: Derek Browne <Derek.Browne@intel.com>
> > > Signed-off-by: Alvin (Weike) Chen <alvin.chen@intel.com>
> >
> > Thanks! Applied for next.
> >
> 
> Hi Ulf,
> 	For this patch, are you in progress of getting it into v3.17  merge
> window?
> 	Just want to follow-up.
> 
> Many thanks
> Boon Leong

Re: [PATCH v2] mmc: sdhci-pci: SDIO host controller support for Intel Quark X1000

[Ulf Hansson]

On 11 August 2014 07:15, Chen, Alvin <alvin.chen@intel.com> wrote:
> Hi Ulf,
>
> Any update for this patch? Just want to follow-up.

It will be included in my PR for 3.17.

Kind regards
Uffe

>
>
>
> Best regards，Alvin Chen
> ICFS Platform Engineering Solution
> Flex Services (CMMI Level 3, IQA2005, IQA2008), Greater Asia Region Intel Information Technology Tel. 010-82171960
> inet.8-7581960
> Email. alvin.chen@intel.com
>
>> -----Original Message-----
>> From: Ong, Boon Leong
>> Sent: Wednesday, August 6, 2014 3:32 PM
>> To: Ulf Hansson
>> Cc: Chris Ball; linux-mmc; linux-kernel@vger.kernel.org; Chen, Alvin
>> Subject: RE: [PATCH v2] mmc: sdhci-pci: SDIO host controller support for Intel
>> Quark X1000
>>
>> > -----Original Message-----
>> > From: Ulf Hansson [mailto:ulf.hansson@linaro.org]
>> > Sent: Wednesday, July 02, 2014 5:01 PM
>> > To: Chen, Alvin
>> > Cc: Chris Ball; linux-mmc; linux-kernel@vger.kernel.org; Ong, Boon
>> > Leong
>> > Subject: Re: [PATCH v2] mmc: sdhci-pci: SDIO host controller support
>> > for Intel Quark X1000
>> >
>> > On 24 June 2014 15:56, Chen, Alvin <alvin.chen@intel.com> wrote:
>> > > From: Derek Browne <Derek.Browne@intel.com>
>> > >
>> > > This patch is to enable SDIO host controller for Intel Quark X1000.
>> > >
>> > > Signed-off-by: Derek Browne <Derek.Browne@intel.com>
>> > > Signed-off-by: Alvin (Weike) Chen <alvin.chen@intel.com>
>> >
>> > Thanks! Applied for next.
>> >
>>
>> Hi Ulf,
>>       For this patch, are you in progress of getting it into v3.17  merge
>> window?
>>       Just want to follow-up.
>>
>> Many thanks
>> Boon Leong
>