Promotion of kernel.lnx.4.4-160707.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1003482   I959caf7b305e965b84e8204168194bbfda72dc52   mfd: wcd9xxx-irq: check if wcd9xxx_res irq is 0 before u
950797   I5ee7d44d6cad8e35e22d3c1a027a1eec5d208585   usb: xhci: Add support for secondary interrupters
1007841   I1751352ebbe38d4b8c7886085d15043c2e5244f5   usb: phy: qusb-v2: Add USB QUSB PHY for newer platform
1036148   I1a7b77e3a64da245afd0c4f73c8d04627a061ada   qcom-charger: qpnp-smb2: expose AICL settled current thr
1037821   I1a40bbe46e689d8c98f31cfef3a6743856288127   ARM: dts: msm: add Tri-color RGB LEDs on pmicobalt
1024187 1033071   Ia133b6c0cf0c21484f61631f04cba0d1112c9d48   leds: qpnp-flash-v2: Add operational current property
950797   I252f5171bd94b5ab096eb1a2f053f29a8c049c3b   sound: usb: Add helper APIs to enable audio stream
1036622   I8c545248f23c73ff9fb470705f1c17175a8e4e0b   ASoC: wcd9335: Fix traversing of source dapm widgets
925138   Ic1f02c341c06cadcfe6de638ff6c86e51845e59f   ASoC: core: Fix possible NULL pointer de-reference
1038038   Ib01b649633ef8d7e15791fa9b1bd0d7a3fbffc5d   ARM: dts: msm: remove VMBMS feature for msmcobalt
1024187   Ibdd139c98aa289f1d6b8545b953e79a1187284e9   leds: qpnp-flash-v2: Fix safety timer configuration
980027   I02036d79fca38ff9ac71c70de8aa144b9cfb2f59   icnss: Add support of enable HW debug from module parame
1024187   I3670eaa65efc9d1efb29fb30500fb9067885b446   ARM: dts: msm: Add current property for flash-led for pm
1024187   I640106abcf05949f2570efd42f925f1f73bdaa81   ARM: dts: msm: Add torch nodes to flash-led for pmicobal
862785   I6e3582fa010d18d4e0ccfde319dfc4d81af1351f   ASoC: pcm: Update RX shutdown sequence
986695   I4a0b0ed4f6679da016b1b460cb597bc7fa2afa12   ASoC: msm: Dynamic allocation of loopback sessions
1027456   I6935c6de9009532570e1becad4ef1c1ee095d7c4   defconfig: Add initial 32-bit defconfig for msmfalcon
1034047   I48a767f7673defe60156c305e39f1ce4aa44306b   msm: mdss: hdmi: fix deep color enable and audio clock
950797   Ie0756d646a396a11b41b93e886bca9aff636ee5d   usb: xhci: Add helper APIs to return xhci dma addresses
1035315 1038542   Ie2ab84b02a8fb4070a0e86f09f52db9aa4163003   arm64: topology: Export arch_get_cpu_efficiency API
1018651   I20329a6834f5f1498388c39b1dd95db2896b3239   msm: camera: Return HAL buffer to fix drain issues

Change-Id: I46ec2b4cf40063eb9021f9150cb093d43abf5c8b
CRs-Fixed: 1038038, 1036148, 986695, 1027456, 1038542, 1007841, 925138, 950797, 862785, 1036622, 1033071, 1003482, 1018651, 1024187, 1037821, 1035315, 1034047, 980027

3 files changed, 33 insertions, 2 deletions

diff --git a/include/linux/leds-qpnp-flash-v2.h b/include/linux/leds-qpnp-flash-v2.h
index 353466f6c108..ae36a163ed21 100644
--- a/include/linux/leds-qpnp-flash-v2.h
+++ b/include/linux/leds-qpnp-flash-v2.h
@@ -26,13 +26,14 @@ struct flash_node_data {
 	struct pinctrl_state		*gpio_state_active;
 	struct pinctrl_state		*gpio_state_suspend;
 	int				ires_ua;
-	u16				prgm_current;
+	int				max_current;
+	int				current_ma;
 	u8				duration;
 	u8				id;
 	u8				type;
 	u8				ires;
 	u8				hdrm_val;
-	u8				brightness;
+	u8				current_reg_val;
 	bool				led_on;
 };
 
diff --git a/include/linux/usb.h b/include/linux/usb.h
index b79925dd2b41..246945be000c 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -734,6 +734,17 @@ static inline bool usb_device_no_sg_constraint(struct usb_device *udev)
 
 /* for drivers using iso endpoints */
 extern int usb_get_current_frame_number(struct usb_device *usb_dev);
+extern int usb_sec_event_ring_setup(struct usb_device *dev,
+	unsigned intr_num);
+extern int usb_sec_event_ring_cleanup(struct usb_device *dev,
+	unsigned intr_num);
+
+extern dma_addr_t
+usb_get_sec_event_ring_dma_addr(struct usb_device *dev,
+		unsigned intr_num);
+extern dma_addr_t usb_get_dcba_dma_addr(struct usb_device *dev);
+extern dma_addr_t usb_get_xfer_ring_dma_addr(struct usb_device *dev,
+	struct usb_host_endpoint *ep);
 
 /* Sets up a group of bulk endpoints to support multiple stream IDs. */
 extern int usb_alloc_streams(struct usb_interface *interface,
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index f89c24bd53a4..3740366d9fc5 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -396,6 +396,14 @@ struct hc_driver {
 	/* Call for power on/off the port if necessary */
 	int	(*port_power)(struct usb_hcd *hcd, int portnum, bool enable);
 
+	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)
@@ -434,6 +442,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);