Update msm_thermal

Documentation/ABI/testing/sysfs-fs-f2fs

@@ -74,3 +74,41 @@ Date:		March 2014
 Contact:	"Jaegeuk Kim" <[email protected]>
 Description:
 		 Controls the memory footprint used by f2fs.
+
+What:		/sys/fs/f2fs/<disk>/trim_sections
+Date:		February 2015
+Contact:	"Jaegeuk Kim" <[email protected]>
+Description:
+		 Controls the trimming rate in batch mode.
+
+What:		/sys/fs/f2fs/<disk>/cp_interval
+Date:		October 2015
+Contact:	"Jaegeuk Kim" <[email protected]>
+Description:
+		 Controls the checkpoint timing.
+
+What:		/sys/fs/f2fs/<disk>/idle_interval
+Date:		January 2016
+Contact:	"Jaegeuk Kim" <[email protected]>
+Description:
+		 Controls the idle timing.
+
+What:		/sys/fs/f2fs/<disk>/ra_nid_pages
+Date:		October 2015
+Contact:	"Chao Yu" <[email protected]>
+Description:
+		 Controls the count of nid pages to be readaheaded.
+
+What:		/sys/fs/f2fs/<disk>/dirty_nats_ratio
+Date:		January 2016
+Contact:	"Chao Yu" <[email protected]>
+Description:
+		 Controls dirty nat entries ratio threshold, if current
+		 ratio exceeds configured threshold, checkpoint will
+		 be triggered for flushing dirty nat entries.
+
+What:		/sys/fs/f2fs/<disk>/lifetime_write_kbytes
+Date:		January 2016
+Contact:	"Shuoran Liu" <[email protected]>
+Description:
+		 Shows total written kbytes issued to disk.

Documentation/devicetree/bindings/media/video/msm-cci.txt

@@ -166,10 +166,6 @@ Optional properties:
    property should contain phandle of respective eeprom nodes
 - qcom,ois-src : if optical image stabilization is supported by this sensor,
    this property should contain phandle of respective ois node
-- qcom,ir-led-src : if ir led is supported by this sensor, this property
-   should contain phandle of respective ir-led node
-- qcom,ir-cut-src : if ir cut is supported by this sensor, this property
-   should contain phandle of respective ir-cut node
 
 * Qualcomm MSM ACTUATOR
 

Documentation/filesystems/f2fs.txt

@@ -106,7 +106,11 @@ background_gc=%s       Turn on/off cleaning operations, namely garbage
                        Default value for this option is on. So garbage
                        collection is on by default.
 disable_roll_forward   Disable the roll-forward recovery routine
-discard                Issue discard/TRIM commands when a segment is cleaned.
+norecovery             Disable the roll-forward recovery routine, mounted read-
+                       only (i.e., -o ro,disable_roll_forward)
+discard/nodiscard      Enable/disable real-time discard in f2fs, if discard is
+                       enabled, f2fs will issue discard/TRIM commands when a
+		       segment is cleaned.
 no_heap                Disable heap-style segment allocation which finds free
                        segments for data from the beginning of main area, while
 		       for node from the end of main area.
@@ -122,6 +126,11 @@ disable_ext_identify   Disable the extension list configured by mkfs, so f2fs
 inline_xattr           Enable the inline xattrs feature.
 inline_data            Enable the inline data feature: New created small(<~3.4k)
                        files can be written into inode block.
+inline_dentry          Enable the inline dir feature: data in new created
+                       directory entries can be written into inode block. The
+                       space of inode block which is used to store inline
+                       dentries is limited to ~3.4k.
+noinline_dentry        Diable the inline dentry feature.
 flush_merge	       Merge concurrent cache_flush commands as much as possible
                        to eliminate redundant command issues. If the underlying
 		       device handles the cache_flush command relatively slowly,
@@ -131,6 +140,22 @@ nobarrier              This option can be used if underlying storage guarantees
 		       If this option is set, no cache_flush commands are issued
 		       but f2fs still guarantees the write ordering of all the
 		       data writes.
+fastboot               This option is used when a system wants to reduce mount
+                       time as much as possible, even though normal performance
+		       can be sacrificed.
+extent_cache           Enable an extent cache based on rb-tree, it can cache
+                       as many as extent which map between contiguous logical
+                       address and physical address per inode, resulting in
+                       increasing the cache hit ratio. Set by default.
+noextent_cache         Disable an extent cache based on rb-tree explicitly, see
+                       the above extent_cache mount option.
+noinline_data          Disable the inline data feature, inline data feature is
+                       enabled by default.
+data_flush             Enable data flushing before checkpoint in order to
+                       persist data of regular and symlink.
+mode=%s                Control block allocation mode which supports "adaptive"
+                       and "lfs". In "lfs" mode, there should be no random
+                       writes towards main area.
 
 ================================================================================
 DEBUGFS ENTRIES

Documentation/input/event-codes.txt

@@ -91,6 +91,11 @@ sent in the evdev event stream.
     event and query the device (using EVIOCG* ioctls) to obtain its
     current state.
 
+* SYN_TIME_SEC, SYN_TIME_NSEC:
+  - Used to report the timestamp from the hardware. The timestamp should record
+    the exact time when the hardware events happens. The timestamp is
+    CLOCK_MONOTONIC based.
+
 EV_KEY:
 ----------
 EV_KEY events take the form KEY_<name> or BTN_<name>. For example, KEY_A is used

arch/arm/boot/dts/qcom/Makefile

@@ -1,127 +1,5 @@
-dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
-	msm8996-v2-pmi8994-mtp.dtb \
-	msm8996-v2-pmi8994-pmk8001-cdp.dtb \
-	msm8996-v2-pmi8994-pmk8001-mtp.dtb \
-	msm8996-v2-pmi8994-pm8004-cdp.dtb \
-	msm8996-v2-pmi8994-pm8004-mtp.dtb \
-	msm8996-v2-pmi8994-pm8004-pmk8001-cdp.dtb \
-	msm8996-v2-pmi8994-pm8004-pmk8001-mtp.dtb \
-	msm8996-v2-fluid.dtb \
-	msm8996-v2-liquid.dtb \
-	msm8996-v2-dtp.dtb \
-	msm8996-v3-auto-cdp.dtb \
-	msm8996-v3-auto-adp.dtb \
-	msm8996-v3-pmi8994-cdp.dtb \
-	msm8996-v3-pmi8994-mtp.dtb \
-	msm8996-v3-pmi8994-pmk8001-cdp.dtb \
-	msm8996-v3-pmi8994-pmk8001-mtp.dtb \
-	msm8996-v3-pmi8994-pm8004-cdp.dtb \
-	msm8996-v3-pmi8994-pm8004-mtp.dtb \
-	msm8996-v3-pmi8994-pm8004-pmk8001-cdp.dtb \
-	msm8996-v3-pmi8994-pm8004-pmk8001-mtp.dtb \
-	msm8996-v3-pmi8996-cdp.dtb \
-	msm8996-v3-pmi8996-mtp.dtb \
-	msm8996-v3-pmi8996-pmk8001-cdp.dtb \
-	msm8996-v3-pmi8996-pmk8001-mtp.dtb \
-	msm8996-v3-fluid.dtb \
-	msm8996-v3-liquid.dtb \
-	msm8996-v3-dtp.dtb \
-	msm8996-v3-pm8004-mmxf-adp.dtb \
-	msm8996-v3-pm8004-agave-adp.dtb \
-	msm8996pro-auto-adp.dtb \
-	msm8996pro-auto-cdp.dtb \
-	msm8996pro-pmi8994-cdp.dtb \
-	msm8996pro-pmi8994-mtp.dtb \
-	msm8996pro-pmi8994-pmk8001-cdp.dtb \
-	msm8996pro-pmi8994-pmk8001-mtp.dtb \
-	msm8996pro-pmi8994-pm8004-cdp.dtb \
-	msm8996pro-pmi8994-pm8004-mtp.dtb \
-	msm8996pro-pmi8994-pm8004-pmk8001-cdp.dtb \
-	msm8996pro-pmi8994-pm8004-pmk8001-mtp.dtb \
-	msm8996pro-pmi8996-cdp.dtb \
-	msm8996pro-pmi8996-mtp.dtb \
-	msm8996pro-pmi8996-pmk8001-cdp.dtb \
-	msm8996pro-pmi8996-pmk8001-mtp.dtb \
-	msm8996pro-v1.1-auto-cdp.dtb \
-	msm8996pro-v1.1-pmi8994-cdp.dtb \
-	msm8996pro-v1.1-pmi8994-mtp.dtb \
-	msm8996pro-v1.1-pmi8994-pmk8001-cdp.dtb \
-	msm8996pro-v1.1-pmi8994-pmk8001-mtp.dtb \
-	msm8996pro-v1.1-pmi8994-pm8004-cdp.dtb \
-	msm8996pro-v1.1-pmi8994-pm8004-mtp.dtb \
-	msm8996pro-v1.1-pmi8994-pm8004-pmk8001-cdp.dtb \
-	msm8996pro-v1.1-pmi8994-pm8004-pmk8001-mtp.dtb \
-	msm8996pro-v1.1-pmi8996-cdp.dtb \
-	msm8996pro-v1.1-pmi8996-mtp.dtb \
-	msm8996pro-v1.1-pmi8996-pmk8001-cdp.dtb \
-	msm8996pro-v1.1-pmi8996-pmk8001-mtp.dtb \
-	apq8096pro-auto-cdp.dtb \
-	apq8096pro-liquid.dtb \
-	apq8096pro-v1.1-auto-cdp.dtb \
-	apq8096pro-v1.1-pmi8994-cdp.dtb \
-	apq8096pro-v1.1-pmi8994-mtp.dtb \
-	apq8096pro-v1.1-pmi8994-pmk8001-cdp.dtb \
-	apq8096pro-v1.1-pmi8994-pmk8001-mtp.dtb \
-	apq8096pro-v1.1-pmi8994-pm8004-cdp.dtb \
-	apq8096pro-v1.1-pmi8994-pm8004-mtp.dtb \
-	apq8096pro-v1.1-pmi8994-pm8004-pmk8001-cdp.dtb \
-	apq8096pro-v1.1-pmi8994-pm8004-pmk8001-mtp.dtb \
-	apq8096pro-v1.1-pmi8996-cdp.dtb \
-	apq8096pro-v1.1-pmi8996-mtp.dtb \
-	apq8096pro-v1.1-pmi8996-pmk8001-cdp.dtb \
-	apq8096pro-v1.1-pmi8996-pmk8001-mtp.dtb \
-	msm8996-v3.0-pmi8994-cdp.dtb \
-	msm8996-v3.0-pmi8994-mtp.dtb \
-	msm8996-v3.0-pmi8994-pm8004-cdp.dtb \
-	msm8996-v3.0-pmi8994-pm8004-mtp.dtb \
-	msm8996-v3.0-pmi8994-pm8004-pmk8001-cdp.dtb \
-	msm8996-v3.0-pmi8994-pmk8001-cdp.dtb \
-	msm8996-v3.0-pmi8996-cdp.dtb \
-	msm8996-v3.0-pmi8996-mtp.dtb \
-	msm8996-v3.0-fluid.dtb \
-	msm8996-v3.0-liquid.dtb \
-	msm8996-v3.0-dtp.dtb \
-	apq8096-v2-pmi8994-cdp.dtb \
-	apq8096-v2-pmi8994-mtp.dtb \
-	apq8096-v2-pmi8994-pmk8001-cdp.dtb \
-	apq8096-v2-pmi8994-pm8004-cdp.dtb \
-	apq8096-v2-pmi8994-pm8004-pmk8001-cdp.dtb \
-	apq8096-v2-liquid.dtb \
-	apq8096-v2-dragonboard.dtb \
-	apq8096-v2-auto-dragonboard.dtb \
-	apq8096-v3-pmi8994-cdp.dtb \
-	apq8096-v3-pmi8994-mtp.dtb \
-	apq8096-v3-pmi8994-pmk8001-cdp.dtb \
-	apq8096-v3-pmi8994-pm8004-cdp.dtb \
-	apq8096-v3-pmi8994-pm8004-pmk8001-cdp.dtb \
-	apq8096-v3-pmi8996-cdp.dtb \
-	apq8096-v3-pmi8996-mtp.dtb \
-	apq8096-v3-liquid.dtb \
-	apq8096-v3-dragonboard.dtb \
-	apq8096-v3-mediabox.dtb \
-	apq8096-v3-sbc.dtb \
-	apq8096-v3-auto-dragonboard.dtb \
-	apq8096-v3-auto-adp.dtb \
-	apq8096-v3-auto-cdp.dtb \
-	apq8096-v3.0-pmi8994-cdp.dtb \
-	apq8096-v3.0-pmi8994-mtp.dtb \
-	apq8096-v3.0-pmi8994-pm8004-cdp.dtb \
-	apq8096-v3.0-pmi8994-pm8004-pmk8001-cdp.dtb \
-	apq8096-v3.0-pmi8994-pmk8001-cdp.dtb \
-	apq8096-v3.0-pmi8996-cdp.dtb \
-	apq8096-v3.0-pmi8996-mtp.dtb \
-	apq8096-v3.0-liquid.dtb \
-	apq8096-v3.0-dragonboard.dtb \
-	apq8096-v3-pmi8994-mdm9x55-i2s-cdp.dtb \
-	apq8096-v3-pmi8994-pm8004-mdm9x55-i2s-cdp.dtb \
-	apq8096-v3-pmi8994-pm8004-pmk8001-mdm9x55-i2s-cdp.dtb \
-	apq8096-v3-pmi8994-pmk8001-mdm9x55-i2s-cdp.dtb \
-	apq8096-v3-pmi8996-mdm9x55-i2s-cdp.dtb \
-	apq8096-v3-pmi8994-mdm9x55-i2s-mtp.dtb \
-	apq8096-v3-pmi8994-mdm9x55-slimbus-mtp.dtb \
-	apq8096-v3-pmi8996-mdm9x55-i2s-mtp.dtb \
-	apq8096-v3-pmi8996-mdm9x55-slimbus-mtp.dtb \
-	apq8096-v3-pmi8996-dragonboard.dtb
+dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v3-pmi8996-mtp.dtb
+
 
 dtb-$(CONFIG_ARCH_MSMCOBALT) += msmcobalt-sim.dtb \
 	msmcobalt-rumi.dtb \

arch/arm/boot/dts/qcom/batterydata-z2_plus-atl-3500mah.dtsi

@@ -0,0 +1,49 @@
+
+qcom,ATL_2343799_lenovo_3500mah_averaged_masterslave_mar16th2016 {
+	/* #2343799_Lenovo_3500mAh_averaged_MasterSlave_Mar16th2016*/
+	qcom,max-voltage-uv = <4400000>;
+	qcom,nom-batt-capacity-mah = <3500>;
+	qcom,batt-id-kohm = <50>;
+	qcom,battery-beta = <4250>;
+	qcom,battery-type = "ATL_2343799_lenovo_3500mah_averaged_masterslave_mar16th2016";
+	qcom,chg-rslow-comp-c1 = <3361614>;
+	qcom,chg-rslow-comp-c2 = <4737910>;
+	qcom,chg-rs-to-rslow = <843256>;
+	qcom,chg-rslow-comp-thr = <0xA5>;
+	qcom,checksum = <0x45AB>;
+	qcom,gui-version = "PMI8996GUI - 1.1.0.0";
+	qcom,fg-profile-data = [
+		 E0 83 CA 7C 
+		 02 81 05 77 
+		 68 83 22 75 
+		 F0 89 EA 94 
+		 0F 82 90 9A 
+		 7F BD 2C CA 
+		 56 12 F5 83 
+		 04 7D 05 81 
+		 D2 76 51 83 
+		 71 6B D4 72 
+		 7D 85 52 82 
+		 91 99 D4 BC 
+		 A9 C9 58 0D 
+		 DD 0D A0 5A 
+		 14 70 50 FD 
+		 E6 3C 3A 44 
+		 C6 3A 00 00 
+		 F3 44 D4 20 
+		 FD 36 00 00 
+		 00 00 00 00 
+		 00 00 00 00 
+		 CB 6A 22 69 
+		 56 68 7D 88 
+		 52 76 B6 69 
+		 FB 4A 11 81 
+		 3D 75 3D 68 
+		 95 6D 1C A9 
+		 1A 69 60 B3 
+		 5D A0 71 0C 
+		 28 00 FF 36 
+		 F0 11 30 03 
+		 00 00 00 0C 
+	];
+};

arch/arm/boot/dts/qcom/batterydata-z2_plus-coslight-3500mah-9k.dtsi

@@ -0,0 +1,49 @@
+
+qcom,Coslight_9k_2385871_lenovo_bl268drn_3500mah_averaged_masterslave_jun1st2016 {
+	/* #2385871_Lenovo_BL268DRN_3500mAh_averaged_MasterSlave_Jun1st2016*/
+	qcom,max-voltage-uv = <4400000>;
+	qcom,nom-batt-capacity-mah = <2700>;
+	qcom,batt-id-kohm = <9>;
+	qcom,battery-beta = <4250>;
+	qcom,battery-type = "Coslight_9k_2385871_lenovo_bl268drn_3500mah_averaged_masterslave";
+	qcom,chg-rslow-comp-c1 = <3357796>;
+	qcom,chg-rslow-comp-c2 = <4587586>;
+	qcom,chg-rs-to-rslow = <731876>;
+	qcom,chg-rslow-comp-thr = <0xA2>;
+	qcom,checksum = <0xE4B2>;
+	qcom,gui-version = "PMI8996GUI - 1.1.0.0";
+	qcom,fg-profile-data = [
+		 F7 83 AF 7D 
+		 BF 81 3B 7C 
+		 61 83 CD 6D 
+		 1E 88 6E 8E 
+		 13 82 7C 9A 
+		 8C BD 78 CA 
+		 5B 0E 04 88 
+		 E5 7D CA 81 
+		 35 7C 4A 83 
+		 BA 71 04 74 
+		 39 74 57 82 
+		 53 99 80 BC 
+		 24 C9 5E 0D 
+		 95 0D A0 5A 
+		 14 70 50 FD 
+		 2E 3E 87 44 
+		 C6 3A 00 00 
+		 17 4C FD 29 
+		 97 38 00 00 
+		 00 00 00 00 
+		 00 00 00 00 
+		 19 6A 89 68 
+		 74 5B 1E 88 
+		 50 76 95 69 
+		 38 5B 01 81 
+		 14 75 E3 63 
+		 03 58 9D A8 
+		 1D E2 60 93 
+		 5E A0 71 0C 
+		 28 00 FF 36 
+		 F0 11 30 03 
+		 00 00 00 0C 
+	];
+};