| Message ID | 1306859056-2829-2-git-send-email-manoj.iyer@canonical.com |
|---|---|
| State | New |
| Headers | show |
Looks like repeating a already known quirk mechanism for another ID. Though I don't think this is SAUCE if it is going upstream. And I would rather have the commit message of the patch as it is in the submission instead of the below... -Stefan On 31.05.2011 18:24, Manoj Iyer wrote: > This patch has been submitted upstream and is Q'ed for Linus. > > 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 bd80f63..b529d1f 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -2758,6 +2758,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 3adb06e..a2e4f69 100644 > --- a/include/linux/pci_ids.h > +++ b/include/linux/pci_ids.h > @@ -1534,6 +1534,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 >
Stefan, You mean you would rather have it as a cherry-pick from upstream tree? On Tue, 31 May 2011, Stefan Bader wrote: > Looks like repeating a already known quirk mechanism for another ID. Though I > don't think this is SAUCE if it is going upstream. And I would rather have > the commit message of the patch as it is in the submission instead of the > below... > > -Stefan > > On 31.05.2011 18:24, Manoj Iyer wrote: >> This patch has been submitted upstream and is Q'ed for Linus. >> >> 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 bd80f63..b529d1f 100644 >> --- a/drivers/pci/quirks.c >> +++ b/drivers/pci/quirks.c >> @@ -2758,6 +2758,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 3adb06e..a2e4f69 100644 >> --- a/include/linux/pci_ids.h >> +++ b/include/linux/pci_ids.h >> @@ -1534,6 +1534,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 >> > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team > > -- ==================== Manoj Iyer Ubuntu/Canonical Hardware Enablement ====================
On 31.05.2011 19:06, Manoj Iyer wrote: > > Stefan, > > You mean you would rather have it as a cherry-pick from upstream tree? > That ideally, though it is probably a question how long that takes >>> This patch has been submitted upstream and is Q'ed for Linus. I was more complaining about the quite limited and not very descriptive commit message. I do not assume this would be in the upstream commit.
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index bd80f63..b529d1f 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -2758,6 +2758,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 3adb06e..a2e4f69 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1534,6 +1534,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
This patch has been submitted upstream and is Q'ed for Linus. 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(-)