APPLIED[E]: [SRU][OEM-OSP1-B/E/F/U][PATCH] usb: dwc3: pci: add ID for the Intel Comet Lake -H variant

[Kleber Souza]

On 2019-12-17 07:03, You-Sheng Yang wrote:
> From: Heikki Krogerus <heikki.krogerus at linux.intel.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1856642
> 
> The original ID that was added for Comet Lake PCH was
> actually for the -LP (low power) variant even though the
> constant for it said CMLH. Changing that while at it.
> 
> Signed-off-by: Heikki Krogerus <heikki.krogerus at linux.intel.com>
> Acked-by: Felipe Balbi <balbi at kernel.org>
> Cc: stable <stable at vger.kernel.org>
> Link: https://lore.kernel.org/r/20191212093713.60614-1-heikki.krogerus@linux.intel.com
> Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> (cherry picked from commit 3c3caae4cd6e122472efcf64759ff6392fb6bce2)
> Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
> ---
>  drivers/usb/dwc3/dwc3-pci.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
> index b4e42d597211..8fa39e664940 100644
> --- a/drivers/usb/dwc3/dwc3-pci.c
> +++ b/drivers/usb/dwc3/dwc3-pci.c
> @@ -29,7 +29,8 @@
>  #define PCI_DEVICE_ID_INTEL_BXT_M		0x1aaa
>  #define PCI_DEVICE_ID_INTEL_APL			0x5aaa
>  #define PCI_DEVICE_ID_INTEL_KBP			0xa2b0
> -#define PCI_DEVICE_ID_INTEL_CMLH		0x02ee
> +#define PCI_DEVICE_ID_INTEL_CMLLP		0x02ee
> +#define PCI_DEVICE_ID_INTEL_CMLH		0x06ee
>  #define PCI_DEVICE_ID_INTEL_GLK			0x31aa
>  #define PCI_DEVICE_ID_INTEL_CNPLP		0x9dee
>  #define PCI_DEVICE_ID_INTEL_CNPH		0xa36e
> @@ -306,6 +307,9 @@ static const struct pci_device_id dwc3_pci_id_table[] = {
>  	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MRFLD),
>  	  (kernel_ulong_t) &dwc3_pci_mrfld_properties, },
>  
> +	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CMLLP),
> +	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
> +
>  	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CMLH),
>  	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
>  
> 

Applied to eoan/master-next branch.

Thanks,
Kleber