About the kernel upgrade

Documentation/ABI/testing/sysfs-fs-f2fs

@@ -101,6 +101,7 @@ Date:		February 2015
 Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>
 Description:
 		 Controls the trimming rate in batch mode.
+		 <deprecated>
 
 What:		/sys/fs/f2fs/<disk>/cp_interval
 Date:		October 2015
@@ -186,3 +187,20 @@ Date:		August 2017
 Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>
 Description:
 		 Controls sleep time of GC urgent mode
+
+What:		/sys/fs/f2fs/<disk>/readdir_ra
+Date:		November 2017
+Contact:	"Sheng Yong" <shengyong1@huawei.com>
+Description:
+		 Controls readahead inode block in readdir.
+
+What:		/sys/fs/f2fs/<disk>/extension_list
+Date:		Feburary 2018
+Contact:	"Chao Yu" <yuchao0@huawei.com>
+Description:
+		 Used to control configure extension list:
+		 - Query: cat /sys/fs/f2fs/<disk>/extension_list
+		 - Add: echo '[h/c]extension' > /sys/fs/f2fs/<disk>/extension_list
+		 - Del: echo '[h/c]!extension' > /sys/fs/f2fs/<disk>/extension_list
+		 - [h] means add/del hot file extension
+		 - [c] means add/del cold file extension

Documentation/devicetree/bindings/arm/msm/msm.txt

@@ -200,6 +200,7 @@ compatible = "qcom,apq8017-mtp"
 compatible = "qcom,apq8053-cdp"
 compatible = "qcom,apq8053-mtp"
 compatible = "qcom,apq8053-ipc"
+compatible = "qcom,apq8053-lite-dragonboard"
 compatible = "qcom,mdm9630-cdp"
 compatible = "qcom,mdm9630-mtp"
 compatible = "qcom,mdm9630-sim"

Documentation/devicetree/bindings/bluetooth/bluetooth_power.txt

@@ -6,6 +6,7 @@ Required properties:
   - compatible: Should be set to one of the following:
 	qca,ar3002
 	qca,qca6174
+	qca,qca9379
 	qca,wcn3990
   - qca,bt-reset-gpio: GPIO pin to bring BT Controller out of reset
 

Documentation/devicetree/bindings/input/touchscreen/himax.txt

@@ -0,0 +1,22 @@
+Himax touch controller
+
+Required properties:
+
+ - compatible			: Should be "himax,hxcommon"
+ - reg					: i2c slave address of the device.
+ - interrupt-parent		: parent of interrupt.
+ - himax,irq-gpio       : irq gpio.
+ - himax,reset-gpio		: reset gpio.
+ - vdd-supply			: Power supply needed to power up the device.
+ - avdd-supply			: Power source required to power up i2c bus.
+ - himax,panel-coords 	: panel coordinates for the chip in pixels.
+						  It is a four tuple consisting of min x,
+						  min y, max x and max y values.
+ - himax,display-coords : display coordinates in pixels. It is a four
+						  tuple consisting of min x, min y, max x and
+						  max y values
+
+Optional properties:
+ - himax,3v3-gpio		: gpio acting as 3.3 v supply.
+ - report_type			: Multi-touch protocol type. Default 0.
+						  0 for protocol A, 1 for protocol B.

Documentation/devicetree/bindings/input/touchscreen/hmxchipset.txt

@@ -0,0 +1,47 @@
+Himax Touch Controller
+
+Required properties:
+
+ - compatible		: Should be "himax,hxcommon"
+ - reg			: I2C slave address of the device.
+ - interrupt-parent	: Parent of interrupt.
+ - interrupts		: Configuration of touch panel controller interrupt
+			GPIO.
+ - interrupt-gpios	: Interrupt gpio which is to provide interrupts to
+			host, same as "interrupts" node.
+ - reset-gpios		: Reset gpio to control the reset of chip.
+ - himax,display-coords	: Display coordinates in pixels. It is a four
+			tuple consisting of min x, min y, max x and
+			max y values.
+
+Optional properties:
+
+ - avdd-supply		: Power supply needed to power up the device, this is
+			for fixed voltage external regulator.
+ - vdd-supply		: Power supply needed to power up the device, when use
+			external regulator, do not add this property.
+ - himax,panel-coords	: Panel coordinates for the chip in pixels.
+			It is a four tuple consisting of min x,
+			min y, max x and max y values.
+
+Example:
+&i2c_3 {
+	status = "okay";
+	himax_ts@48 {
+		compatible = "himax,hxcommon";
+		reg = <0x48>;
+		interrupt-parent = <&tlmm>;
+		interrupts = <65 0x2>;
+		vdd-supply = <&pm8953_l10>;
+		avdd-supply = <&pm8953_l5>;
+		pinctrl-names = "pmx_ts_active","pmx_ts_suspend","pmx_ts_release";
+		pinctrl-0 = <&ts_int_active &ts_reset_active>;
+		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
+		pinctrl-2 = <&ts_release>;
+		himax,panel-coords = <0 800 0 1280>;
+		himax,display-coords = <0 800 0 1280>;
+		himax,irq-gpio = <&tlmm 65 0x2008>;
+		//himax,rst-gpio = <&tlmm 64 0x0>;
+		report_type = <1>;
+	};
+};

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

@@ -136,6 +136,9 @@ value is typically max(latencies of every cluster at all power levels) + 1
 - qcom,max-secure-instances = An int containing max number of concurrent secure
   instances supported, accounting for venus and system wide limitations like
   memory, performance etc.
+- qcom,power-conf = Indicates the value at which or beyond, a video session
+  is configured in low power mode to have power benefits. Value is defined
+  interms of HxW of the video session beyond which power benefit is desired.
 
 [Second level nodes]
 Context Banks
@@ -229,6 +232,7 @@ Example:
 		qcom,qdss-presets = <0xFC307000 0x1000>,
 			<0xFC322000 0x1000>;
 		qcom,max-hw-load = <1224450>; /* 4k @ 30 + 1080p @ 30*/
+		qcom,power-conf = <8294400>; /* WxH - 3840*2160 */
 		qcom,never-unload-fw;
 		clock-names = "foo_clk", "bar_clk", "baz_clk";
 		qcom,clock-configs = <0x3 0x1 0x0>;

Documentation/devicetree/bindings/net/can/k61-can.txt

@@ -3,7 +3,7 @@
 This driver implements SPI slave protocol for Freescale K61 CAN controller.
 
 Required properties:
-  - compatible: Should be "fsl,k61" or "nxp,mpc5746c".
+  - compatible: Should be "fsl,k61".
   - reg: Should contain SPI chip select.
   - interrupt-parent: Should specify interrupt controller for the interrupt.
   - interrupts: Should contain IRQ line for the CAN controller.

Documentation/devicetree/bindings/net/can/qti-can.txt

@@ -0,0 +1,48 @@
+* QTI CAN driver *
+
+Required properties:
+  - compatible: Should be "qcom,renesas,rh850" or "qcom,nxp,mpc5746c".
+  - reg: Should contain SPI chip select.
+  - interrupt-parent: Should specify interrupt controller for the interrupt.
+  - interrupts: Should contain IRQ line for the CAN controller.
+  - spi-max-frequency: Should contain maximum spi clock frequency for slave device
+  - qcom,clk-freq-mhz : The frequency at which the CAN clock should be configured.
+  - qcom,max-can-channels : Maximum number of CAN channels supported by the controller.
+
+Optional properties:
+  - qcom,reset-gpio: Reference to the GPIO connected to the reset input.
+  - pinctrl-names : Names corresponding to the numbered pinctrl states.
+  - pinctrl-0 : This explains the active state of the GPIO line.
+  - pinctrl-1 : This explains the suspend state of the GPIO line.
+  - qcom,bits-per-word: Indicate how many bits are in a SPI frame. e.g.: 8, 16, 32.
+                   Default to 16.
+  - qcom,reset-delay-msec: Delay in milliseconds to be applied after resetting the chip.
+    This is applicable only if the reset-gpio is specified. Default value is 1 ms.
+  - qcom,support-can-fd: Whether CAN FD mode is supported or not.
+  - qcom,can-fw-cmd-timeout-req: Whether a timeout is required if we don't get a response from
+    the firmware after flash write.
+  - qcom,can-fw-cmd-timeout-ms: The duration after which timeout will happen if we don't get a
+    response from the firmware.
+  - qcom,rem-all-buffering-timeout-ms: The duration after which timeout will happen if we don't get a
+    response from the firmware while trying to remove all the buffered frames IDs from flash.
+
+Example:
+
+can-controller@0 {
+	compatible = "qcom,nxp,mpc5746c";
+	reg = <0>;
+	spi-max-frequency = <9600000>;
+	interrupt-parent = <&tlmm_pinmux>;
+	interrupts = <87 0>;
+	qcom,reset-gpio = <&tlmm_pinmux 89 0x1>;
+	qcom,clk-freq-mhz = <20000000>;
+	qcom,max-can-channels = <2>;
+	qcom,bits-per-word = <8>;
+	qcom,reset-delay-msec = <150>;
+	qcom,can-fw-cmd-timeout-req;
+	qcom,can-fw-cmd-timeout-ms = <400>;
+	qcom,rem-all-buffering-timeout-ms = <2000>;
+	pinctrl-names = "active", "sleep";
+	pinctrl-0 = <&can_rst_on>;
+	pinctrl-1 = <&can_rst_off>;
+};

Documentation/devicetree/bindings/platform/msm/ipa.txt

@@ -37,6 +37,8 @@ Optional:
 - qcom,smmu-disable-htw: boolean value to turn off SMMU page table caching
 - qcom,use-a2-service: determine if A2 service will be used
 - qcom,use-ipa-tethering-bridge: determine if tethering bridge will be used
+- qcom,use-ipa-in-mhi-mode: Boolean context flag to indicate whether
+				device booting in MHI config or not.
 - qcom,use-ipa-bamdma-a2-bridge: determine if a2/ipa hw bridge will be used
 - qcom,ee: which EE is assigned to (non-secure) APPS from IPA-BAM POV. This
 is a number

Documentation/devicetree/bindings/qseecom/qseecom.txt

@@ -27,6 +27,7 @@ Optional properties:
   - qcom,qsee-reentrancy-support: indicates the qsee reentrancy phase supported by the target
   - qcom,commonlib64-loaded-by-uefi: indicates commonlib64 is loaded by uefi already
   - qcom,fde-key-size: indicates which FDE key size is used in device.
+  - qcom,enable-key-wrap-in-ks: enables wrapping of ICE key with KS key.
 
 Example:
 	qcom,qseecom@fe806000 {
@@ -40,6 +41,7 @@ Example:
 		qcom,hlos-ce-hw-instance = <1 2>;
 		qcom,qsee-ce-hw-instance = <0>;
 		qcom,support-fde;
+		qcom,enable-key-wrap-in-ks;
 		qcom,support-pfe;
 		qcom,msm_bus,name = "qseecom-noc";
 		qcom,msm_bus,num_cases = <4>;
@@ -64,6 +66,7 @@ Example: The following dts setup is the same as the example above.
 		reg = <0x7f00000 0x500000>;
 		reg-names = "secapp-region";
 		qcom,support-fde;
+		qcom,enable-key-wrap-in-ks;
 		qcom,full-disk-encrypt-info = <0 1 2>, <0 2 2>;
 		qcom,support-pfe;
 		qcom,per-file-encrypt-info = <0 1 0>, <0 2 0>;

Documentation/devicetree/bindings/vendor-prefixes.txt

@@ -200,3 +200,5 @@ zyxel	ZyXEL Communications Corp.
 zarlink	Zarlink Semiconductor
 bosch-sensortec»    Bosch Sensortec GmbH
 lontium Lontium Semiconductor
+himax	Himax Technologies, Inc.
+hxcommon	Himax Technologies, Inc.

Documentation/filesystems/f2fs.txt

@@ -161,6 +161,25 @@ offgrpjquota           Turn off group journelled quota.
 offprjjquota           Turn off project journelled quota.
 quota                  Enable plain user disk quota accounting.
 noquota                Disable all plain disk quota option.
+whint_mode=%s          Control which write hints are passed down to block
+                       layer. This supports "off", "user-based", and
+                       "fs-based".  In "off" mode (default), f2fs does not pass
+                       down hints. In "user-based" mode, f2fs tries to pass
+                       down hints given by users. And in "fs-based" mode, f2fs
+                       passes down hints with its policy.
+alloc_mode=%s          Adjust block allocation policy, which supports "reuse"
+                       and "default".
+fsync_mode=%s          Control the policy of fsync. Currently supports "posix",
+                       "strict", and "nobarrier". In "posix" mode, which is
+                       default, fsync will follow POSIX semantics and does a
+                       light operation to improve the filesystem performance.
+                       In "strict" mode, fsync will be heavy and behaves in line
+                       with xfs, ext4 and btrfs, where xfstest generic/342 will
+                       pass, but the performance will regress. "nobarrier" is
+                       based on "posix", but doesn't issue flush command for
+                       non-atomic files likewise "nobarrier" mount option.
+test_dummy_encryption  Enable dummy encryption, which provides a fake fscrypt
+                       context. The fake fscrypt context is used by xfstests.
 
 ================================================================================
 DEBUGFS ENTRIES

Documentation/power/suspend-and-cpuhotplug.txt

@@ -72,7 +72,7 @@ More details follow:
                                         |
                                         v
                            Disable regular cpu hotplug
-                        by setting cpu_hotplug_disabled=1
+                        by increasing cpu_hotplug_disabled
                                         |
                                         v
                             Release cpu_add_remove_lock
@@ -89,7 +89,7 @@ Resuming back is likewise, with the counterparts being (in the order of
 execution during resume):
 * enable_nonboot_cpus() which involves:
    |  Acquire cpu_add_remove_lock
-   |  Reset cpu_hotplug_disabled to 0, thereby enabling regular cpu hotplug
+   |  Decrease cpu_hotplug_disabled, thereby enabling regular cpu hotplug
    |  Call _cpu_up() [for all those cpus in the frozen_cpus mask, in a loop]
    |  Release cpu_add_remove_lock
    v
@@ -120,7 +120,7 @@ after the entire cycle is complete (i.e., suspend + resume).
                            Acquire cpu_add_remove_lock
                                         |
                                         v
-                          If cpu_hotplug_disabled is 1
+                          If cpu_hotplug_disabled > 0
                                 return gracefully
                                         |
                                         |

arch/arm/boot/dts/qcom/Makefile

@@ -1,10 +1,6 @@
-dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
-	msm8996-v2-pmi8994-mtp.dtb \
-	msm8996-v2-pmi8994-pmk8001-cdp.dtb \
+dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-mtp.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 \
@@ -85,11 +81,7 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.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 \
@@ -157,6 +149,7 @@ dtb-$(CONFIG_ARCH_MDM9650) += mdm9650-sim.dtb \
 	mdm9650-emmc-mtp.dtb \
 	mdm9650-nand-mtp.dtb \
 	mdm9650-ttp.dtb \
+	mdm9650-pcie-ep-ttp.dtb \
 	mdm9650-nand-dualwifi-mtp.dtb \
 	mdm9650-v1.1-emmc-cdp.dtb \
 	mdm9650-v1.1-nand-cdp.dtb \
@@ -253,6 +246,10 @@ dtb-$(CONFIG_ARCH_MSM8940) += msm8940-pmi8937-cdp.dtb \
 	msm8940-pmi8940-rcm.dtb \
 	msm8940-pmi8940-qrd-sku7.dtb
 
+ifeq ($(CONFIG_MACH_XIAOMI_MSM8953),y)
+dtb-$(CONFIG_MACH_XIAOMI_MIDO) += msm8953-qrd-sku3-mido.dtb
+dtb-$(CONFIG_MACH_XIAOMI_TISSOT) += msm8953-qrd-sku3-tissot.dtb
+else
 dtb-$(CONFIG_ARCH_MSM8953) += msm8953-sim.dtb \
 	msm8953-rumi.dtb \
 	msm8953-cdp.dtb \
@@ -268,6 +265,9 @@ dtb-$(CONFIG_ARCH_MSM8953) += msm8953-sim.dtb \
 	apq8053-mtp.dtb \
 	apq8053-ext-audio-mtp.dtb \
 	apq8053-ext-codec-rcm.dtb \
+	apq8053-lite-dragon-v1.0.dtb \
+	apq8053-lite-dragon-v2.0.dtb \
+	apq8053-lite-ext-codec-dragon-v2.0.dtb \
 	msm8953-cdp-1200p.dtb \
 	msm8953-iot-mtp.dtb \
 	apq8053-iot-mtp.dtb \
@@ -277,6 +277,7 @@ dtb-$(CONFIG_ARCH_MSM8953) += msm8953-sim.dtb \
 	msm8953-pmi8937-mtp.dtb \
 	msm8953-pmi8940-ext-codec-mtp.dtb \
 	msm8953-pmi8937-ext-codec-mtp.dtb
+endif
 
 dtb-$(CONFIG_ARCH_SDM450) += sdm450-rcm.dtb \
 	sdm450-cdp.dtb \
@@ -355,7 +356,9 @@ dtb-$(CONFIG_ARCH_MSM8909) += msm8909-pm8916-mtp.dtb \
 	msm8909-1gb-mtp.dtb \
 	msm8909-1gb-rcm.dtb \
 	msm8909-pm8916-1gb-rcm.dtb \
-        msm8909-1gb-cdp.dtb
+	msm8909-1gb-cdp.dtb \
+	apq8009-ext-codec-dragon.dtb \
+	apq8009-dragon.dtb
 
 ifeq ($(CONFIG_ARM64),y)
 always          := $(dtb-y)