Patchwork UBUNTU: SAUCE: mmc: Enable MMC card reader for RICOH [1180:e823]

login
register
mail settings
Submitter Manoj Iyer
Date May 31, 2011, 7:11 p.m.
Message ID <1306869065-3780-2-git-send-email-manoj.iyer@canonical.com>
Download mbox | patch
Permalink /patch/98073/
State New
Headers show

Comments

Manoj Iyer - May 31, 2011, 7:11 p.m.
The patch adds a quirk to disable the MMC card reader in
hardware and enable reading MMC cards using standard SD
interfaces.

This patch is upstream, it is Q'ed for 3.0 with stable@ tag.
Please refer https://lkml.org/lkml/2011/5/26/243

BugLink: http://bugs.launchpad.net/bugs/790754

Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
---
 drivers/pci/quirks.c    |    2 ++
 include/linux/pci_ids.h |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)
Andy Whitcroft - June 1, 2011, 7:40 a.m.
On Tue, May 31, 2011 at 02:11:05PM -0500, Manoj Iyer wrote:
> The patch adds a quirk to disable the MMC card reader in
> hardware and enable reading MMC cards using standard SD
> interfaces.
> 
> This patch is upstream, it is Q'ed for 3.0 with stable@ tag.
> Please refer https://lkml.org/lkml/2011/5/26/243

Define Q'ed?  From your email thread you emailed it to Chris (who may
be the maintainer) and had no response as yet.  The merge window for 3.0
has opened and closed, and it is not in linus' tree as yet yet so I don't
see it queued for 3.0.

-apw
Andy Whitcroft - June 1, 2011, 7:44 a.m.
On Wed, Jun 01, 2011 at 08:40:48AM +0100, Andy Whitcroft wrote:
> On Tue, May 31, 2011 at 02:11:05PM -0500, Manoj Iyer wrote:
> > The patch adds a quirk to disable the MMC card reader in
> > hardware and enable reading MMC cards using standard SD
> > interfaces.
> > 
> > This patch is upstream, it is Q'ed for 3.0 with stable@ tag.
> > Please refer https://lkml.org/lkml/2011/5/26/243
> 
> Define Q'ed?  From your email thread you emailed it to Chris (who may
> be the maintainer) and had no response as yet.  The merge window for 3.0
> has opened and closed, and it is not in linus' tree as yet yet so I don't
> see it queued for 3.0.

Asking scripts/get_maintainers.pl, it says you should have sent it here:

  Jesse Barnes <jbarnes@virtuousgeek.org> (supporter:PCI SUBSYSTEM)
  linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM)
  linux-kernel@vger.kernel.org (open list)

-apw
Stefan Bader - June 1, 2011, 7:44 a.m.
On 31.05.2011 21:11, Manoj Iyer wrote:
> The patch adds a quirk to disable the MMC card reader in
> hardware and enable reading MMC cards using standard SD
> interfaces.
>
This is much better. In fact (if I had looked at you mailing list reference 
yesterday) I would have noted that if I would be a maintainer, I would 
appreciate a bit of explanation in the body of the commit.

> This patch is upstream, it is Q'ed for 3.0 with stable@ tag.
> Please refer https://lkml.org/lkml/2011/5/26/243
>
> BugLink: http://bugs.launchpad.net/bugs/790754
>
> Signed-off-by: Manoj Iyer<manoj.iyer@canonical.com>
> ---
>   drivers/pci/quirks.c    |    2 ++
>   include/linux/pci_ids.h |    1 +
>   2 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index 9cd7000..7768cad 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -2721,6 +2721,8 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
>   }
>   DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
>   DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
> +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
> +DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
>   #endif /*CONFIG_MMC_RICOH_MMC*/
>
>   #if defined(CONFIG_DMAR) || defined(CONFIG_INTR_REMAP)
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index f1cbd85..7202ee1 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -1524,6 +1524,7 @@
>   #define PCI_DEVICE_ID_RICOH_RL5C476	0x0476
>   #define PCI_DEVICE_ID_RICOH_RL5C478	0x0478
>   #define PCI_DEVICE_ID_RICOH_R5C822	0x0822
> +#define PCI_DEVICE_ID_RICOH_R5CE823	0xe823
>   #define PCI_DEVICE_ID_RICOH_R5C832	0x0832
>   #define PCI_DEVICE_ID_RICOH_R5C843	0x0843
>
Manoj Iyer - June 1, 2011, 9:01 p.m.
> Asking scripts/get_maintainers.pl, it says you should have sent it here:
>
>  Jesse Barnes <jbarnes@virtuousgeek.org> (supporter:PCI SUBSYSTEM)
>  linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM)
>  linux-kernel@vger.kernel.org (open list)
>
The upstream developer I sent the patch to suggested a list cc's, I send 
out a V2 of the patch ccing various lists as per rtg's irc suggestion.

> -apw
>
>

--
====================
Manoj Iyer
Ubuntu/Canonical
Hardware Enablement
====================
Tim Gardner - June 6, 2011, 7:17 p.m.
On 05/31/2011 01:11 PM, Manoj Iyer wrote:
> The patch adds a quirk to disable the MMC card reader in
> hardware and enable reading MMC cards using standard SD
> interfaces.
>
> This patch is upstream, it is Q'ed for 3.0 with stable@ tag.
> Please refer https://lkml.org/lkml/2011/5/26/243
>
> BugLink: http://bugs.launchpad.net/bugs/790754
>
> Signed-off-by: Manoj Iyer<manoj.iyer@canonical.com>
> ---
>   drivers/pci/quirks.c    |    2 ++
>   include/linux/pci_ids.h |    1 +
>   2 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index 9cd7000..7768cad 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -2721,6 +2721,8 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
>   }
>   DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
>   DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
> +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
> +DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
>   #endif /*CONFIG_MMC_RICOH_MMC*/
>
>   #if defined(CONFIG_DMAR) || defined(CONFIG_INTR_REMAP)
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index f1cbd85..7202ee1 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -1524,6 +1524,7 @@
>   #define PCI_DEVICE_ID_RICOH_RL5C476	0x0476
>   #define PCI_DEVICE_ID_RICOH_RL5C478	0x0478
>   #define PCI_DEVICE_ID_RICOH_R5C822	0x0822
> +#define PCI_DEVICE_ID_RICOH_R5CE823	0xe823
>   #define PCI_DEVICE_ID_RICOH_R5C832	0x0832
>   #define PCI_DEVICE_ID_RICOH_R5C843	0x0843
>

As this is a relatively simple patch, and is restricted to a specific 
piece of hardware, I've applied it to Maverick, Natty, and Oneiric (with 
minor commit log edits).

Please continue to pursue upstream inclusion.

rtg

Patch

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 9cd7000..7768cad 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2721,6 +2721,8 @@  static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
 }
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
 DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
 #endif /*CONFIG_MMC_RICOH_MMC*/
 
 #if defined(CONFIG_DMAR) || defined(CONFIG_INTR_REMAP)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index f1cbd85..7202ee1 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1524,6 +1524,7 @@ 
 #define PCI_DEVICE_ID_RICOH_RL5C476	0x0476
 #define PCI_DEVICE_ID_RICOH_RL5C478	0x0478
 #define PCI_DEVICE_ID_RICOH_R5C822	0x0822
+#define PCI_DEVICE_ID_RICOH_R5CE823	0xe823
 #define PCI_DEVICE_ID_RICOH_R5C832	0x0832
 #define PCI_DEVICE_ID_RICOH_R5C843	0x0843