diff options
| author | Andrei Danaila <adanaila@codeaurora.org> | 2014-10-08 14:19:40 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 21:10:52 -0700 |
| commit | a7cbc2b96f3557143f40eb9f71bce5b481c2a251 (patch) | |
| tree | da523a7b90a5d2b76bba9dcb40470f6b32632e9e /drivers | |
| parent | 0e9efcc15bb6e86ba866bc7fcfd8a01f092cad3b (diff) | |
msm: mhi: Enable MHI support for msmzirc
Add the msmzirc device in the list of supported PCI devices
by the MHI driver to enable to PCIe framework to probe MHI
in the event of discovering this device on the bus.
CRs-Fixed: 736039
Change-Id: I66eb5f67885d60c579c33c47ce696d66c6c428b5
Signed-off-by: Andrei Danaila <adanaila@codeaurora.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/platform/msm/mhi/mhi_iface.c | 11 | ||||
| -rw-r--r-- | drivers/platform/msm/mhi/mhi_macros.h | 3 | ||||
| -rw-r--r-- | drivers/platform/msm/mhi/mhi_main.c | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/drivers/platform/msm/mhi/mhi_iface.c b/drivers/platform/msm/mhi/mhi_iface.c index 6b064ba26a00..292d62644e0c 100644 --- a/drivers/platform/msm/mhi/mhi_iface.c +++ b/drivers/platform/msm/mhi/mhi_iface.c @@ -32,7 +32,9 @@ static int __exit mhi_plat_remove(struct platform_device *pdev); void *mhi_ipc_log; static DEFINE_PCI_DEVICE_TABLE(mhi_pcie_device_id) = { - { MHI_PCIE_VENDOR_ID, MHI_PCIE_DEVICE_ID, + { MHI_PCIE_VENDOR_ID, MHI_PCIE_DEVICE_ID_9x35, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, + { MHI_PCIE_VENDOR_ID, MHI_PCIE_DEVICE_ID_ZIRC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { 0, }, }; @@ -286,9 +288,14 @@ error: } DECLARE_PCI_FIXUP_HEADER(MHI_PCIE_VENDOR_ID, - MHI_PCIE_DEVICE_ID, + MHI_PCIE_DEVICE_ID_9x35, mhi_msm_fixup); +DECLARE_PCI_FIXUP_HEADER(MHI_PCIE_VENDOR_ID, + MHI_PCIE_DEVICE_ID_ZIRC, + mhi_msm_fixup); + + module_exit(mhi_exit); module_init(mhi_init); diff --git a/drivers/platform/msm/mhi/mhi_macros.h b/drivers/platform/msm/mhi/mhi_macros.h index d2e39856636f..6151c2b033f4 100644 --- a/drivers/platform/msm/mhi/mhi_macros.h +++ b/drivers/platform/msm/mhi/mhi_macros.h @@ -46,7 +46,8 @@ #define MAX_NR_TRBS_PER_SOFT_CHAN 10 #define MAX_NR_TRBS_PER_HARD_CHAN (128 + 16) #define MHI_PCIE_VENDOR_ID 0x17CB -#define MHI_PCIE_DEVICE_ID 0x0300 +#define MHI_PCIE_DEVICE_ID_9x35 0x0300 +#define MHI_PCIE_DEVICE_ID_ZIRC 0x0301 #define TRB_MAX_DATA_SIZE 0x1000 diff --git a/drivers/platform/msm/mhi/mhi_main.c b/drivers/platform/msm/mhi/mhi_main.c index 37c4065eb39a..7273e7dc940a 100644 --- a/drivers/platform/msm/mhi/mhi_main.c +++ b/drivers/platform/msm/mhi/mhi_main.c @@ -115,15 +115,7 @@ int mhi_init_pcie_device(struct mhi_pcie_dev_info *mhi_pcie_dev) mhi_pcie_dev->core.manufact_id = pcie_device->vendor; mhi_pcie_dev->core.dev_id = pcie_device->device; - - if (mhi_pcie_dev->core.manufact_id != MHI_PCIE_VENDOR_ID || - mhi_pcie_dev->core.dev_id != MHI_PCIE_DEVICE_ID) { - mhi_log(MHI_MSG_ERROR, "Incorrect device/manufacturer ID\n"); - goto cfg_err; - } return 0; -cfg_err: - iounmap((void *)mhi_pcie_dev->core.bar2_base); io_map_err: iounmap((void *)mhi_pcie_dev->core.bar0_base); mhi_device_list_error: |