Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71362bb1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mhi: Enable MHI support for msmzirc"

parents b94544da 4f82ca19

drivers/platform/msm/mhi/mhi_iface.c

+9 −2
Original line number Diff line number Diff line
@@ -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);

drivers/platform/msm/mhi/mhi_macros.h

+2 −1
Original line number Diff line number Diff line
@@ -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

drivers/platform/msm/mhi/mhi_main.c

+0 −8
Original line number Diff line number Diff line
@@ -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: