2013-10-01 19:56:57

by David Cohen

Subject: [PATCH 1/2] pci_id: add Intel Merrifield mmc pci id

Signed-off-by: David Cohen <[email protected]>
---
include/linux/pci_ids.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 97fbecd..2a89103 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2551,6 +2551,7 @@
#define PCI_DEVICE_ID_INTEL_MFD_EMMC0 0x0823
#define PCI_DEVICE_ID_INTEL_MFD_EMMC1 0x0824
#define PCI_DEVICE_ID_INTEL_MRST_SD2 0x084F
+#define PCI_DEVICE_ID_INTEL_MRFL_MMC 0x1190
#define PCI_DEVICE_ID_INTEL_I960 0x0960
#define PCI_DEVICE_ID_INTEL_I960RM 0x0962
#define PCI_DEVICE_ID_INTEL_CENTERTON_ILB 0x0c60
--
1.8.4.rc3

2013-10-01 19:56:38

by David Cohen

Subject: [PATCH 2/2] mmc: sdhci-pci: add Intel Merrifield support

Implement initial SDHCI Intel Merrifield support.
This patch is based on previous one from Yunpeng Gao <[email protected]>

Signed-off-by: David Cohen <[email protected]>
---
drivers/mmc/host/sdhci-pci.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)

diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index d7d6bc8..10bd17e 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -356,6 +356,28 @@ static const struct sdhci_pci_fixes sdhci_intel_byt_sd = {
.allow_runtime_pm = true,
};

+/* Define Host controllers for Intel Merrifield platform */
+#define INTEL_MRFL_EMMC_0 0
+#define INTEL_MRFL_EMMC_1 1
+
+static int intel_mrfl_mmc_probe_slot(struct sdhci_pci_slot *slot)
+{
+ if ((PCI_FUNC(slot->chip->pdev->devfn) != INTEL_MRFL_EMMC_0) &&
+ (PCI_FUNC(slot->chip->pdev->devfn) != INTEL_MRFL_EMMC_1))
+ /* SD support is not ready yet */
+ return -ENODEV;
+
+ slot->host->mmc->caps |= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE |
+ MMC_CAP_1_8V_DDR;
+
+ return 0;
+}
+
+static const struct sdhci_pci_fixes sdhci_intel_mrfl_mmc = {
+ .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
+ .probe_slot = intel_mrfl_mmc_probe_slot,
+};
+
/* O2Micro extra registers */
#define O2_SD_LOCK_WP 0xD3
#define O2_SD_MULTI_VCC3V 0xEE
@@ -940,6 +962,13 @@ static const struct pci_device_id pci_ids[] = {
},

{
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_MRFL_MMC,
+ .subvendor = PCI_ANY_ID,
+ .subdevice = PCI_ANY_ID,
+ .driver_data = (kernel_ulong_t)&sdhci_intel_mrfl_mmc,
+ },
+ {
.vendor = PCI_VENDOR_ID_O2,
.device = PCI_DEVICE_ID_O2_8120,
.subvendor = PCI_ANY_ID,
--
1.8.4.rc3

2013-10-01 20:07:47

by Greg Kroah-Hartman

Subject: Re: [PATCH 1/2] pci_id: add Intel Merrifield mmc pci id

On Tue, Oct 01, 2013 at 01:00:32PM -0700, David Cohen wrote:
> Signed-off-by: David Cohen <[email protected]>
> ---
> include/linux/pci_ids.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 97fbecd..2a89103 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2551,6 +2551,7 @@
> #define PCI_DEVICE_ID_INTEL_MFD_EMMC0 0x0823
> #define PCI_DEVICE_ID_INTEL_MFD_EMMC1 0x0824
> #define PCI_DEVICE_ID_INTEL_MRST_SD2 0x084F
> +#define PCI_DEVICE_ID_INTEL_MRFL_MMC 0x1190

Please read the top of this file for why you shouldn't be adding new
device ids to it.

thanks,

greg k-h

2013-10-01 20:10:47

by David Cohen

Subject: Re: [PATCH 1/2] pci_id: add Intel Merrifield mmc pci id

On 10/01/2013 01:07 PM, Greg KH wrote:
> On Tue, Oct 01, 2013 at 01:00:32PM -0700, David Cohen wrote:
>> Signed-off-by: David Cohen <[email protected]>
>> ---
>> include/linux/pci_ids.h | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
>> index 97fbecd..2a89103 100644
>> --- a/include/linux/pci_ids.h
>> +++ b/include/linux/pci_ids.h
>> @@ -2551,6 +2551,7 @@
>> #define PCI_DEVICE_ID_INTEL_MFD_EMMC0 0x0823
>> #define PCI_DEVICE_ID_INTEL_MFD_EMMC1 0x0824
>> #define PCI_DEVICE_ID_INTEL_MRST_SD2 0x084F
>> +#define PCI_DEVICE_ID_INTEL_MRFL_MMC 0x1190
>
> Please read the top of this file for why you shouldn't be adding new
> device ids to it.

Thanks for the reply. I am sending new patch.

Br, David

>
> thanks,
>
> greg k-h
>