target/linux/generic/backport-6.1/852-v6.2-bus-mhi-host-pci_generic-Add-definition-for-some-VID.patch

   1 From e8bc362f158f45185778e2bec081146aeeb283b5 Mon Sep 17 00:00:00 2001
   2 From: Slark Xiao <slark_xiao@163.com>
   3 Date: Mon, 7 Nov 2022 19:27:00 +0800
   4 Subject: [PATCH 03/13] bus: mhi: host: pci_generic: Add definition for some
   5  VIDs
   6
   7 To make code neat and for convenience purpose, add definition for some
   8 VIDs. Adding it locally until these VIDs are used in multiple places.
   9
  10 Signed-off-by: Slark Xiao <slark_xiao@163.com>
  11 Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
  12 Link: https://lore.kernel.org/r/20221107112700.773-1-slark_xiao@163.com
  13 Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  14 ---
  15  drivers/bus/mhi/host/pci_generic.c | 18 +++++++++++-------
  16  1 file changed, 11 insertions(+), 7 deletions(-)
  17
  18 --- a/drivers/bus/mhi/host/pci_generic.c
  19 +++ b/drivers/bus/mhi/host/pci_generic.c
  20 @@ -24,6 +24,10 @@
  21
  22  #define HEALTH_CHECK_PERIOD (HZ * 2)
  23
  24 +/* PCI VID definitions */
  25 +#define PCI_VENDOR_ID_THALES   0x1269
  26 +#define PCI_VENDOR_ID_QUECTEL  0x1eac
  27 +
  28  /**
  29   * struct mhi_pci_dev_info - MHI PCI device specific information
  30   * @config: MHI controller configuration
  31 @@ -557,11 +561,11 @@ static const struct pci_device_id mhi_pc
  32                 .driver_data = (kernel_ulong_t) &mhi_telit_fn990_info },
  33         { PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0308),
  34                 .driver_data = (kernel_ulong_t) &mhi_qcom_sdx65_info },
  35 -       { PCI_DEVICE(0x1eac, 0x1001), /* EM120R-GL (sdx24) */
  36 +       { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1001), /* EM120R-GL (sdx24) */
  37                 .driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info },
  38 -       { PCI_DEVICE(0x1eac, 0x1002), /* EM160R-GL (sdx24) */
  39 +       { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1002), /* EM160R-GL (sdx24) */
  40                 .driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info },
  41 -       { PCI_DEVICE(0x1eac, 0x2001), /* EM120R-GL for FCCL (sdx24) */
  42 +       { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x2001), /* EM120R-GL for FCCL (sdx24) */
  43                 .driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info },
  44         /* T99W175 (sdx55), Both for eSIM and Non-eSIM */
  45         { PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0ab),
  46 @@ -585,16 +589,16 @@ static const struct pci_device_id mhi_pc
  47         { PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0d9),
  48                 .driver_data = (kernel_ulong_t) &mhi_foxconn_sdx65_info },
  49         /* MV31-W (Cinterion) */
  50 -       { PCI_DEVICE(0x1269, 0x00b3),
  51 +       { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00b3),
  52                 .driver_data = (kernel_ulong_t) &mhi_mv31_info },
  53         /* MV31-W (Cinterion), based on new baseline */
  54 -       { PCI_DEVICE(0x1269, 0x00b4),
  55 +       { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00b4),
  56                 .driver_data = (kernel_ulong_t) &mhi_mv31_info },
  57         /* MV32-WA (Cinterion) */
  58 -       { PCI_DEVICE(0x1269, 0x00ba),
  59 +       { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00ba),
  60                 .driver_data = (kernel_ulong_t) &mhi_mv32_info },
  61         /* MV32-WB (Cinterion) */
  62 -       { PCI_DEVICE(0x1269, 0x00bb),
  63 +       { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00bb),
  64                 .driver_data = (kernel_ulong_t) &mhi_mv32_info },
  65         /* T99W175 (sdx55), HP variant */
  66         { PCI_DEVICE(0x03f0, 0x0a6c),