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

Commit f50d1a70 authored by Mayank Rana's avatar Mayank Rana
Browse files

usb: gadget: f_qdss: Fix compilation errors 



This change fixes compilation errors as below:
  a. start using dwc3-msm.h which is having required data structure
  and function declaration to communicate with USB controller driver
  APIs (i.e. start using GKI related changes)
  b. remove usage of endless flag as it is not available
  c. pass BAM peripheral related configuration parameters using
  msm_ep_config() API instead of passing through udc_priv variable

Change-Id: I542c86570749eb2b3113d88ec6bea3a9e342f176
Signed-off-by: default avatarMayank Rana <mrana@codeaurora.org>
parent bfa3f5f9

drivers/usb/gadget/function/f_qdss.c

+1 −5
Original line number Diff line number Diff line
@@ -539,7 +539,6 @@ static void qdss_eps_disable(struct usb_function *f) 


	if (qdss->data_enabled) {

		usb_ep_disable(qdss->port.data);

		qdss->port.data->endless = false;

		qdss->data_enabled = 0;

	}

}
@@ -681,12 +680,9 @@ static int qdss_set_alt(struct usb_function *f, unsigned int intf, 
			goto fail;

		}



		qdss->port.data->endless = true;

		ret = usb_ep_enable(qdss->port.data);

		if (ret) {

			qdss->port.data->endless = false;

		if (ret)

			goto fail;

		}



		qdss->port.data->driver_data = qdss;

		qdss->data_enabled = 1;

drivers/usb/gadget/function/u_qdss.c

+6 −5
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ 
#include <linux/device.h>

#include <linux/usb_bam.h>

#include <linux/dma-mapping.h>

#include <linux/usb/dwc3-msm.h>



#include "f_qdss.h"

static int alloc_sps_req(struct usb_ep *data_ep)

{

	struct usb_request *req = NULL;

	struct f_qdss *qdss = data_ep->driver_data;

	u32 sps_params = 0;



	pr_debug("send_sps_req\n");
@@ -24,9 +24,6 @@ static int alloc_sps_req(struct usb_ep *data_ep) 
	}



	req->length = 32*1024;

	sps_params = MSM_SPS_MODE | MSM_DISABLE_WB |

			qdss->bam_info.usb_bam_pipe_idx;

	req->udc_priv = sps_params;

	qdss->endless_req = req;



	return 0;
@@ -125,10 +122,14 @@ static int init_data(struct usb_ep *ep) 
{

	struct f_qdss *qdss = ep->driver_data;

	int res = 0;

	u32 sps_params = 0;



	pr_debug("%s\n", __func__);



	res = msm_ep_config(ep, qdss->endless_req);

	sps_params = MSM_SPS_MODE | MSM_DISABLE_WB |

			qdss->bam_info.usb_bam_pipe_idx;



	res = msm_ep_config(ep, qdss->endless_req, sps_params);

	if (res)

		pr_err("msm_ep_config failed\n");

include/linux/usb/dwc3-msm.h

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 
#ifndef __LINUX_USB_DWC3_MSM_H

#define __LINUX_USB_DWC3_MSM_H



#include <linux/scatterlist.h>

#include <linux/usb/gadget.h>



/* used for struct usb_phy flags */

#define ENABLE_DP_MANUAL_PULLUP		BIT(0)

#define ENABLE_SECONDARY_PHY		BIT(1)