Skip to content

Commit 439b690

Browse files
jamess-huangjamess-huang
committed
Merge remote-tracking branch 'rockchip/release-4.4' into sbc/tinkerboard/arks/Debian-9.0
Change-Id: I470120564f0c15bfa4c824bef1f39de79b161a53
2 parents 4d27e44 + eae92ae commit 439b690

3,316 files changed

Lines changed: 228417 additions & 323523 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,3 +271,19 @@ Description: Parameters for the CPU cache attributes
271271
- WriteBack: data is written only to the cache line and
272272
the modified cache line is written to main
273273
memory only when it is replaced
274+
275+
What: /sys/devices/system/cpu/vulnerabilities
276+
/sys/devices/system/cpu/vulnerabilities/meltdown
277+
/sys/devices/system/cpu/vulnerabilities/spectre_v1
278+
/sys/devices/system/cpu/vulnerabilities/spectre_v2
279+
Date: January 2018
280+
Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org>
281+
Description: Information about CPU vulnerabilities
282+
283+
The files are named after the code names of CPU
284+
vulnerabilities. The output of those files reflects the
285+
state of the CPUs in the system. Possible output values:
286+
287+
"Not affected" CPU is not affected by the vulnerability
288+
"Vulnerable" CPU is affected and no mitigation in effect
289+
"Mitigation: $M" CPU is affected and mitigation $M is in effect

‎Documentation/ABI/testing/sysfs-fs-f2fs‎

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,18 @@ Description:
5151
Controls the dirty page count condition for the in-place-update
5252
policies.
5353

54+
What: /sys/fs/f2fs/<disk>/min_hot_blocks
55+
Date: March 2017
56+
Contact: "Jaegeuk Kim" <jaegeuk@kernel.org>
57+
Description:
58+
Controls the dirty page count condition for redefining hot data.
59+
60+
What: /sys/fs/f2fs/<disk>/min_ssr_sections
61+
Date: October 2017
62+
Contact: "Chao Yu" <yuchao0@huawei.com>
63+
Description:
64+
Controls the fee section threshold to trigger SSR allocation.
65+
5466
What: /sys/fs/f2fs/<disk>/max_small_discards
5567
Date: November 2013
5668
Contact: "Jaegeuk Kim" <jaegeuk.kim@samsung.com>
@@ -96,6 +108,18 @@ Contact: "Jaegeuk Kim" <jaegeuk@kernel.org>
96108
Description:
97109
Controls the checkpoint timing.
98110

111+
What: /sys/fs/f2fs/<disk>/idle_interval
112+
Date: January 2016
113+
Contact: "Jaegeuk Kim" <jaegeuk@kernel.org>
114+
Description:
115+
Controls the idle timing.
116+
117+
What: /sys/fs/f2fs/<disk>/iostat_enable
118+
Date: August 2017
119+
Contact: "Chao Yu" <yuchao0@huawei.com>
120+
Description:
121+
Controls to enable/disable IO stat.
122+
99123
What: /sys/fs/f2fs/<disk>/ra_nid_pages
100124
Date: October 2015
101125
Contact: "Chao Yu" <chao2.yu@samsung.com>
@@ -116,6 +140,12 @@ Contact: "Shuoran Liu" <liushuoran@huawei.com>
116140
Description:
117141
Shows total written kbytes issued to disk.
118142

143+
What: /sys/fs/f2fs/<disk>/feature
144+
Date: July 2017
145+
Contact: "Jaegeuk Kim" <jaegeuk@kernel.org>
146+
Description:
147+
Shows all enabled features in current device.
148+
119149
What: /sys/fs/f2fs/<disk>/inject_rate
120150
Date: May 2016
121151
Contact: "Sheng Yong" <shengyong1@huawei.com>
@@ -132,7 +162,18 @@ What: /sys/fs/f2fs/<disk>/reserved_blocks
132162
Date: June 2017
133163
Contact: "Chao Yu" <yuchao0@huawei.com>
134164
Description:
135-
Controls current reserved blocks in system.
165+
Controls target reserved blocks in system, the threshold
166+
is soft, it could exceed current available user space.
167+
168+
What: /sys/fs/f2fs/<disk>/current_reserved_blocks
169+
Date: October 2017
170+
Contact: "Yunlong Song" <yunlong.song@huawei.com>
171+
Contact: "Chao Yu" <yuchao0@huawei.com>
172+
Description:
173+
Shows current reserved blocks in system, it may be temporarily
174+
smaller than target_reserved_blocks, but will gradually
175+
increase to target_reserved_blocks when more free blocks are
176+
freed by user later.
136177

137178
What: /sys/fs/f2fs/<disk>/gc_urgent
138179
Date: August 2017

‎Documentation/devicetree/bindings/arm/rockchip.txt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,19 @@ Rockchip platforms device tree bindings
114114
- Rockchip RK3399 evb:
115115
Required root node properties:
116116
- compatible = "rockchip,rk3399-evb", "rockchip,rk3399";
117+
118+
- Rockchip RK3326 f863 board:
119+
Required root node properties:
120+
- compatible = "rockchip,rk3326-863-lp3-v10", "rockchip,rk3326";
121+
122+
- Rockchip RK3326 evb board:
123+
Required root node properties:
124+
- compatible = "rockchip,rk3326-evb-lp3-v10", "rockchip,rk3326";
125+
126+
- Rockchip PX30 evb ddr3 board:
127+
Required root node properties:
128+
- compatible = "rockchip,px30-evb-ddr3-v10", "rockchip,px30";
129+
130+
- Rockchip PX30 evb ddr4 board:
131+
Required root node properties:
132+
- compatible = "rockchip,px30-evb-ddr4-v10", "rockchip,px30";

‎Documentation/devicetree/bindings/clock/rockchip,rk618-cru.txt‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
Rockchip RK618 Clock and Reset Unit
2+
3+
This binding uses the common clock binding:
4+
Documentation/devicetree/bindings/clock/clock-bindings.txt
5+
6+
Required properties :
7+
- compatible : Should be "rockchip,rk618-cru"
8+
- clocks : Should contain phandle and clock specifiers for the input clock:
9+
the AP I2S master clock output(mclk) "clkin", and the AP LCDC master
10+
dclk output(dclk) "lcdc0_dclkp".
11+
- #clock-cells : Should be 1.
12+
13+
Example:
14+
15+
&rk618 {
16+
CRU: cru {
17+
compatible = "rockchip,rk618-cru";
18+
clocks = <&cru SCLK_I2S_8CH_OUT>, <&cru DCLK_VOP>;
19+
clock-names = "clkin", "lcdc0_dclkp";
20+
assigned-clocks = <&CRU SCALER_PLLIN_CLK>, <&CRU VIF_PLLIN_CLK>,
21+
<&CRU HDMI_CLK>, <&CRU SCALER_CLK>,
22+
<&CRU CODEC_CLK>;
23+
assigned-clock-parents = <&CRU LCDC0_CLK>, <&CRU LCDC0_CLK>,
24+
<&CRU VIF0_CLK>, <&CRU SCALER_PLL_CLK>,
25+
<&cru SCLK_I2S_8CH_OUT>;
26+
#clock-cells = <1>;
27+
status = "okay";
28+
};
29+
};

‎Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33

44
Required properties:
55
- compatible: Should be one of the following.
6+
- "rockchip,px30-dfi" - for PX30 SoCs.
67
- "rockchip,rk3128-dfi" - for RK3128 SoCs.
78
- "rockchip,rk3288-dfi" - for RK3288 SoCs.
9+
- "rockchip,rk3328-dfi" - for RK3328 SoCs.
810
- "rockchip,rk3368-dfi" - for RK3368 SoCs.
911
- "rockchip,rk3399-dfi" - for RK3399 SoCs.
1012

‎Documentation/devicetree/bindings/devfreq/rockchip_dmc.txt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22

33
Required properties:
44
- compatible: Should be one of the following.
5+
- "rockchip,px30-dmc" - for PX30 SoCs.
56
- "rockchip,rk3128-dmc" - for RK3128 SoCs.
7+
- "rockchip,rk3228-dmc" - for RK3228 SoCs.
68
- "rockchip,rk3288-dmc" - for RK3288 SoCs.
9+
- "rockchip,rk3328-dmc" - for RK3328 SoCs.
710
- "rockchip,rk3368-dmc" - for RK3368 SoCs.
811
- "rockchip,rk3399-dmc" - for RK3399 SoCs.
912
- devfreq-events: Node to get DDR loading, Refer to
@@ -28,6 +31,16 @@ Optional properties:
2831
min-bandwidth: minimum ddr bandwidth in Mbyte/sec.
2932
max-bandwidth: maximum ddr bandwidth in Mbyte/sec.
3033
frequency: ddr frequency in KHz.
34+
- #cooling-cells: This property indicates dmc can work as a cooling device
35+
- ddr_power_model: Sets power model parameters.
36+
- dynamic-power-coefficient: A u32 value that represents the running time dynamic
37+
power coefficient in units of mW/MHz/uVolt^2. The coefficient can either be
38+
calculated from power measurements or derived by analysis.
39+
- static-power-coefficient: A u32 value that represents the static power
40+
coefficient.
41+
- ts: An array containing coefficients for the temperature scaling factor.
42+
Used as : tsf = ts[3]*T^3 + ts[2]*T^2 + ts[1]*T + ts[0], where T = temperature
43+
- thermal-zone: A string identifying the thermal zone used for the dmc
3144

3245
Example:
3346

@@ -90,5 +103,12 @@ Example:
90103
center-supply = <&ppvar_centerlogic>;
91104
upthreshold = <15>;
92105
downdifferential = <10>;
106+
#cooling-cells = <2>;
107+
ddr_power_model: ddr_power_model {
108+
dynamic-power-coefficient = <120>;
109+
static-power-coefficient = <300>;
110+
ts = <32000 4700 (-80) 2>;
111+
thermal-zone = "soc-thermal";
112+
}
93113
status = "disabled";
94114
};

‎Documentation/devicetree/bindings/display/bridge/adi,adv7125.txt‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
Analog Device ADV7125 RGB to VGA DAC bridge
2+
-------------------------------
3+
4+
The ADV7125 is a digital-to-analog converter that outputs VGA signals from a
5+
RGB input.
6+
7+
Required properties:
8+
9+
- compatible: Should be "adi,adv7125"
10+
11+
Optional properties:
12+
13+
- psave-gpios: Power save control GPIO
14+
15+
Required nodes:
16+
17+
The ADV7125 has two video ports. Their connections are modeled using the OF
18+
graph bindings specified in Documentation/devicetree/bindings/graph.txt.
19+
20+
- Video port 0 for RGB input
21+
- Video port 1 for VGA output
22+
23+
24+
Example
25+
-------
26+
27+
adv7125: encoder@0 {
28+
compatible = "adi,adv7125";
29+
#address-cells = <1>;
30+
#size-cells = <0>;
31+
32+
ports {
33+
port@0 {
34+
reg = <0>;
35+
36+
adv7125_in: endpoint@0 {
37+
remote-endpoint = <&rgb_out>;
38+
};
39+
};
40+
41+
port@1 {
42+
reg = <1>;
43+
44+
adv7125_out: endpoint@0 {
45+
remote-endpoint = <&vga_connector_in>;
46+
};
47+
};
48+
};
49+
};

‎Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
Dumb RGB to VGA DAC bridge
2+
---------------------------
3+
4+
This binding is aimed for dumb RGB to VGA DAC based bridges that do not require
5+
any configuration.
6+
7+
Required properties:
8+
9+
- compatible: Must be "dumb-vga-dac"
10+
11+
Required nodes:
12+
13+
This device has two video ports. Their connections are modelled using the OF
14+
graph bindings specified in Documentation/devicetree/bindings/graph.txt.
15+
16+
- Video port 0 for RGB input
17+
- Video port 1 for VGA output
18+
19+
Optional properties:
20+
- vdd-supply: Power supply for DAC
21+
22+
Example
23+
-------
24+
25+
bridge {
26+
compatible = "dumb-vga-dac";
27+
#address-cells = <1>;
28+
#size-cells = <0>;
29+
30+
ports {
31+
#address-cells = <1>;
32+
#size-cells = <0>;
33+
34+
port@0 {
35+
reg = <0>;
36+
37+
vga_bridge_in: endpoint {
38+
remote-endpoint = <&tcon0_out_vga>;
39+
};
40+
};
41+
42+
port@1 {
43+
reg = <1>;
44+
45+
vga_bridge_out: endpoint {
46+
remote-endpoint = <&vga_con_in>;
47+
};
48+
};
49+
};
50+
};

‎Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Optional properties
2525
- ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing
2626
- clocks, clock-names: phandle to the HDMI CEC clock, name should be "cec"
2727
- hdcp1x-enable: enable hdcp1.x, enable if defined, disable if not defined
28+
- scramble-low-rates: if defined enable scarmble when tmdsclk less than 340Mhz
2829

2930
Example:
3031
hdmi: hdmi@0120000 {

‎Documentation/devicetree/bindings/display/panel/boe,mv270qum-n10.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Boe Corporation 27" UHD TFT LCD panel
2+
3+
It has been designed to apply eDP(HBR2, 5.4Gbps) interface.
4+
5+
Required properties:
6+
- compatible: should be "boe,mv270qum-n10"
7+
8+
This binding is compatible with the simple-panel binding, which is specified
9+
in simple-panel.txt in this directory.

0 commit comments

Comments
 (0)