Merge remote-tracking branch 'rk/rockchip' into test

Author: numbqq

Documentation/ABI/testing/sysfs-devices-system-cpu

@@ -277,6 +277,8 @@ What:		/sys/devices/system/cpu/vulnerabilities
 		/sys/devices/system/cpu/vulnerabilities/spectre_v1
 		/sys/devices/system/cpu/vulnerabilities/spectre_v2
 		/sys/devices/system/cpu/vulnerabilities/spec_store_bypass
+		/sys/devices/system/cpu/vulnerabilities/l1tf
+		/sys/devices/system/cpu/vulnerabilities/mds
 Date:		January 2018
 Contact:	Linux kernel mailing list <[email protected]>
 Description:	Information about CPU vulnerabilities

Documentation/ABI/testing/sysfs-fs-f2fs

@@ -86,12 +86,28 @@ Description:
 		The unit size is one block, now only support configuring in range
 		of [1, 512].
 
+What:          /sys/fs/f2fs/<disk>/umount_discard_timeout
+Date:          January 2019
+Contact:       "Jaegeuk Kim" <[email protected]>
+Description:
+		Set timeout to issue discard commands during umount.
+		Default: 5 secs
+
 What:		/sys/fs/f2fs/<disk>/max_victim_search
 Date:		January 2014
 Contact:	"Jaegeuk Kim" <[email protected]>
 Description:
 		 Controls the number of trials to find a victim segment.
 
+What:		/sys/fs/f2fs/<disk>/migration_granularity
+Date:		October 2018
+Contact:	"Chao Yu" <[email protected]>
+Description:
+		 Controls migration granularity of garbage collection on large
+		 section, it can let GC move partial segment{s} of one section
+		 in one GC cycle, so that dispersing heavy overhead GC to
+		 multiple lightweight one.
+
 What:		/sys/fs/f2fs/<disk>/dir_level
 Date:		March 2014
 Contact:	"Jaegeuk Kim" <[email protected]>
@@ -227,3 +243,11 @@ Description:
 		 - 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
+
+What:		/sys/fs/f2fs/<disk>/unusable
+Date		April 2019
+Contact:	"Daniel Rosenberg" <[email protected]>
+Description:
+		If checkpoint=disable, it displays the number of blocks that are unusable.
+                If checkpoint=enable it displays the enumber of blocks that would be unusable
+                if checkpoint=disable were to be set.

Documentation/arm64/silicon-errata.txt

@@ -56,3 +56,4 @@ stable kernels.
 |                |                 |                 |                         |
 | Cavium         | ThunderX ITS    | #22375, #24313  | CAVIUM_ERRATUM_22375    |
 | Cavium         | ThunderX GICv3  | #23154          | CAVIUM_ERRATUM_23154    |
+| Cavium         | ThunderX Core   | #27456          | CAVIUM_ERRATUM_27456    |

Documentation/devicetree/bindings/arm/rockchip.txt

@@ -133,6 +133,15 @@ Rockchip platforms device tree bindings
       - compatible = "rockchip,rk3399pro-evb-v10", "rockchip,rk3399pro";
       - compatible = "rockchip,rk3399pro-evb-v10-linux", "rockchip,rk3399pro";
       - compatible = "rockchip,rk3399pro-evb-v11-linux", "rockchip,rk3399pro";
+      - compatible = "rockchip,rk3399pro-evb-v13-linux", "rockchip,rk3399pro";
+      - compatible = "rockchip,rk3399pro-evb-v13-multi-cam", "rockchip,rk3399pro";
+
+- Rockchip RK3399pro evb avb:
+    Required root node properties:
+      - compatible = "rockchip,rk3399pro-evb-v10-avb", "rockchip,rk3399pro";
+      - compatible = "rockchip,rk3399pro-evb-v11-avb", "rockchip,rk3399pro";
+      - compatible = "rockchip,rk3399pro-evb-lp4-v11-avb", "rockchip,rk3399pro";
+      - compatible = "rockchip,rk3399pro-evb-v13-multi-cam-avb", "rockchip,rk3399pro";
 
 - Rockchip RK3399pro evb avb:
     Required root node properties:

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

@@ -31,7 +31,6 @@ Optional properties
 - phys: phandle to Non-SNPS PHY node
 - phy-names: the string "mipi_dphy" when is found in a node, along with "phys"
   attribute, provides phandle to MIPI PHY node
-- rockchip,dual-channel: for dual-channel panel, if not, don't configure
 - rockchip,lane-rate: manually configure lane-rate, not necessary.
 
 [1] Documentation/devicetree/bindings/clock/clock-bindings.txt
@@ -52,7 +51,6 @@ For Rockchip RK3288:
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		rockchip,dual-channel = <&dsi1>;
 		rockchip,lane-rate = <900>;
 
 		status = "okay";

Documentation/devicetree/bindings/dram/rk3368_dram_timing.txt

@@ -50,6 +50,8 @@ Required properties:
 
 - phy_odt : define the phy odt in ohm, default value isPHY_RTT_279ohm
 
+- ddr_2t : define the uptcl CMD/CLK 2T mode, default value is ENABLE_DDR_2T.
+
 the driver strength and odt value are defined at include/dt-bindings/dram/rockchip,rk3368.h
 
 Example:
@@ -73,5 +75,6 @@ Example:
                 phy_cmd_drv = <PHY_RON_34ohm>;
                 phy_dqs_drv = <PHY_RON_34ohm>;
                 phy_odt = <PHY_RTT_279ohm>;
+		ddr_2t = <ENABLE_DDR_2T>;
         };
 };

Documentation/devicetree/bindings/media/i2c/ar0144.txt

@@ -0,0 +1,40 @@
+* Aptina AR0144 MIPI sensor
+
+Required Properties:
+- compatible: should be "aptina,ar0144"
+- clocks: reference to the 24M xvclk input clock.
+- clock-names: should be "xvclk".
+- dovdd-supply: Digital I/O voltage supply, 1.8/2.8 volts
+- avdd-supply: Analog voltage supply, 2.8 volts
+- dvdd-supply: Digital core voltage supply, 1.2 volts
+- reset-gpios: Low active reset gpio
+
+The device node must contain one 'port' child node for its digital output
+video port, in accordance with the video interface bindings defined in
+Documentation/devicetree/bindings/media/video-interfaces.txt.
+
+Example:
+ar0144: ar0144@10 {
+	compatible = "aptina,ar0144";
+	status = "okay";
+	reg = <0x10>;
+	clocks = <&cru SCLK_CIF_OUT>;
+	clock-names = "xvclk";
+
+	//conflict with csi-ctl-gpios
+	reset-gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;
+	pwdn-gpios = <&gpio4 25 GPIO_ACTIVE_HIGH>;
+	pinctrl-names = "rockchip,camera_default";
+	pinctrl-0 = <&cif_clkout>;
+	rockchip,camera-module-index = <0>;
+	rockchip,camera-module-facing = "back";
+	rockchip,camera-module-name = "default";
+	rockchip,camera-module-lens-name = "default";
+	port {
+		ucam_out3: endpoint {
+			remote-endpoint = <&mipi_in_ucam3>;
+			data-lanes = <1>;
+		};
+	};
+};
+

Documentation/devicetree/bindings/media/i2c/bf20a2.txt

@@ -0,0 +1,47 @@
+* BF20A2 1/10-Inch 0.3Mp SOC Camera
+
+The BYD BF20A2 is a 1/10-inch SOC camera, with an active array size of
+640H x 480V. It is programmable through a SCCB. The BF20A2 sensor supports
+SVGA. It also can support YUV422 or raw RGB output formats.
+
+Required Properties:
+- compatible: Must be "byd,bf20a2"
+- reg: I2C slave address
+- clocks: reference to the xvclk input clock.
+- clock-names: should be "xvclk".
+- dovdd-supply: Digital I/O voltage supply, 1.7~3.1 volts
+- avdd-supply: Analog voltage supply, 2.8 volts
+- powerdown-gpios: High active powerdown gpio
+
+The device node must contain one 'port' child node for its digital output
+video port, in accordance with the video interface bindings defined in
+Documentation/devicetree/bindings/media/video-interfaces.txt.
+
+Example:
+&i2c2 {
+	status = "okay";
+
+	bf20a2: bf20a2@6e {
+		status = "okay";
+		compatible = "byd,bf20a2";
+		reg = <0x6e>;
+		clocks = <&cru SCLK_CIF_OUT>;
+		clock-names = "xvclk";
+
+		avdd-supply = <&vcc2v8_dvp>;
+		dovdd-supply = <&vcc2v8_dvp>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&cif_clkout_m0>;
+		pwdn-gpios = <&gpio2 13 GPIO_ACTIVE_HIGH>;
+		rockchip,camera-module-index = <0>;
+		rockchip,camera-module-facing = "back";
+		rockchip,camera-module-name = "default";
+		rockchip,camera-module-lens-name = "default";
+
+		port {
+			bf20a2_out: endpoint {
+				remote-endpoint = <&dvp_in_bcam>;
+			};
+		};
+	};
+};

Documentation/devicetree/bindings/media/i2c/gc5035.txt

@@ -0,0 +1,51 @@
+* GalaxyCore GC5035 MIPI sensor
+
+Required Properties:
+- compatible: should be "galaxycore,gc5035"
+- clocks: reference to the 24M xvclk input clock.
+- clock-names: should be "xvclk".
+- dovdd-supply: Digital I/O voltage supply, 1.7~3.0 volts
+- avdd-supply: Analog voltage supply, 2.8 volts
+- dvdd-supply: Digital core voltage supply, 1.2 volts
+- reset-gpios: Low active reset gpio
+- powerdown-gpios: Low active powerdown gpio
+
+Attention:
+GC5035 device address 0x6e(8bit) or 0x7e(8bit) is decided by IDSEL pin;
+
+The device node must contain one 'port' child node for its digital output
+video port, in accordance with the video interface bindings defined in
+Documentation/devicetree/bindings/media/video-interfaces.txt.
+
+Example:
+
+&i2c1 {
+	status = "okay";
+	gc5035: gc5035@37 { // or gc5035: gc5035@3f
+		status = "okay";
+		compatible = "galaxycore,gc5035";
+		reg = <0x37>; //or reg = <0x3f>;
+		clocks = <&cru SCLK_CIF_OUT>;
+		clock-names = "xvclk";
+
+		avdd-supply = <&vcc2v8_dvp>;
+		dovdd-supply = <&vcc1v8_dvp>;
+		dvdd-supply = <&vdd1v2_dvp>;
+		pwdn-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "rockchip,camera_default";
+		pinctrl-0 = <&cif_clkout>;
+
+		rockchip,camera-module-index = <1>;
+		rockchip,camera-module-facing = "front";
+		rockchip,camera-module-name = "CQ95-HL106F-5035_V1";
+		rockchip,camera-module-lens-name = "HTT-M503B-70";
+		lens-focus = <&dw9714f>;
+		port {
+			ucam_out1: endpoint {
+				//remote-endpoint = <&mipi_in_ucam0>;
+				remote-endpoint = <&mipi_in_ucam1>;
+				data-lanes = <1 2>;
+			};
+		};
+	};
+};

Documentation/devicetree/bindings/media/i2c/imx214.txt

@@ -0,0 +1,50 @@
+* Sony IMX214 MIPI sensor
+
+Required Properties:
+- compatible: should be "sony,imx214"
+- clocks: reference to the 24M xvclk input clock.
+- clock-names: should be "xvclk".
+- dovdd-supply: Digital I/O voltage supply, 1.8 volts
+- avdd-supply: Analog voltage supply, 2.8 volts
+- dvdd-supply: Digital core voltage supply, 1.0 volts
+- reset-gpios: Low active reset gpio
+
+The device node must contain one 'port' child node for its digital output
+video port, in accordance with the video interface bindings defined in
+Documentation/devicetree/bindings/media/video-interfaces.txt.
+
+Example:
+//rk3399 evb board
+&i2c1 {
+	status = "okay";
+	imx214_eeprom: imx214_eeprom@0x50 {
+		compatible = "sony,imx214_eeprom";
+		status = "okay";
+		reg = <0x50>;
+	};
+	imx214: imx214@10 {
+		eeprom-ctrl = <&imx214_eeprom>;
+		compatible = "sony,imx214";
+		status = "okay";
+		reg = <0x10>;
+		clocks = <&cru SCLK_CIF_OUT>;
+		clock-names = "xvclk";
+		/* avdd-supply = <>; */
+		/* dvdd-supply = <>; */
+		/* dovdd-supply = <>; */
+		/* pwdn-gpios = <>; */
+		reset-gpios = <&gpio2 13 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "rockchip,camera_default";
+		pinctrl-0 = <&cif_clkout>;
+		rockchip,camera-module-index = <0>;
+		rockchip,camera-module-facing = "back";
+		rockchip,camera-module-name = "YG9626-S600Y7-C";
+		rockchip,camera-module-lens-name = "LG-50013A7";
+		port {
+			ucam_out1: endpoint {
+				remote-endpoint = <&mipi_in_ucam0>;
+				data-lanes = <1 2>;
+			};
+		};
+	};
+};