[PATCH V1 1/2] mmc: sdhci-pci-o2micro: Bug fix for O2 host controller Seabird1

[PATCH V1 1/2] mmc: sdhci-pci-o2micro: Bug fix for O2 host controller Seabird1

[shirley her]

Add bug fix for O2 host controller Seabird1

Signed-off-by: Shirley Her <shirley.her@bayhubtech.com>
---
change in V1:
1. Add quriks2 and mmc->caps2 for Seabird1
2. Add get_cd support for Seabird1
---
 drivers/mmc/host/sdhci-pci-o2micro.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c
index e2a846885902..ed3c605fcf0c 100644
--- a/drivers/mmc/host/sdhci-pci-o2micro.c
+++ b/drivers/mmc/host/sdhci-pci-o2micro.c
@@ -561,6 +561,12 @@ static int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot)
 			slot->host->mmc_host_ops.get_cd = sdhci_o2_get_cd;
 		}
 
+		if (chip->pdev->device == PCI_DEVICE_ID_O2_SEABIRD1) {
+			slot->host->mmc_host_ops.get_cd = sdhci_o2_get_cd;
+			host->mmc->caps2 |= MMC_CAP2_NO_SDIO;
+			host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN;
+		}
+
 		host->mmc_host_ops.execute_tuning = sdhci_o2_execute_tuning;
 
 		if (chip->pdev->device != PCI_DEVICE_ID_O2_FUJIN2)
-- 
2.25.1

Re: [PATCH V1 1/2] mmc: sdhci-pci-o2micro: Bug fix for O2 host controller Seabird1

[Adrian Hunter]

Sorry, I have been away for a while, but I will look at it shortly.

On 3/08/20 10:23 pm, Shirley Her (SC) wrote:
> Hi, Adrian:
> 
> Do you have chance to review the patched code?
> 
> Thanks,
> Shirley
> 
> ----------------------------------------------------------------------------
> *From:* Shirley Her (SC) <shirley.her@bayhubtech.com>
> *Sent:* Monday, July 20, 2020 6:18 PM
> *To:* adrian.hunter@intel.com <adrian.hunter@intel.com>;
> ulf.hansson@linaro.org <ulf.hansson@linaro.org>; linux-mmc@vger.kernel.org
> <linux-mmc@vger.kernel.org>; linux-kernel@vger.kernel.org
> <linux-kernel@vger.kernel.org>
> *Cc:* Shaper Liu (WH) <shaper.liu@bayhubtech.com>; Chevron Li (WH)
> <chevron.li@bayhubtech.com>; Xiaoguang Yu (WH)
> <xiaoguang.yu@bayhubtech.com>; Max Huang (SC) <max.huang@bayhubtech.com>;
> Shirley Her (SC) <shirley.her@bayhubtech.com>
> *Subject:* [PATCH V1 1/2] mmc: sdhci-pci-o2micro: Bug fix for O2 host
> controller Seabird1
>  
> Add bug fix for O2 host controller Seabird1
> 
> Signed-off-by: Shirley Her <shirley.her@bayhubtech.com>
> ---
> change in V1:
> 1. Add quriks2 and mmc->caps2 for Seabird1
> 2. Add get_cd support for Seabird1
> ---
>  drivers/mmc/host/sdhci-pci-o2micro.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c
> b/drivers/mmc/host/sdhci-pci-o2micro.c
> index e2a846885902..ed3c605fcf0c 100644
> --- a/drivers/mmc/host/sdhci-pci-o2micro.c
> +++ b/drivers/mmc/host/sdhci-pci-o2micro.c
> @@ -561,6 +561,12 @@ static int sdhci_pci_o2_probe_slot(struct
> sdhci_pci_slot *slot)
>                          slot->host->mmc_host_ops.get_cd = sdhci_o2_get_cd;
>                  }
>  
> +               if (chip->pdev->device == PCI_DEVICE_ID_O2_SEABIRD1) {
> +                       slot->host->mmc_host_ops.get_cd = sdhci_o2_get_cd;
> +                       host->mmc->caps2 |= MMC_CAP2_NO_SDIO;
> +                       host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN;
> +               }
> +
>                  host->mmc_host_ops.execute_tuning = sdhci_o2_execute_tuning;
>  
>                  if (chip->pdev->device != PCI_DEVICE_ID_O2_FUJIN2)
> -- 
> 2.25.1
> 

Re: [PATCH V1 1/2] mmc: sdhci-pci-o2micro: Bug fix for O2 host controller Seabird1

[Ulf Hansson]

On Tue, 21 Jul 2020 at 03:18, shirley her <shirley.her@bayhubtech.com> wrote:
>
> Add bug fix for O2 host controller Seabird1
>
> Signed-off-by: Shirley Her <shirley.her@bayhubtech.com>

Applied for next (a while ago), thanks!

> ---
> change in V1:
> 1. Add quriks2 and mmc->caps2 for Seabird1
> 2. Add get_cd support for Seabird1

Future wise, I wouldn't mind that you fold some of this information
into the commit message. It's always good to have a good description
of the change.

Kind regards
Uffe


> ---
>  drivers/mmc/host/sdhci-pci-o2micro.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c
> index e2a846885902..ed3c605fcf0c 100644
> --- a/drivers/mmc/host/sdhci-pci-o2micro.c
> +++ b/drivers/mmc/host/sdhci-pci-o2micro.c
> @@ -561,6 +561,12 @@ static int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot)
>                         slot->host->mmc_host_ops.get_cd = sdhci_o2_get_cd;
>                 }
>
> +               if (chip->pdev->device == PCI_DEVICE_ID_O2_SEABIRD1) {
> +                       slot->host->mmc_host_ops.get_cd = sdhci_o2_get_cd;
> +                       host->mmc->caps2 |= MMC_CAP2_NO_SDIO;
> +                       host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN;
> +               }
> +
>                 host->mmc_host_ops.execute_tuning = sdhci_o2_execute_tuning;
>
>                 if (chip->pdev->device != PCI_DEVICE_ID_O2_FUJIN2)
> --
> 2.25.1
>