| Message ID | 1381344554-23392-1-git-send-email-kamal@canonical.com |
|---|---|
| State | New |
| Headers | show |
Hi Kamal, On 10/09/2013 11:49 AM, Kamal Mostafa wrote: > This is a note to let you know that I have just added a patch titled > > usb: dwc3: add support for Merrifield > > to the linux-3.8.y-queue branch of the 3.8.y.z extended stable tree > which can be found at: > > http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.8.y-queue > > This patch is scheduled to be released in version 3.8.13.11. > > If you, or anyone else, feels it should not be added to this tree, please > reply to this email. This patch was validated for DWC3 on 3.10+. If your tree did not backport DWC3 patches up to 3.10, I'd suggest to drop it. Br, David Cohen
On Wed, 2013-10-09 at 11:52 -0700, David Cohen wrote: > Hi Kamal, > > On 10/09/2013 11:49 AM, Kamal Mostafa wrote: > > This is a note to let you know that I have just added a patch titled > > > > usb: dwc3: add support for Merrifield > > > > to the linux-3.8.y-queue branch of the 3.8.y.z extended stable tree > > which can be found at: > > > > http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.8.y-queue > > > > This patch is scheduled to be released in version 3.8.13.11. > > > > If you, or anyone else, feels it should not be added to this tree, please > > reply to this email. > > This patch was validated for DWC3 on 3.10+. If your tree did not > backport DWC3 patches up to 3.10, I'd suggest to drop it. > > Br, David Cohen > Hi David- Thanks for reviewing this. The 3.8-stable tree does indeed carry all the DWC3 patches up through v3.10.15, except for these two: 68907a7 usb: dwc3: pci: add basic suspend/resume support ... That is not present in 3.8-stable. I don't think this is a prerequisite for the Baytrail/Merrifield commits, but I could easily be convinced to pick it up too if you wish -- it's an easy cherry-pick. d82f3e3 usb: dwc3: glue layers shouldn't know about the core IP ... No functional changes in that commit. So I'm inclined to proceed with applying Baytrail/Merrifield to 3.8-stable, unless you object s'more. They've also been applied to 3.5-stable already. Ok? -Kamal
On 10/09/2013 01:15 PM, Kamal Mostafa wrote: > On Wed, 2013-10-09 at 11:52 -0700, David Cohen wrote: >> Hi Kamal, >> >> On 10/09/2013 11:49 AM, Kamal Mostafa wrote: >>> This is a note to let you know that I have just added a patch titled >>> >>> usb: dwc3: add support for Merrifield >>> >>> to the linux-3.8.y-queue branch of the 3.8.y.z extended stable tree >>> which can be found at: >>> >>> http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.8.y-queue >>> >>> This patch is scheduled to be released in version 3.8.13.11. >>> >>> If you, or anyone else, feels it should not be added to this tree, please >>> reply to this email. >> >> This patch was validated for DWC3 on 3.10+. If your tree did not >> backport DWC3 patches up to 3.10, I'd suggest to drop it. >> >> Br, David Cohen >> > > > Hi David- > > Thanks for reviewing this. The 3.8-stable tree does indeed carry all > the DWC3 patches up through v3.10.15, except for these two: > > 68907a7 usb: dwc3: pci: add basic suspend/resume support > > ... That is not present in 3.8-stable. I don't think this is a > prerequisite for the Baytrail/Merrifield commits, but I could easily be > convinced to pick it up too if you wish -- it's an easy cherry-pick. > > d82f3e3 usb: dwc3: glue layers shouldn't know about the core IP > > ... No functional changes in that commit. > > > So I'm inclined to proceed with applying Baytrail/Merrifield to > 3.8-stable, unless you object s'more. They've also been applied to > 3.5-stable already. In this case I can give my ack for 3.8 case. But I guess Merrifield was dropped from 3.5-stable according to message I got from Luis after I replied this same thing I did to 3.8. Br, David > > Ok? > > -Kamal >
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c index fb144a2b..f334a06 100644 --- a/drivers/usb/dwc3/dwc3-pci.c +++ b/drivers/usb/dwc3/dwc3-pci.c @@ -51,6 +51,7 @@ #define PCI_VENDOR_ID_SYNOPSYS 0x16c3 #define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3 0xabcd #define PCI_DEVICE_ID_INTEL_BYT 0x0f37 +#define PCI_DEVICE_ID_INTEL_MRFLD 0x119e struct dwc3_pci { struct device *dev; @@ -212,6 +213,7 @@ static DEFINE_PCI_DEVICE_TABLE(dwc3_pci_id_table) = { PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3), }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BYT), }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MRFLD), }, { } /* Terminating Entry */ }; MODULE_DEVICE_TABLE(pci, dwc3_pci_id_table);
This is a note to let you know that I have just added a patch titled usb: dwc3: add support for Merrifield to the linux-3.8.y-queue branch of the 3.8.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.8.y-queue This patch is scheduled to be released in version 3.8.13.11. If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.8.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Kamal ------ From 78dfa57e0e97ebb04678cc7665dbd5805ae08c8b Mon Sep 17 00:00:00 2001 From: David Cohen <david.a.cohen@linux.intel.com> Date: Thu, 26 Sep 2013 13:01:44 -0700 Subject: usb: dwc3: add support for Merrifield commit 85601f8cf67c56a561a6dd5e130e65fdc179047d upstream. Add PCI id for Intel Merrifield Signed-off-by: David Cohen <david.a.cohen@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> --- drivers/usb/dwc3/dwc3-pci.c | 2 ++ 1 file changed, 2 insertions(+) -- 1.8.1.2