Merge branch 'release-4.4' into sbc/tinkerboard/asus/Debian-9.0

[Information Description]
        This is merged to the below RK commit ID

        commit 40e8774
        Author: Sugar Zhang <sugar.zhang@rock-chips.com>
        Date:   Fri Jun 15 16:23:33 2018 +0800

            ASoC: rockchip: multi_dais: fixup master/slave format

Change-Id: I5692dc2d464ede092f8f490810af3a1f35761b57

Author: jamess-huang

Documentation/ABI/testing/sysfs-fs-f2fs

@@ -192,3 +192,14 @@ 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/device-mapper/verity.txt

@@ -109,6 +109,17 @@ fec_start <offset>
     This is the offset, in <data_block_size> blocks, from the start of the
     FEC device to the beginning of the encoding data.
 
+check_at_most_once
+    Verify data blocks only the first time they are read from the data device,
+    rather than every time.  This reduces the overhead of dm-verity so that it
+    can be used on systems that are memory and/or CPU constrained.  However, it
+    provides a reduced level of security because only offline tampering of the
+    data device's content will be detected, not online tampering.
+
+    Hash blocks are still verified each time they are read from the hash device,
+    since verification of hash blocks is less performance critical than data
+    blocks, and a hash block will not be verified any more after all the data
+    blocks it covers have been verified anyway.
 
 Theory of operation
 ===================

Documentation/devicetree/bindings/arm/mali-midgard.txt

@@ -1,5 +1,5 @@
 #
-# (C) COPYRIGHT 2013-2015 ARM Limited. All rights reserved.
+# (C) COPYRIGHT 2013-2017 ARM Limited. All rights reserved.
 #
 # This program is free software and is provided to you under the terms of the
 # GNU General Public License version 2 as published by the Free Software
@@ -33,8 +33,6 @@ Optional:
 Documentation/devicetree/bindings/regulator/regulator.txt for details.
 - operating-points : Refer to Documentation/devicetree/bindings/power/opp.txt
 for details.
-- snoop_enable_smc : SMC function ID to enable CCI snooping on the GPU port(s).
-- snoop_disable_smc : SMC function ID to disable CCI snooping on the GPU port(s).
 - jm_config : For T860/T880. Sets job manager configuration. An array containing:
 	- 1 to override the TIMESTAMP value, 0 otherwise.
 	- 1 to override clock gate, forcing them to be always on, 0 otherwise.
@@ -45,19 +43,27 @@ for details.
 - power_model : Sets power model parameters. Note that this model was designed for the Juno
 	        platform, and may not be suitable for other platforms. A structure containing :
 	- compatible: Should be arm,mali-simple-power-model
-	- voltage: Voltage at reference point. Specified in mV.
-	- frequency: Frequency at reference point. Specified in MHz.
-	- dynamic-power: Dynamic power at reference frequency and voltage. Specified in mW.
-	- static-power: Static power at reference frequency. Specified in mW.
-	- ts: An array containing coefficients for the temperature scaling factor.
-	  Used as : tsf = ts[3]*T^3 + ts[2]*T^2 + ts[1]*T + ts[0], where T = temperature
+	- dynamic-coefficient: Coefficient, in pW/(Hz V^2), which is multiplied
+	  by v^2*f to calculate the dynamic power consumption.
+	- static-coefficient: Coefficient, in uW/V^3, which is multiplied by
+	  v^3 to calculate the static power consumption.
+	- ts: An array containing coefficients for the temperature scaling
+	  factor. This is used to scale the static power by a factor of
+	  tsf/1000000, where tsf = ts[3]*T^3 + ts[2]*T^2 + ts[1]*T + ts[0],
+	  and T = temperature in degrees.
 	- thermal-zone: A string identifying the thermal zone used for the GPU
 - system-coherency : Sets the coherency protocol to be used for coherent
 		     accesses made from the GPU.
 		     If not set then no coherency is used.
 	- 0  : ACE-Lite
 	- 1  : ACE
 	- 31 : No coherency
+- ipa-model : Sets the IPA model to be used for power management. GPU probe will fail if the
+	      model is not found in the registered models list. If no model is specified here,
+	      a gpu-id based model is picked if available, otherwise the default model is used.
+	- mali-simple-power-model: Default model used on mali
+- protected-mode-switcher : Phandle to device implemented protected mode switching functionality.
+Refer to Documentation/devicetree/bindings/arm/smc-protected-mode-switcher.txt for one implementation.
 
 Example for a Mali-T602:
 
@@ -82,10 +88,8 @@ gpu@0xfc010000 {
 	>;
 	power_model {
 		compatible = "arm,mali-simple-power-model";
-		voltage = <800>;
-		frequency = <500>;
-		static-power = <500>;
-		dynamic-power = <1500>;
+		static-coefficient = <2427750>;
+		dynamic-coefficient = <4687>;
 		ts = <20000 2000 (-20) 2>;
 		thermal-zone = "gpu";
 	};

Documentation/devicetree/bindings/crypto/rockchip-crypto.txt

@@ -0,0 +1,29 @@
+Rockchip Electronics And Security Accelerator
+
+Required properties:
+- compatible: Should be "rockchip,rk3288-crypto"
+- reg: Base physical address of the engine and length of memory mapped
+       region
+- interrupts: Interrupt number
+- clocks: Reference to the clocks about crypto
+- clock-names: "aclk" used to clock data
+	       "hclk" used to clock data
+	       "sclk" used to clock crypto accelerator
+	       "apb_pclk" used to clock dma
+- resets: Must contain an entry for each entry in reset-names.
+	  See ../reset/reset.txt for details.
+- reset-names: Must include the name "crypto-rst".
+
+Examples:
+
+	crypto: cypto-controller@ff8a0000 {
+		compatible = "rockchip,rk3288-crypto";
+		reg = <0xff8a0000 0x4000>;
+		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>,
+			 <&cru SCLK_CRYPTO>, <&cru ACLK_DMAC1>;
+		clock-names = "aclk", "hclk", "sclk", "apb_pclk";
+		resets = <&cru SRST_CRYPTO>;
+		reset-names = "crypto-rst";
+		status = "okay";
+	};

Documentation/devicetree/bindings/display/bridge/lontium,lt8912.txt

@@ -0,0 +1,41 @@
+Lontium LT8912 MIPI-DSI to LVDS and HDMI/MHL bridge bindings
+
+Required properties:
+ - compatible: "lontium,lt8912"
+ - reg: virtual channel id
+ - reset-gpios: a GPIO spec for the reset pin
+ - i2c-bus: phandle of an I2C controller used for register access
+ - display-timings : Refer to binding doc display-timing.txt for details
+
+Example:
+
+&dsi {
+	status = "okay";
+
+	lt8912@0 {
+		compatible = "lontium,lt8912";
+		reg = <0>;
+		reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
+		i2c-bus = <&i2c1>;
+
+		display-timings {
+			native-mode = <&timing0>;
+
+			timing0: timing0 {
+				clock-frequency = <74250000>;
+				hactive = <1280>;
+				vactive = <720>;
+				hfront-porch = <110>;
+				hsync-len = <40>;
+				hback-porch = <220>;
+				vfront-porch = <5>;
+				vsync-len = <5>;
+				vback-porch = <20>;
+				hsync-active = <0>;
+				vsync-active = <0>;
+				de-active = <0>;
+				pixelclk-active = <0>;
+			};
+		};
+	};
+};

Documentation/devicetree/bindings/display/bridge/rk1000.txt

@@ -12,6 +12,9 @@ Required properties:
 - rockchip,output: This describes the output face
 - rockchip,ctl: phandle to the rk1000 core controller
 
+Optional properties:
+
+- rockchip,tvemode: tve preferred mode, 0 for PAL, 1 for NTSC
 
 Required node:
 
@@ -31,6 +34,7 @@ Example
 		rockchip,data-width = <24>;
 		rockchip,output = "rgb";
 		rockchip,ctl = <&rk1000_ctl>;
+		rockchip,tvemode = <0>;
 		ports {
 			#address-cells = <1>;
 			#size-cells = <0>;

Documentation/devicetree/bindings/display/panel/simple-panel.txt

@@ -19,6 +19,7 @@ Optional properties:
 - unprepare-delay-ms: take for the panel to display off
 - width-mm: physical panel width [mm]
 - height-mm: physical panel height [mm]
+- bpc: bits per color/component
 
 Required properties when compatible is "simple-panel" or "simple-panel-dsi":
 - display-timings: see display-timing.txt for information

Documentation/devicetree/bindings/display/rockchip/rockchip_drm_tve.txt

@@ -14,6 +14,8 @@ Required properties:
 - rockchip,lumafilter2: the value for TVE_LUMA_FILTER3(0x1c)
 - rockchip,daclevel: the value is used to adjust the voltage amplitude of the CVBS
 - rockchip,dac1level: only for rv1108 rk322x and rk3328
+Optional properties:
+- rockchip,tvemode: tve preferred mode, 0 for PAL, 1 for NTSC
 
 Example:
 	tve: tve@ff373e00 {
@@ -28,6 +30,7 @@ Example:
 		rockchip,lumafilter2 = <0xf332d70c>;
 		rockchip,daclevel = <0x22>;
 		rockchip,dac1level = <0x7>;
+		rockchip,tvemode = <0>;
 		status = "disabled";
 
 		ports {

Documentation/devicetree/bindings/iio/light/vl6180.txt

@@ -0,0 +1,15 @@
+STMicro VL6180 -  ALS, range and proximity sensor
+
+Link to datasheet: http://www.st.com/resource/en/datasheet/vl6180x.pdf
+
+Required properties:
+
+	-compatible: should be "st,vl6180"
+	-reg: the I2C address of the sensor
+
+Example:
+
+vl6180@29 {
+	compatible = "st,vl6180";
+	reg = <0x29>;
+};

Documentation/devicetree/bindings/mmc/mmc.txt

@@ -19,6 +19,8 @@ Optional properties:
 - wp-gpios: Specify GPIOs for write protection, see gpio binding
 - cd-inverted: when present, polarity on the CD line is inverted. See the note
   below for the case, when a GPIO is used for the CD line
+- cd-debounce-delay-ms: Set delay time before detecting card after card insert
+  interrupt. It's only valid when cd-gpios is present.
 - wp-inverted: when present, polarity on the WP line is inverted. See the note
   below for the case, when a GPIO is used for the WP line
 - disable-wp: When set no physical WP line is present. This property should