Skip to content

Commit 9693a61

Browse files
jamess-huangjamess-huang
committed
Merge remote-tracking branch 'rockchip/release-4.4' into sbc/tinkerboard/arks/Debian-9.0 branch
Change-Id: Id5e7650e8e621e8f4f1a8e714a3899c38219ac4b
2 parents 7a85065 + b075e3b commit 9693a61

2,249 files changed

Lines changed: 402942 additions & 24560 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.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ Module.symvers
4242
#
4343
# Top-level generic files
4444
#
45+
/boot.img
4546
/kernel.img
4647
/resource.img
4748
/tags

‎.mailmap‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Adrian Bunk <bunk@stusta.de>
1414
Alan Cox <alan@lxorguk.ukuu.org.uk>
1515
Alan Cox <root@hraefn.swansea.linux.org.uk>
1616
Aleksey Gorelov <aleksey_gorelov@phoenix.com>
17+
Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
1718
Al Viro <viro@ftp.linux.org.uk>
1819
Al Viro <viro@zenIV.linux.org.uk>
1920
Andreas Herrmann <aherrman@de.ibm.com>
@@ -85,6 +86,7 @@ Matthieu CASTET <castet.matthieu@free.fr>
8586
Mayuresh Janorkar <mayur@ti.com>
8687
Michael Buesch <m@bues.ch>
8788
Michel Dänzer <michel@tungstengraphics.com>
89+
Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>
8890
Mitesh shah <mshah@teja.com>
8991
Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
9092
Morten Welinder <terra@gnome.org>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,3 +186,9 @@ Date: August 2017
186186
Contact: "Jaegeuk Kim" <jaegeuk@kernel.org>
187187
Description:
188188
Controls sleep time of GC urgent mode
189+
190+
What: /sys/fs/f2fs/<disk>/readdir_ra
191+
Date: November 2017
192+
Contact: "Sheng Yong" <shengyong1@huawei.com>
193+
Description:
194+
Controls readahead inode block in readdir.

‎Documentation/devicetree/bindings/arm/mali-bifrost.txt‎

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
#
2+
# (C) COPYRIGHT 2013-2018 ARM Limited. All rights reserved.
3+
#
4+
# This program is free software and is provided to you under the terms of the
5+
# GNU General Public License version 2 as published by the Free Software
6+
# Foundation, and any use by you of this program is subject to the terms
7+
# of such GNU licence.
8+
#
9+
# This program is distributed in the hope that it will be useful,
10+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
# GNU General Public License for more details.
13+
#
14+
# You should have received a copy of the GNU General Public License
15+
# along with this program; if not, you can access it online at
16+
# http://www.gnu.org/licenses/gpl-2.0.html.
17+
#
18+
# SPDX-License-Identifier: GPL-2.0
19+
#
20+
#
21+
22+
* ARM Mali Midgard devices
23+
24+
25+
Required properties:
26+
27+
- compatible : Should be mali<chip>, replacing digits with x from the back,
28+
until malit<Major>xx, ending with arm,mali-midgard, the latter not optional.
29+
- reg : Physical base address of the device and length of the register area.
30+
- interrupts : Contains the three IRQ lines required by T-6xx devices
31+
- interrupt-names : Contains the names of IRQ resources in the order they were
32+
provided in the interrupts property. Must contain: "JOB, "MMU", "GPU".
33+
34+
Optional:
35+
36+
- clocks : Phandle to clock for the Mali T-6xx device.
37+
- clock-names : Shall be "clk_mali".
38+
- mali-supply : Phandle to regulator for the Mali device. Refer to
39+
Documentation/devicetree/bindings/regulator/regulator.txt for details.
40+
- operating-points-v2 : Refer to Documentation/devicetree/bindings/power/opp.txt
41+
for details.
42+
- jm_config : For T860/T880. Sets job manager configuration. An array containing:
43+
- 1 to override the TIMESTAMP value, 0 otherwise.
44+
- 1 to override clock gate, forcing them to be always on, 0 otherwise.
45+
- 1 to enable job throttle, limiting the number of cores that can be started
46+
simultaneously, 0 otherwise.
47+
- Value between 0 and 63 (including). If job throttle is enabled, this is one
48+
less than the number of cores that can be started simultaneously.
49+
- power_model : Sets the power model parameters. Three power models are currently
50+
defined which include "mali-simple-power-model", "mali-g71-power-model" and
51+
"mali-g72-power-model".
52+
- mali-simple-power-model: this model derives the GPU power usage based
53+
on the GPU voltage scaled by the system temperature. Note: it was
54+
designed for the Juno platform, and may not be suitable for others.
55+
- compatible: Should be "arm,mali-simple-power-model"
56+
- dynamic-coefficient: Coefficient, in pW/(Hz V^2), which is
57+
multiplied by v^2*f to calculate the dynamic power consumption.
58+
- static-coefficient: Coefficient, in uW/V^3, which is
59+
multiplied by v^3 to calculate the static power consumption.
60+
- ts: An array containing coefficients for the temperature
61+
scaling factor. This is used to scale the static power by a
62+
factor of tsf/1000000,
63+
where tsf = ts[3]*T^3 + ts[2]*T^2 + ts[1]*T + ts[0],
64+
and T = temperature in degrees.
65+
- thermal-zone: A string identifying the thermal zone used for
66+
the GPU
67+
- temp-poll-interval-ms: the interval at which the system
68+
temperature is polled
69+
- mali-g71-power-model / mali-g72-power-model: these models derive
70+
the GPU power usage based on performance counters, so they are more
71+
accurate.
72+
- compatible: Should be "arm,mali-g71-power-model" /
73+
"arm,mali-g72-power-model"
74+
- scale: the dynamic power calculated by the power model is
75+
scaled by a factor of "scale"/1000. This value should be
76+
chosen to match a particular implementation.
77+
* Note: when IPA is used, two separate power models (simple and counter-based)
78+
are used at different points so care should be taken to configure
79+
both power models in the device tree (specifically dynamic-coefficient,
80+
static-coefficient and scale) to best match the platform.
81+
- system-coherency : Sets the coherency protocol to be used for coherent
82+
accesses made from the GPU.
83+
If not set then no coherency is used.
84+
- 0 : ACE-Lite
85+
- 1 : ACE
86+
- 31 : No coherency
87+
- ipa-model : Sets the IPA model to be used for power management. GPU probe will fail if the
88+
model is not found in the registered models list. If no model is specified here,
89+
a gpu-id based model is picked if available, otherwise the default model is used.
90+
- mali-simple-power-model: Default model used on mali
91+
- protected-mode-switcher : Phandle to device implemented protected mode switching functionality.
92+
Refer to Documentation/devicetree/bindings/arm/smc-protected-mode-switcher.txt for one implementation.
93+
94+
Example for a Mali GPU:
95+
96+
gpu@0xfc010000 {
97+
compatible = "arm,malit602", "arm,malit60x", "arm,malit6xx", "arm,mali-midgard";
98+
reg = <0xfc010000 0x4000>;
99+
interrupts = <0 36 4>, <0 37 4>, <0 38 4>;
100+
interrupt-names = "JOB", "MMU", "GPU";
101+
102+
clocks = <&pclk_mali>;
103+
clock-names = "clk_mali";
104+
mali-supply = <&vdd_mali>;
105+
operating-points-v2 = <&gpu_opp_table>;
106+
power_model@0 {
107+
compatible = "arm,mali-simple-power-model";
108+
static-coefficient = <2427750>;
109+
dynamic-coefficient = <4687>;
110+
ts = <20000 2000 (-20) 2>;
111+
thermal-zone = "gpu";
112+
};
113+
power_model@1 {
114+
compatible = "arm,mali-g71-power-model";
115+
scale = <5>;
116+
};
117+
};
118+
119+
gpu_opp_table: opp_table0 {
120+
compatible = "operating-points-v2";
121+
122+
opp@533000000 {
123+
opp-hz = /bits/ 64 <533000000>;
124+
opp-microvolt = <1250000>;
125+
};
126+
opp@450000000 {
127+
opp-hz = /bits/ 64 <450000000>;
128+
opp-microvolt = <1150000>;
129+
};
130+
opp@400000000 {
131+
opp-hz = /bits/ 64 <400000000>;
132+
opp-microvolt = <1125000>;
133+
};
134+
opp@350000000 {
135+
opp-hz = /bits/ 64 <350000000>;
136+
opp-microvolt = <1075000>;
137+
};
138+
opp@266000000 {
139+
opp-hz = /bits/ 64 <266000000>;
140+
opp-microvolt = <1025000>;
141+
};
142+
opp@160000000 {
143+
opp-hz = /bits/ 64 <160000000>;
144+
opp-microvolt = <925000>;
145+
};
146+
opp@100000000 {
147+
opp-hz = /bits/ 64 <100000000>;
148+
opp-microvolt = <912500>;
149+
};
150+
};

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,11 @@ Rockchip platforms device tree bindings
130130
- Rockchip PX30 evb ddr4 board:
131131
Required root node properties:
132132
- compatible = "rockchip,px30-evb-ddr4-v10", "rockchip,px30";
133+
134+
- Rockchip android things full function board:
135+
Required root node properties:
136+
- compatible = "rockchip,rk3229-at-3nod", "rockchip,rk3229";
137+
138+
- Rockchip android things full function board:
139+
Required root node properties:
140+
- compatible = "rockchip,rk3229-at-3nod-func", "rockchip,rk3229";

‎Documentation/devicetree/bindings/clock/rockchip,rk3308.txt‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
* Rockchip RK3308 Clock and Reset Unit
2+
3+
The RK3308 clock controller generates and supplies clock to various
4+
controllers within the SoC and also implements a reset controller for SoC
5+
peripherals.
6+
7+
Required Properties:
8+
9+
- compatible: CRU should be "rockchip,rk3308-cru"
10+
- reg: physical base address of the controller and length of memory mapped
11+
region.
12+
- #clock-cells: should be 1.
13+
- #reset-cells: should be 1.
14+
15+
Optional Properties:
16+
17+
- rockchip,grf: phandle to the syscon managing the "general register files"
18+
If missing, pll rates are not changeable, due to the missing pll lock status.
19+
20+
Each clock is assigned an identifier and client nodes can use this identifier
21+
to specify the clock which they consume. All available clocks are defined as
22+
preprocessor macros in the dt-bindings/clock/rk3308-cru.h headers and can be
23+
used in device tree sources. Similar macros exist for the reset sources in
24+
these files.
25+
26+
External clocks:
27+
28+
There are several clocks that are generated outside the SoC. It is expected
29+
that they are defined using standard clock bindings with following
30+
clock-output-names:
31+
- "xin24m" - crystal input - required,
32+
- "xin32k" - rtc clock - optional,
33+
- "mclk_i2sx_xch_in" - external I2S or SPDIF clock - optional,
34+
- "mac_clkin" - external MAC clock - optional
35+
36+
Example: Clock controller node:
37+
38+
cru: clock-controller@ff500000 {
39+
compatible = "rockchip,rk3308-cru";
40+
reg = <0x0 0xff500000 0x0 0x1000>;
41+
rockchip,grf = <&grf>;
42+
#clock-cells = <1>;
43+
#reset-cells = <1>;
44+
};
45+
46+
Example: UART controller node that consumes the clock generated by the clock
47+
controller:
48+
49+
uart0: serial@ff0a0000 {
50+
compatible = "rockchip,rk3308-uart", "snps,dw-apb-uart";
51+
reg = <0x0 0xff0a0000 0x0 0x100>;
52+
interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
53+
clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
54+
clock-names = "baudclk", "apb_pclk";
55+
reg-shift = <2>;
56+
reg-io-width = <4>;
57+
status = "disabled";
58+
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Required properties:
66
- "rockchip,rk3128-dmc" - for RK3128 SoCs.
77
- "rockchip,rk3228-dmc" - for RK3228 SoCs.
88
- "rockchip,rk3288-dmc" - for RK3288 SoCs.
9+
- "rockchip,rk3308-dmc" - for RK3308 SoCs.
910
- "rockchip,rk3328-dmc" - for RK3328 SoCs.
1011
- "rockchip,rk3368-dmc" - for RK3368 SoCs.
1112
- "rockchip,rk3399-dmc" - for RK3399 SoCs.

‎Documentation/devicetree/bindings/display/bridge/dw-hdmi-hdcp2.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Device-Tree bindings for dw hdmi hdcp2
2+
3+
Required properties:
4+
- compatible : Should be "rockchip,rk3399-hdmi-hdcp2".
5+
6+
Example:
7+
hdmi_hdcp2: hdmi-hdcp2@ff988000 {
8+
compatible = "rockchip,rk3399-hdmi-hdcp2";
9+
reg = <0x0 0xff988000 0x0 0x2000>;
10+
interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH 0>;
11+
clocks = <&cru ACLK_HDCP22>, <&cru PCLK_HDCP22>,
12+
<&cru HCLK_HDCP22>;
13+
clock-names ="aclk_hdcp2", "pclk_hdcp2", "hdcp2_clk_hdmi";
14+
status = "disabled";
15+
};

‎Documentation/devicetree/bindings/display/google,goldfish-fb.txt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Android Goldfish framebuffer
2+
3+
Android Goldfish framebuffer device used by Android emulator.
4+
5+
Required properties:
6+
7+
- compatible : should contain "google,goldfish-fb"
8+
- reg : <registers mapping>
9+
- interrupts : <interrupt mapping>
10+
11+
Example:
12+
13+
display-controller@1f008000 {
14+
compatible = "google,goldfish-fb";
15+
interrupts = <0x10>;
16+
reg = <0x1f008000 0x100>;
17+
};

‎Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ Required properties:
2525

2626
- rockchip,grf: phandle to the general register files syscon
2727

28-
For px30 rgb output:
29-
- pinctrl-names: must contain a "m0" or "m1" entry.
30-
- pinctrl-0: pin control group to be used for this controller.
31-
3228
Required nodes:
3329

3430
The lvds has two video ports as described by
@@ -67,22 +63,6 @@ lvds_panel: lvds-panel {
6763
};
6864
};
6965

70-
For Rockchip PX30:
71-
72-
RGB Output Pinctrl Example:
73-
74-
&lvds {
75-
pinctrl-names = "m0";
76-
pinctrl-0 = <&lcdc_rgb_dclk_pin &lcdc_rgb_m0_den_pin &lcdc_rgb_m0_hsync_pin &lcdc_rgb_m0_vsync_pin &lcdc_rgb666_m0_data_pins>;
77-
};
78-
79-
Or
80-
81-
&lvds {
82-
pinctrl-names = "m1";
83-
pinctrl-0 = <&lcdc_rgb_dclk_pin &lcdc_rgb666_m1_data_pins>;
84-
};
85-
8666
For Rockchip RK3288:
8767

8868
lvds: lvds@ff96c000 {

0 commit comments

Comments
 (0)