mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-06 22:08:54 +00:00
c296141d92
https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.105 Removed upstreamed: generic/backport-6.1/860-v6.6-bus-mhi-host-pci_generic-add-support-for-Telit-FE990.patch See: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/diff/drivers/bus/mhi/host/pci_generic.c?h=v6.1.105&id=da578d3b2d236b50e356b1a9d770ad19165de31c All other patches automatically rebased. Build system: bcm4908 bcm53xx Adjusted generic/config-6.1 for new ksym: ARM64_ERRATUM_3194386 and 3312417[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/diff/arch/arm64/Kconfig?h=linux-6.1.y&id=286c8ca924b220212fdeab81cb652fdaa77e38fe Signed-off-by: Zxl hhyccc <zxlhhy@gmail.com> Link: https://github.com/openwrt/openwrt/pull/16174 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
67 lines
2.8 KiB
Diff
67 lines
2.8 KiB
Diff
From e8bc362f158f45185778e2bec081146aeeb283b5 Mon Sep 17 00:00:00 2001
|
|
From: Slark Xiao <slark_xiao@163.com>
|
|
Date: Mon, 7 Nov 2022 19:27:00 +0800
|
|
Subject: [PATCH 03/13] bus: mhi: host: pci_generic: Add definition for some
|
|
VIDs
|
|
|
|
To make code neat and for convenience purpose, add definition for some
|
|
VIDs. Adding it locally until these VIDs are used in multiple places.
|
|
|
|
Signed-off-by: Slark Xiao <slark_xiao@163.com>
|
|
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
|
|
Link: https://lore.kernel.org/r/20221107112700.773-1-slark_xiao@163.com
|
|
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
|
---
|
|
drivers/bus/mhi/host/pci_generic.c | 18 +++++++++++-------
|
|
1 file changed, 11 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/bus/mhi/host/pci_generic.c
|
|
+++ b/drivers/bus/mhi/host/pci_generic.c
|
|
@@ -24,6 +24,10 @@
|
|
|
|
#define HEALTH_CHECK_PERIOD (HZ * 2)
|
|
|
|
+/* PCI VID definitions */
|
|
+#define PCI_VENDOR_ID_THALES 0x1269
|
|
+#define PCI_VENDOR_ID_QUECTEL 0x1eac
|
|
+
|
|
/**
|
|
* struct mhi_pci_dev_info - MHI PCI device specific information
|
|
* @config: MHI controller configuration
|
|
@@ -560,11 +564,11 @@ static const struct pci_device_id mhi_pc
|
|
.driver_data = (kernel_ulong_t) &mhi_telit_fn990_info },
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0308),
|
|
.driver_data = (kernel_ulong_t) &mhi_qcom_sdx65_info },
|
|
- { PCI_DEVICE(0x1eac, 0x1001), /* EM120R-GL (sdx24) */
|
|
+ { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1001), /* EM120R-GL (sdx24) */
|
|
.driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info },
|
|
- { PCI_DEVICE(0x1eac, 0x1002), /* EM160R-GL (sdx24) */
|
|
+ { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1002), /* EM160R-GL (sdx24) */
|
|
.driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info },
|
|
- { PCI_DEVICE(0x1eac, 0x2001), /* EM120R-GL for FCCL (sdx24) */
|
|
+ { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x2001), /* EM120R-GL for FCCL (sdx24) */
|
|
.driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info },
|
|
/* T99W175 (sdx55), Both for eSIM and Non-eSIM */
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0ab),
|
|
@@ -588,16 +592,16 @@ static const struct pci_device_id mhi_pc
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0d9),
|
|
.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx65_info },
|
|
/* MV31-W (Cinterion) */
|
|
- { PCI_DEVICE(0x1269, 0x00b3),
|
|
+ { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00b3),
|
|
.driver_data = (kernel_ulong_t) &mhi_mv31_info },
|
|
/* MV31-W (Cinterion), based on new baseline */
|
|
- { PCI_DEVICE(0x1269, 0x00b4),
|
|
+ { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00b4),
|
|
.driver_data = (kernel_ulong_t) &mhi_mv31_info },
|
|
/* MV32-WA (Cinterion) */
|
|
- { PCI_DEVICE(0x1269, 0x00ba),
|
|
+ { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00ba),
|
|
.driver_data = (kernel_ulong_t) &mhi_mv32_info },
|
|
/* MV32-WB (Cinterion) */
|
|
- { PCI_DEVICE(0x1269, 0x00bb),
|
|
+ { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00bb),
|
|
.driver_data = (kernel_ulong_t) &mhi_mv32_info },
|
|
/* T99W175 (sdx55), HP variant */
|
|
{ PCI_DEVICE(0x03f0, 0x0a6c),
|