arm64: dts: rockchip: fix typo and remove deprecated property for rk3328

.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,33 @@ 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 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/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

@@ -9,8 +9,9 @@ Required properties:
 	- "rockchip,rk3308-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 +23,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 +31,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 +44,7 @@ For Rockchip RV1108:
 
 	rgb: rgb {
 		compatible = "rockchip,rv1108-rgb";
-		pinctrl-names = "lcdc";
+		pinctrl-names = "default";
 		pinctrl-0 = <&lcdc_ctl>;
 
 		ports {

Documentation/devicetree/bindings/media/rockchip-cif.txt

@@ -0,0 +1,85 @@
+Rockchip SoC Camera Interface
+----------------------------------------------
+
+Rockchip CIF is a camera interface for the Rockchip series of SoCs
+like px30, rk3288, rk312x, RV1108 to receive frame data from camera or CCIR656 encoder,
+and transfer the data into system main memory by AXI bus.
+
+Required properties:
+- compatible: value should be one of the following
+	"rockchip,px30-cif";
+	"rockchip,rk3128-cif";
+	"rockchip,rk3288-cif";
+- reg : offset and length of the register set for the device.
+- interrupts: should contain cif interrupt.
+- clocks: phandle to the required clocks.
+- clock-names: required clock name.
+
+Optional properties:
+- iommus: iommu node attached to cif if exist.
+- resets: CRU reset of cif if exist.
+
+port node
+-------------------
+
+The device node should contain one 'port' child node with child 'endpoint'
+nodes, according to the bindings defined in Documentation/devicetree/bindings/
+media/video-interfaces.txt.
+
+- endpoint(parallel):
+	- remote-endpoint: Connecting to a sensor with a parallel video bus.
+	- parallel_bus properties: Refer to Documentation/devicetree/bindings/
+		media/video-interfaces.txt.
+
+The port node must contain at least one endpoint.
+It could have multiple endpoints, but please note the hardware don't support
+two sensors work at a time, they are supposed to work asynchronously.
+
+Device node example
+-------------------
+
+	cif: cif@ff490000 {
+		compatible = "rockchip,px30-cif";
+		reg = <0x0 0xff490000 0x0 0x200>;
+		interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_CIF>, <&cru HCLK_CIF>, <&cru PCLK_CIF>, <&cru SCLK_CIF_OUT>;
+		clock-names = "aclk_cif", "hclk_cif", "pclk_cif", "cif_out";
+		resets = <&cru SRST_CIF_A>, <&cru SRST_CIF_H>, <&cru SRST_CIF_PCLKIN>;
+		reset-names = "rst_cif_a", "rst_cif_h", "rst_cif_pclkin";
+		power-domains = <&power PX30_PD_VI>;
+		iommus = <&vip_mmu>;
+		status = "okay";
+		port {
+			cif_in: endpoint {
+				remote-endpoint = <&gc2155_out>;
+				vsync-active = <0>;
+				hsync-active = <1>;
+			};
+		};
+	};
+
+	cif: cif@1010a000 {
+		compatible = "rockchip,rk3128-cif";
+		reg = <0x1010a000 0x200>;
+
+		clocks = <&cru ACLK_CIF>, <&cru HCLK_CIF>,
+			 <&cru SCLK_CIF_OUT>;
+		clock-names = "aclk_cif", "hclk_cif",
+			      "sclk_cif_out";
+		resets = <&cru SRST_CIF0>;
+		reset-names = "rst_cif";
+		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+		/* px3se has not iommu attached */
+		/* iommus = <&cif_mmu>; */
+		power-domains = <&power RK3128_PD_VIO>;
+
+		status = "okay";
+
+		port {
+			cif_in: endpoint {
+				remote-endpoint = <&adv7181_out>;
+				vsync-active = <0>;
+				hsync-active = <1>;
+			};
+		};
+	};

Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt

@@ -20,6 +20,13 @@ Required properties:
 		<&tcphy0 1> and <&tcphy1 1> for USB3 PHY.
    See ./phy-bindings.txt for details.
 
+Optional properties:
+ - rockchip,phy-config : A list of voltage swing(mV) and pre-emphasis
+			(dB) pairs. They are 3 blocks of 4 entries and
+			correspond to s0p0 ~ s0p3, s1p0 ~ s1p3,
+			s2p0 ~ s2p3, s3p0 ~ s2p3 swing and pre-emphasis
+			values.
+
 Note, there are 2 type-c phys for RK3399, and they are almost identical, except
 these registers(description below), every register node contains 3 sections:
 offset, enable bit, write mask bit.
@@ -62,6 +69,21 @@ Example:
 		rockchip,external-psm = <0xe588 14 30>;
 		rockchip,pipe-status = <0xe5c0 0 0>;
 		rockchip,uphy-dp-sel = <0x6268 19 19>;
+
+		rockchip,phy-config = <0x2a 0x00>,
+			<0x1f 0x15>,
+			<0x14 0x22>,
+			<0x02 0x2b>,
+
+			<0x21 0x00>,
+			<0x12 0x15>,
+			<0x02 0x22>,
+			<0 0>,
+
+			<0x15 0x00>,
+			<0x00 0x15>,
+			<0 0>,
+			<0 0>;
 	};
 
 	tcphy1: phy@ff800000 {
@@ -84,4 +106,19 @@ Example:
 		rockchip,external-psm = <0xe594 14 30>;
 		rockchip,pipe-status = <0xe5c0 16 16>;
 		rockchip,uphy-dp-sel = <0x6268 3 19>;
+
+		rockchip,phy-config = <0x2a 0x00>,
+			<0x1f 0x15>,
+			<0x14 0x22>,
+			<0x02 0x2b>,
+
+			<0x21 0x00>,
+			<0x12 0x15>,
+			<0x02 0x22>,
+			<0 0>,
+
+			<0x15 0x00>,
+			<0x00 0x15>,
+			<0 0>,
+			<0 0>;
 	};