Promotion of kernel.lnx.4.4-160802.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1040775   Icb84b40128c54edefdec13f61fe9252811c1a14a   clk: msm: clock-gpu-cobalt: Update the GPU PLL FMAXes
1044351   I3ea5d969a73e3418af23ba4d8b7374fb20d2889f   mdss: display-port: add support for USB type-C Alt mode
1021009   I5eefe40073238234a6527e0b0572da77f790e44f   ARM: dts: msm: Add support for new flash mode on msmcoba
999550   I6ebf0ec78201551152bf6ac0d4372f36734a4708   slim: msm: Handle slimbus HW noise during early boot-up
1021009   I52537562214d439e9652bb6ba90f0d29e5b24fda   msm: camera: Add support for multiple flash nodes
1044351   I9940ff3cbcca7dd0ac972cabbfddcbd9ac4657fa   mdss: display-port: add support for DP related gpios
1037031   I12463f98cf50f5c8cdfdd47775dec075219974d6   ARM: dts: msm: By default, handle FW errors as fatal on
1044351   I80d6c1ae6d7096e170105e5d297a563b3bee053d   msm: mdss: add support to configure transfer unit for DP
1018208   I3afc0d86476f7a447237180fa411858782d3df1b   ASoC: audio-ext-clk: check for null pointer de-reference
921325   I39a6ba34e43dab8035bf232d0e640e72d7a34575   ARM: dts: msm: Add interrupts to flash-led device for pm
1044351   I7bf3fc6e102df113611b9450c92ecd4e50b26fb4   mdss: display-port: add mutex logic and configure data l
1022917   Icb355cd07db9cc66632ac0ea14464c5610919725   ASoC: msm-cpe-lsm: add support for two CPE sessions
1048216   I3b477df30b1b1578ce677abd83d9db40e7b91cbf   Revert "coresight-tpdm: fix dsb edge ctrl mask interface
1043718   I21cc4b4556b2a4a1a918bfeb1d55ae164d4b5568   leds: qpnp-flash: Implement the flash_prepare API
1021009   Ib9f5d395d4b1381827d7129ef74fa05437571803   msm: camera: Add support for reading new property tag
1041206   I145c5ed44f9ce788bd3abc6ef6aee80466e248c6   smb-lib: introduce votable to disable charging
1047722   I76ac226a2a1e33dd9c6240cac3443a03355bb75e   scsi: ufs: return appropriate error code
1044351   Idd7ba4b564b013eda7596a111b9b934f6b6ff84f   msm: mdss: display-port: add support to configure pixel
1044351   I6e89f6fbb3660d13c186b38eb7ca1f71cbe8109d   mdss: display-port: fix register offsets for link traini
1046961   Ibdc78547e6376e6db54db75b1423718d13afaaa7   ft5x06: Set input property bit to indicate a direct inpu
1046961   I36ed0497c12b0f14e9d7b60c2d8e78729871b8d0   input: ft5x06_ts: clean up the focaltech touchscreen dri
1046747   Icfed6881763df35a7f948f171856903de7e07a2a   ARM: dts: msm: add battery profiles to msmcobalt MTP
1024187   I6941660484ea8b27377c668d1e7d815d52e83d83   leds: qpnp-flash-v2: Add support for led_fault_irq
1042302   I9a601412fb9a3935c0eadad5157bb1fd819b29dd   input: touchscreen: add suspend-resume and fb support
1024187   I13cf07b36f7bb890a71bedb9998a937e2c60ecb0   ARM: dts: msm: Enable droop and fault detection for pmic
1039714   I5342c58acc83ecff4bf5f8e425de94daa1dabb50   qcom-charger: qpnp-smb2: disable vbus-error IRQ trigger
1024187   I982e51ba62f0a75d1dcd3ef30e5d1249c970ffde   leds: qpnp-flash-v2: Add support for droop and fault det
1030694   I816b21d8433aea9407a14a8c8a5098701ee53b8c   cfg80211: Advertise extended capabilities per interface
1037031   Ifffceb30e9abcaced977438526ceeef4e7f9324e   msm: vidc: Handle FW errors as Fatal
1035969 1041449   I5c64b6264e0d55a7ca16a72e31316e6329f2b842   Revert "misc: uidstat: Adding uid stat driver to collect
1028293   I0a80e49a3fea6e0e8d9e8b82847188b0a4452943   msm: kgsl: Add 5usec delay for idle check on A540
1035969 1041449   Id0dbb7853aba221c1926e44616524fed90677602   xt_qtaguid: Fix panic caused by synack processing
1046834   I8cb776d5b3d20bdee5036cfe0dbcb9bbaa8bf6bd   input: touchscreen: synaptics v1.1
921325   I843a008dbe6900f9f16c202a05435dbaf7a37627   leds: qpnp-flash-v2: Add support to handle ramp up and d
1011048   Id927e9b8894b1bf99e57cc0f04abf126740c6d36   ASoC: msmcobalt: Add 24 bit packed support
1046503   I4573a077bb455ebe3750ab76a91d2593d7e94ea5   usb: phy: qusb: Remove updating VBUS status from QUSB PH
1046747   I0fe51b607d44920784cc0bb8bfd442e81f3c5d3d   ARM: dts: msm: add batterydata for itech and ascent batt
1034862   I621dd9de3a8d4a0f4102227989e1dd17638c20ea   ASoC: msm: qdsp6v2: Add support to set volume in ASM loo
1036418   Id43ec6b55b332d0dac09a9abb998a410f49b44f7   qseecom: validate the inputs of __qseecom_send_modfd_res
1044351   I0e9f6caf84a8cdd825002938dad18482e2489cbd   msm: mdss: fix clock and regulator configurations for DP
1035969 1041449   Ibc9160b445254b0212c23664a94fd27b7788aa76   Revert "net: activity_stats: Add statistics for network
1042302   I8da53ab4f03237b8652cd5891eadbffa752d72d3   input: touchscreen: add touch to wake feature in ITEtech
1042302   I5a3d55c7c8e4b8f594fd7924c61ac1e5b5ad1965   input: it7258_ts_i2c: add debugfs support for suspend/re
1046501   I185aaa38c3365336997a6a158311e67e7ffd26ad   msm: ipa3: add mapping for IPA SMEM to SMMU
1043718   Idb4ab086740b680e101d76d882bcfb618ac4b936   leds: qpnp-flash-v2: Update the flash_prepare API
1042302   I49bc7e3eaa3b266fe92bb209f56ae5a1b40675e0   input: touchscreen: add protocol A support to ITE tech d
1035969 1041449   Icee0df589ea8d61a999e8c7ea3afdcf4a40b412b   xt_qtaguid: Fix panic caused by processing non-full sock
1036401   I9528b61a695dc7840e1c6f80af18044340f5c6c4   iommu/arm-smmu: Don't group PCI devices
921325   I218195c29fede7ae5959df8c40df0231a71de379   leds: qpnp-flash-v2: Create atomic notifier chain for fl
1031648   I0edd786a3465ac38188a1d1213ba5bea84c67a6f   ARM: dts: msm: Enable the GPU QDSS STM for msm8996
1042302   I0989cb66ab5edb10769ced9d525bd4f6d7adb02b   input: touchscreen: add palm-gesture sleep feature
1031932   I1d85578534c58c121ca8e560d67faf9b94e87be9   ASoC: msm: Add dapm ignore suspend for front end dais
1034829   If23da9ac1d2f71ad4d39371b665311f1f84b016a   ASoC: msmcobalt: Fix channel configuration on msmcobalt
1031932   I89f83feed0702f3a3f3b6141ed73459b8878d2df   ASoC: wcd9335: Add dapm ignore suspend for backend dais
1046503   I92df87c0e2ff54dd7ee513d277cc075eab561019   usb: dwc3: Update VBUS status with USB controller
1045063   I64931decb9948ed47f046c0b6267150fe512a3dc   ASoC: msm: Implement HFP tx mute get function
1042302   I2671b7c30b0f2ed1d7ad788f29b7f900a2a1cdcc   input: it7258_ts_i2c: add DT parsing support for touch d
1046501   Ife4779ee6c20662e2c4d8ffcd16999a675461470   msm: ipa3: add support for additional mappings to smmu

Change-Id: I3fa4e17b6bc10d581655ba1a8f0eaf6e29fb5a0d
CRs-Fixed: 999550, 1031932, 1037031, 1041206, 1046834, 1036401, 1046961, 1046501, 1040775, 1046503, 1030694, 1039714, 1022917, 1018208, 1021009, 1031648, 1044351, 1041449, 1047722, 1028293, 1048216, 1024187, 1042302, 921325, 1043718, 1011048, 1046747, 1034862, 1034829, 1045063, 1035969, 1036418

4 files changed, 39 insertions, 35 deletions

diff --git a/include/linux/input/ft5x06_ts.h b/include/linux/input/ft5x06_ts.h
index b2fb3c4a56ae..a9577b62cb07 100644
--- a/include/linux/input/ft5x06_ts.h
+++ b/include/linux/input/ft5x06_ts.h
@@ -24,8 +24,8 @@ struct ft5x06_ts_platform_data {
 	u32 y_max;
 	u32 irq_gpio;
 	u32 reset_gpio;
-	int (*power_init) (bool);
-	int (*power_on) (bool);
+	int (*power_init)(bool);
+	int (*power_on)(bool);
 };
 
 #endif
diff --git a/include/linux/leds-qpnp-flash-v2.h b/include/linux/leds-qpnp-flash-v2.h
index 47fd0699a9c1..1ae77e2e277b 100644
--- a/include/linux/leds-qpnp-flash-v2.h
+++ b/include/linux/leds-qpnp-flash-v2.h
@@ -14,11 +14,21 @@
 #define __LEDS_QPNP_FLASH_V2_H
 
 #include <linux/leds.h>
-#include "leds.h"
+#include <linux/notifier.h>
 
-#define ENABLE_REGULATOR	BIT(0)
-#define QUERY_MAX_CURRENT	BIT(1)
+enum flash_led_irq_type {
+	LED_FAULT_IRQ = BIT(0),
+	MITIGATION_IRQ = BIT(1),
+	FLASH_TIMER_EXP_IRQ = BIT(2),
+	ALL_RAMP_DOWN_DONE_IRQ = BIT(3),
+	ALL_RAMP_UP_DONE_IRQ = BIT(4),
+	LED3_RAMP_UP_DONE_IRQ = BIT(5),
+	LED2_RAMP_UP_DONE_IRQ = BIT(6),
+	LED1_RAMP_UP_DONE_IRQ = BIT(7),
+	INVALID_IRQ = BIT(8),
+};
 
-int qpnp_flash_led_prepare(struct led_classdev *led_cdev, int options);
+int qpnp_flash_led_register_irq_notifier(struct notifier_block *nb);
+int qpnp_flash_led_unregister_irq_notifier(struct notifier_block *nb);
 
 #endif
diff --git a/include/linux/leds-qpnp-flash.h b/include/linux/leds-qpnp-flash.h
new file mode 100644
index 000000000000..55867e78bba6
--- /dev/null
+++ b/include/linux/leds-qpnp-flash.h
@@ -0,0 +1,23 @@
+/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __LEDS_QPNP_FLASH_H
+#define __LEDS_QPNP_FLASH_H
+
+#include <linux/leds.h>
+
+#define ENABLE_REGULATOR	BIT(0)
+#define QUERY_MAX_CURRENT	BIT(1)
+
+int qpnp_flash_led_prepare(struct led_trigger *trig, int options);
+
+#endif
diff --git a/include/linux/uid_stat.h b/include/linux/uid_stat.h
deleted file mode 100644
index 6bd6c4e52d17..000000000000
--- a/include/linux/uid_stat.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* include/linux/uid_stat.h
- *
- * Copyright (C) 2008-2009 Google, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#ifndef __uid_stat_h
-#define __uid_stat_h
-
-/* Contains definitions for resource tracking per uid. */
-
-#ifdef CONFIG_UID_STAT
-int uid_stat_tcp_snd(uid_t uid, int size);
-int uid_stat_tcp_rcv(uid_t uid, int size);
-#else
-#define uid_stat_tcp_snd(uid, size) do {} while (0);
-#define uid_stat_tcp_rcv(uid, size) do {} while (0);
-#endif
-
-#endif /* _LINUX_UID_STAT_H */