HACK: cutoff something and rebase the 20180919

Rebase on the rockchip inside kernel:
d250b6b
(BACKPORT: usb: gadget: composite: make sure to reactivate function on unbind)

Change-Id: I4f405f5295d0c681be10f9139074aae917c8162d
Signed-off-by: Caesar Wang <[email protected]>

.gitignore

@@ -45,6 +45,7 @@ Module.symvers
 /boot.img
 /kernel.img
 /resource.img
+/zboot.img
 /tags
 /TAGS
 /linux

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

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

Documentation/ABI/testing/sysfs-fs-f2fs

@@ -101,6 +101,7 @@ Date:		February 2015
 Contact:	"Jaegeuk Kim" <[email protected]>
 Description:
 		 Controls the trimming rate in batch mode.
+		 <deprecated>
 
 What:		/sys/fs/f2fs/<disk>/cp_interval
 Date:		October 2015

Documentation/Changes

@@ -25,7 +25,7 @@ o  GNU C                  3.2                     # gcc --version
 o  GNU make               3.80                    # make --version
 o  binutils               2.12                    # ld -v
 o  util-linux             2.10o                   # fdformat --version
-o  module-init-tools      0.9.10                  # depmod -V
+o  kmod                   13                      # depmod -V
 o  e2fsprogs              1.41.4                  # e2fsck -V
 o  jfsutils               1.1.3                   # fsck.jfs -V
 o  reiserfsprogs          3.6.3                   # reiserfsck -V
@@ -132,12 +132,6 @@ is not build with CONFIG_KALLSYMS and you have no way to rebuild and
 reproduce the Oops with that option, then you can still decode that Oops
 with ksymoops.
 
-Module-Init-Tools
------------------
-
-A new module loader is now in the kernel that requires module-init-tools
-to use.  It is backward compatible with the 2.4.x series kernels.
-
 Mkinitrd
 --------
 
@@ -319,14 +313,15 @@ Util-linux
 ----------
 o  <ftp://ftp.kernel.org/pub/linux/utils/util-linux/>
 
+Kmod
+----
+o  <https://www.kernel.org/pub/linux/utils/kernel/kmod/>
+o  <https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git>
+
 Ksymoops
 --------
 o  <ftp://ftp.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/>
 
-Module-Init-Tools
------------------
-o  <ftp://ftp.kernel.org/pub/linux/kernel/people/rusty/modules/>
-
 Mkinitrd
 --------
 o  <https://code.launchpad.net/initrd-tools/main>

Documentation/device-mapper/thin-provisioning.txt

@@ -112,9 +112,11 @@ $low_water_mark is expressed in blocks of size $data_block_size.  If
 free space on the data device drops below this level then a dm event
 will be triggered which a userspace daemon should catch allowing it to
 extend the pool device.  Only one such event will be sent.
-Resuming a device with a new table itself triggers an event so the
-userspace daemon can use this to detect a situation where a new table
-already exceeds the threshold.
+
+No special event is triggered if a just resumed device's free space is below
+the low water mark. However, resuming a device always triggers an
+event; a userspace daemon should verify that free space exceeds the low
+water mark when handling this event.
 
 A low water mark for the metadata device is maintained in the kernel and
 will trigger a dm event if free space on the metadata device drops below

Documentation/devicetree/bindings/arm/rockchip.txt

@@ -115,17 +115,37 @@ Rockchip platforms device tree bindings
     Required root node properties:
       - compatible = "rockchip,rk3399-evb", "rockchip,rk3399";
 
+- Rockchip RK3399 Rock960 version ab board:
+    Required root node properties:
+      - compatible = "rockchip,rock960", "rockchip,rk3399";
+
+- Rockchip RK3399pro evb:
+    Required root node properties:
+      - compatible = "rockchip,rk3399pro-evb-v10", "rockchip,rk3399pro";
+
 - Rockchip RK3326 f863 board:
     Required root node properties:
       - compatible = "rockchip,rk3326-863-lp3-v10", "rockchip,rk3326";
 
+- Rockchip RK3326 f863 avb board:
+    Required root node properties:
+      - compatible = "rockchip,rk3326-863-lp3-v10-avb", "rockchip,rk3326";
+
+- Rockchip RK3326 86v board:
+    Required root node properties:
+      - compatible = "rockchip,rk3326-86v-v10", "rockchip,rk3326";
+
 - Rockchip RK3326 evb board:
     Required root node properties:
       - compatible = "rockchip,rk3326-evb-lp3-v10", "rockchip,rk3326";
+    Or
+      - compatible = "rockchip,rk3326-evb-lp3-v10-linux", "rockchip,rk3326";
 
 - Rockchip PX30 evb ddr3 board:
     Required root node properties:
       - compatible = "rockchip,px30-evb-ddr3-v10", "rockchip,px30";
+    Or
+      - compatible = "rockchip,px30-evb-ddr3-v10-linux", "rockchip,px30";
 
 - Rockchip PX30 evb ddr4 board:
     Required root node properties:

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

@@ -49,6 +49,8 @@ In 'operating-points-v2' table:
                        current temperature is above reference temperature.
 - rockchip,pvtm-thermal-zone: A thermal zone node containing thermal sensor,
                        it's used to get the current temperature.
+- rockchip,thermal-zone: A thermal zone node containing thermal sensor,
+                       it's used to get the current temperature.
 
 - nvmem-cells: A phandle to cpu_leakage data provided by a nvmem device.
 - nvmem-cell-names: Should be "cpu_leakage"

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

@@ -23,6 +23,8 @@ Required properties for dp-controller:
 		from general PHY binding: Should be "dp".
 
 Optional properties for dp-controller:
+	-analogix,video-bist-enable:
+		Enable video bist pattern for DP_TX debugging.
 	-force-hpd:
 		Indicate driver need force hpd when hpd detect failed, this
 		is used for some eDP screen which don't have hpd signal.

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

@@ -4,6 +4,7 @@ Rockchip specific extensions to the Synopsys Designware MIPI DSI
 Required properties:
 - compatible: must be one of:
 	"rockchip,px30-mipi-dsi", "snps,dw-mipi-dsi".
+	"rockchip,rk1808-mipi-dsi", "snps,dw-mipi-dsi".
 	"rockchip,rk3128-mipi-dsi", "snps,dw-mipi-dsi".
 	"rockchip,rk3288-mipi-dsi", "snps,dw-mipi-dsi".
 	"rockchip,rk3366-mipi-dsi", "snps,dw-mipi-dsi".

Documentation/devicetree/bindings/display/rockchip/rockchip,rk618.txt

@@ -114,3 +114,75 @@ Example:
 		};
 	};
 };
+
+RGB Encoder
+------------
+
+Required properties:
+- compatible: value should be one of the following:
+   "rockchip,rk618-rgb"
+- clocks: must include clock specifiers corresponding to entries in the
+	  clock-names property.
+	  See ../clocks/clock-bindings.txt for details.
+- clock-names: list of clock names sorted in the same order as the clocks
+	       property. Must contain "rgb", "dither", "vif", "scaler".
+
+Required nodes:
+
+The connections to the video ports are modeled using the OF graph
+bindings specified in Documentation/devicetree/bindings/graph.txt.
+
+Example:
+
+&rk618 {
+	status = "okay";
+
+	rgb {
+		compatible = "rockchip,rk618-rgb";
+		clocks = <&CRU RGB_CLK>, <&CRU DITHER_CLK>,
+			 <&CRU VIF0_CLK>, <&CRU SCALER_CLK>;
+		clock-names = "rgb", "dither", "vif", "scaler";
+		status = "okay";
+
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				rgb_input_vop: endpoint@0 {
+					reg = <0>;
+					remote-endpoint = <&vop_output_rgb>;
+				};
+
+				rgb_input_vif: endpoint@1 {
+					reg = <1>;
+					remote-endpoint = <&vif_output_rgb>;
+				};
+
+				rgb_input_hdmi: endpoint@2 {
+					reg = <2>;
+					remote-endpoint = <&hdmi_output_rgb>;
+				};
+			};
+
+			port@1 {
+				reg = <1>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				rgb_lcdc1_out_tve: endpoint@0 {
+					reg = <0>;
+					remote-endpoint = <&tve_in_rgb_lcdc1>;
+				};
+				rgb_out_tve: endpoint@1 {
+					status = "disabled";
+					reg = <1>;
+					remote-endpoint = <&tve_in_rgb>;
+				};
+			};
+		};
+	};
+};

Documentation/devicetree/bindings/display/rockchip/rockchip-rgb.txt

@@ -4,13 +4,15 @@ Rockchip RGB interface
 Required properties:
 - compatible: matching the soc type:
 	- "rockchip,px30-rgb";
-	- "rockchip,rv1108-rgb";
+	- "rockchip,rk1808-rgb";
 	- "rockchip,rk3066-rgb";
 	- "rockchip,rk3308-rgb";
+	- "rockchip,rv1108-rgb";
 
 Optional properties:
-- pinctrl-names: must contain a "lcdc" entry.
-- pinctrl-0: pin control group to be used for this interface.
+- pinctrl-names: the pin control state names; should contain "default"
+- pinctrl-0: the default pinctrl state (active)
+- pinctrl-1: the "sleep" pinctrl state
 
 The rgb has two video ports described by:
 	Documentation/devicetree/bindings/media/video-interfaces.txt
@@ -22,8 +24,6 @@ Their connections are modeled using the OF graph bindings specified in
 
 the panel described by:
 	Documentation/devicetree/bindings/display/panel/simple-panel.txt
-rgb-mode nodes described by:
-	Documentation/devicetree/bindings/display/panel/panel-rgb.txt
 Panel other required properties:
 - ports for remote rgb output.
 
@@ -32,7 +32,7 @@ Example:
 panel: panel {
 	compatible = "auo,b101ean01";
 	enable-gpios = <&gpio7 21 GPIO_ACTIVE_HIGH>;
-	rgb-mode = "p888";
+	bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
 
 	ports {
 		panel_in_rgb: endpoint {
@@ -45,7 +45,7 @@ For Rockchip RV1108:
 
 	rgb: rgb {
 		compatible = "rockchip,rv1108-rgb";
-		pinctrl-names = "lcdc";
+		pinctrl-names = "default";
 		pinctrl-0 = <&lcdc_ctl>;
 
 		ports {

Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt

@@ -12,6 +12,8 @@ Required properties:
 		"rockchip,px30-vop-big";
 		"rockchip,px30-vop-lit";
 		"rockchip,rk3308-vop";
+		"rockchip,rk1808-vop-lit";
+		"rockchip,rk1808-vop-raw";
 		"rockchip,rk3288-vop-lit";
 		"rockchip,rk3288-vop-big";
 		"rockchip,rk3368-vop";

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

@@ -0,0 +1,56 @@
+Rockchip MIPI CSI HOST
+================================
+
+Required properties:
+- compatible: must be one of:
+	"rockchip,rk1808-mipi-csi".
+- reg: Represent the physical address range of the controller.
+- interrupts: Represent the controller's interrupt to the CPU(s).
+- clocks, clock-names: Phandles to the controller's APB clock(pclk) as
+  described in [1].
+- resets : phandle to the reset of MIPI CSI APB Clock.
+- reset-names : should be "apb".
+- rockchip,grf: this soc should set GRF regs to mux vopl/vopb.
+- #address-cells: Should be <1>.
+- #size-cells: Should be <0>.
+- ports: contain a port node with endpoint definitions as defined in [2].
+  For vopb,set the reg = <0> and set the reg = <1> for vopl.
+
+Optional properties
+- clocks, clock-names:
+  phandle to the SNPS-PHY config clock, name should be "phy_cfg".
+  phandle to the SNPS-PHY PLL reference clock, name should be "ref".
+  phandle to the Non-SNPS PHY high speed clock, name should be "hs_clk".
+  phandle to the h2p bridge clock, name should be "h2p".
+- 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
+[2] Documentation/devicetree/bindings/media/video-interfaces.txt
+[3] Documentation/devicetree/bindings/reset/reset.txt
+
+Example:
+
+For Rockchip RK1808:
+
+	csi: csi@ffb20000 {
+		compatible = "rockchip,rk1808-mipi-csi";
+		clocks = <&cru PCLK_MIPI_CSI0>, <&mipi_dphy>;
+		clock-names = "pclk", "hs_clk";
+		phys = <&mipi_dphy>;
+		phy-names = "mipi_dphy";
+		resets = <&cru SRST_MIPICSI>;
+		reset-names = "apb";
+		...
+
+		ports {
+			port {
+				csi_in_vop: endpoint {
+					remote-endpoint = <&vop_out_csi>;
+				};
+			};
+		};
+	};