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

Commit b3b3625e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa2: Add changes compatible to kernel-4.14"

parents 4a2f601e 74e5f415

drivers/platform/msm/ipa/ipa_api.c

+4 −0
Original line number Diff line number Diff line
@@ -3161,6 +3161,10 @@ static int ipa_generic_plat_drv_probe(struct platform_device *pdev_p) 


	/* call probe based on IPA HW version */

	switch (ipa_api_hw_type) {

	case IPA_HW_v2_6L:

		result = ipa_plat_drv_probe(pdev_p, ipa_api_ctrl,

			ipa_plat_drv_match);

		break;

	case IPA_HW_v3_0:

	case IPA_HW_v3_1:

	case IPA_HW_v3_5:

drivers/platform/msm/ipa/ipa_api.h

+19 −0
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ 
#define _IPA_API_H_



struct ipa_api_controller {



	int (*ipa_connect)(const struct ipa_connect_params *in,

		struct ipa_sps_params *sps, u32 *clnt_hdl);



	int (*ipa_disconnect)(u32 clnt_hdl);



	int (*ipa_reset_endpoint)(u32 clnt_hdl);



	int (*ipa_clear_endpoint_delay)(u32 clnt_hdl);
@@ -494,6 +500,19 @@ struct ipa_api_controller { 


};



#ifdef CONFIG_IPA

int ipa_plat_drv_probe(struct platform_device *pdev_p,

	struct ipa_api_controller *api_ctrl,

	const struct of_device_id *pdrv_match);

#else

static inline int ipa_plat_drv_probe(struct platform_device *pdev_p,

	struct ipa_api_controller *api_ctrl,

	const struct of_device_id *pdrv_match)

{

	return -ENODEV;

}

#endif /* (CONFIG_IPA) */



#ifdef CONFIG_IPA3

int ipa3_plat_drv_probe(struct platform_device *pdev_p,

	struct ipa_api_controller *api_ctrl,

drivers/platform/msm/ipa/ipa_v2/ipa.c

+130 −122

File changed.

Preview size limit exceeded, changes collapsed.

drivers/platform/msm/ipa/ipa_v2/ipa_debugfs.c

+53 −53

File changed.

Preview size limit exceeded, changes collapsed.

drivers/platform/msm/ipa/ipa_v2/ipa_dma.c

+3 −3
Original line number Diff line number Diff line
@@ -875,7 +875,7 @@ static ssize_t ipa_dma_debugfs_reset_statistics(struct file *file, 
	return count;

}



const struct file_operations ipadma_stats_ops = {

static const struct file_operations ipadma_stats_ops = {

	.read = ipa_dma_debugfs_read,

	.write = ipa_dma_debugfs_reset_statistics,

};
@@ -884,7 +884,7 @@ static void ipa_dma_debugfs_init(void) 
{

	const mode_t read_write_mode = 0666;



	dent = debugfs_create_dir("ipa_dma", 0);

	dent = debugfs_create_dir("ipa_dma", NULL);

	if (IS_ERR(dent)) {

		IPADMA_ERR("fail to create folder ipa_dma\n");

		return;
@@ -892,7 +892,7 @@ static void ipa_dma_debugfs_init(void) 


	dfile_info =

		debugfs_create_file("info", read_write_mode, dent,

				 0, &ipadma_stats_ops);

				 NULL, &ipadma_stats_ops);

	if (!dfile_info || IS_ERR(dfile_info)) {

		IPADMA_ERR("fail to create file stats\n");

		goto fail;