p2a42: Import fully working kernel sourceHEADn7.1

Change-Id: Ia4c94f09e29843b1af34d466243378a357e97b70

3 files changed, 81 insertions, 0 deletions

diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index 9a30c1e0..80326fa9 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -387,6 +387,15 @@ struct hc_driver {
 	void	(*dump_regs)(struct usb_hcd *);
 	void	(*set_autosuspend_delay)(struct usb_device *);
 	void	(*reset_sof_bug_handler)(struct usb_hcd *hcd, u32 val);
+
+	int (*sec_event_ring_setup)(struct usb_hcd *hcd, unsigned intr_num);
+	int (*sec_event_ring_cleanup)(struct usb_hcd *hcd, unsigned intr_num);
+	dma_addr_t (*get_sec_event_ring_dma_addr)(struct usb_hcd *hcd,
+			unsigned intr_num);
+	dma_addr_t (*get_xfer_ring_dma_addr)(struct usb_hcd *hcd,
+			struct usb_device *udev, struct usb_host_endpoint *ep);
+	dma_addr_t (*get_dcba_dma_addr)(struct usb_hcd *hcd,
+			struct usb_device *udev);
 };
 
 static inline int hcd_giveback_urb_in_bh(struct usb_hcd *hcd)
@@ -425,6 +434,17 @@ extern int usb_hcd_alloc_bandwidth(struct usb_device *udev,
 		struct usb_host_interface *old_alt,
 		struct usb_host_interface *new_alt);
 extern int usb_hcd_get_frame_number(struct usb_device *udev);
+extern int usb_hcd_sec_event_ring_setup(struct usb_device *udev,
+	unsigned intr_num);
+extern int usb_hcd_sec_event_ring_cleanup(struct usb_device *udev,
+	unsigned intr_num);
+extern dma_addr_t
+usb_hcd_get_sec_event_ring_dma_addr(struct usb_device *udev,
+		unsigned intr_num);
+extern dma_addr_t usb_hcd_get_dcba_dma_addr(struct usb_device *udev);
+extern dma_addr_t
+usb_hcd_get_xfer_ring_dma_addr(struct usb_device *udev,
+	struct usb_host_endpoint *ep);
 
 extern struct usb_hcd *usb_create_hcd(const struct hc_driver *driver,
 		struct device *dev, const char *bus_name);
diff --git a/include/linux/usb/tty_diag.h b/include/linux/usb/tty_diag.h
new file mode 100644
index 00000000..665f77ac
--- /dev/null
+++ b/include/linux/usb/tty_diag.h
@@ -0,0 +1,60 @@
+#ifndef _DRIVERS_TTY_DIAG_H_
+#define _DRIVERS_TTY_DIAG_H_
+
+#ifdef CONFIG_DIAG_OVER_USB
+#include <linux/usb/usbdiag.h>
+#endif
+
+#ifdef CONFIG_DIAG_OVER_TTY
+struct usb_diag_ch *tty_diag_channel_open(const char *name, void *priv,
+		void (*notify)(void *, unsigned, struct diag_request *));
+void tty_diag_channel_close(struct usb_diag_ch *diag_ch);
+int tty_diag_channel_read(struct usb_diag_ch *diag_ch,
+				struct diag_request *d_req);
+int tty_diag_channel_write(struct usb_diag_ch *diag_ch,
+				struct diag_request *d_req);
+void tty_diag_channel_abandon_request(void);
+int tty_diag_get_dbg_ftm_flag_value(void);
+int tty_diag_set_dbg_ftm_flag_value(int val);
+#else
+static inline struct usb_diag_ch *tty_diag_channel_open(const char *name,
+		void *priv,
+		void (*notify)(void *, unsigned, struct diag_request *))
+{
+	return ERR_PTR(-ENODEV);
+}
+
+static inline void tty_diag_channel_close(struct usb_diag_ch *diag_ch)
+{
+}
+
+static inline int tty_diag_channel_read(struct usb_diag_ch *diag_ch,
+				struct diag_request *d_req)
+{
+	return -ENODEV;
+}
+
+static inline int tty_diag_channel_write(struct usb_diag_ch *diag_ch,
+				struct diag_request *d_req)
+{
+	return -ENODEV;
+}
+
+static inline void tty_diag_channel_abandon_request(void)
+{
+	return -ENODEV;
+}
+
+static inline int tty_diag_get_dbg_ftm_flag_value(void)
+{
+	return -ENODEV;
+}
+
+static inline int tty_diag_set_dbg_ftm_flag_value(int val)
+{
+	return -ENODEV;
+}
+
+#endif
+
+#endif /* _DRIVERS_TTY_DIAG_H_ */
diff --git a/include/linux/usb/usbdiag.h b/include/linux/usb/usbdiag.h
index 1be8e634..91e93b5e 100644
--- a/include/linux/usb/usbdiag.h
+++ b/include/linux/usb/usbdiag.h
@@ -32,6 +32,7 @@
 #define USB_DIAG_DISCONNECT	1
 #define USB_DIAG_WRITE_DONE	2
 #define USB_DIAG_READ_DONE	3
+#define USB_DIAG_WRITE_DONE_SYNC 4
 
 struct diag_request {
 	char *buf;