Skip to content

Commit c1ea5ca

Browse files
committed
Merge commit 99c02a0 ("media: rockchip: hdmirx: use devm_request_irq() and remove invalid IRQF_ONESHOT")
Change-Id: Ie936f5f0e6863f84325b4524c0fcceb4c99583e4
2 parents afe586a + 99c02a0 commit c1ea5ca

File tree

366 files changed

+63617
-6007
lines changed

Some content is hidden

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

366 files changed

+63617
-6007
lines changed

Documentation/devicetree/bindings/display/bridge/chipone,icn6211.txt

Lines changed: 0 additions & 49 deletions
This file was deleted.

Documentation/devicetree/bindings/display/bridge/lontium,lt8912.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
ROHM BU18TL82/BU18RL82 Clockless Link-BD Serializer/Deserializer bridge bindings
2+
3+
Required properties:
4+
- compatible: "rohm,bu18tl82" or "rohm,bu18rl82"
5+
- reg: i2c address of the bridge
6+
- serdes-init-sequence: register initial code from Rohm vendor
7+
8+
optional properties:
9+
- reset-gpios: a GPIO spec for the reset pin
10+
- enable-gpios: a GPIO spec for the enable pin
11+
- power-supply: Reference to the regulator powering the serdes power supply pins
12+
- sel-mipi: string property for mipi dsi data stream input
13+
14+
Example:
15+
16+
/ {
17+
panel {
18+
compatible = "simple-panel";
19+
backlight = <&backlight>;
20+
21+
display-timings {
22+
native-mode = <&timing0>;
23+
timing0: timing0 {
24+
clock-frequency = <87000000>;
25+
hactive = <1920>;
26+
vactive = <720>;
27+
hfront-porch = <32>;
28+
hsync-len = <10>;
29+
hback-porch = <22>;
30+
vfront-porch = <10>;
31+
vsync-len = <4>;
32+
vback-porch = <7>;
33+
hsync-active = <0>;
34+
vsync-active = <0>;
35+
de-active = <0>;
36+
pixelclk-active = <0>;
37+
};
38+
};
39+
40+
ports {
41+
#address-cells = <1>;
42+
#size-cells = <0>;
43+
44+
port@0 {
45+
reg = <0>;
46+
panel0_in_i2c2_bu18rl82: endpoint {
47+
remote-endpoint = <&i2c2_bu18rl82_out_panel0>;
48+
};
49+
};
50+
};
51+
};
52+
};
53+
54+
&dsi {
55+
status = "okay";
56+
57+
ports {
58+
#address-cells = <1>;
59+
#size-cells = <0>;
60+
61+
port@1 {
62+
reg = <1>;
63+
64+
dsi0_out_i2c2_bu18tl82: endpoint {
65+
remote-endpoint = <&i2c2_bu18tl82_in_dsi0>;
66+
};
67+
};
68+
};
69+
};
70+
71+
&i2c2 {
72+
status = "okay";
73+
74+
bu18tl82: bu18tl82@10 {
75+
compatible = "rohm,bu18tl82";
76+
reg = <0x10>;
77+
pinctrl-names = "default";
78+
pinctrl-0 = <&ser0_rst_gpio>;
79+
reset-gpios = <&gpio1 RK_PA4 GPIO_ACTIVE_LOW>;
80+
sel-mipi;
81+
status = "okay";
82+
83+
serdes-init-sequence = [
84+
/* TL82 Pattern Gen Set 1
85+
* Horizontal Gray Scale 256 steps
86+
*/
87+
040A 0010
88+
040B 0080
89+
040C 0080
90+
040D 0080
91+
0444 0019
92+
0445 0020
93+
0446 001f
94+
95+
...
96+
];
97+
98+
ports {
99+
#address-cells = <1>;
100+
#size-cells = <0>;
101+
102+
port@0 {
103+
reg = <0>;
104+
105+
i2c2_bu18tl82_in_dsi0: endpoint {
106+
remote-endpoint = <&dsi0_out_i2c2_bu18tl82>;
107+
};
108+
};
109+
110+
port@1 {
111+
reg = <1>;
112+
113+
i2c2_bu18tl82_out_i2c2_bu18rl82: endpoint {
114+
remote-endpoint = <&i2c2_bu18rl82_in_i2c2_bu18tl82>;
115+
};
116+
};
117+
};
118+
};
119+
120+
bu18rl82: bu18rl82@30 {
121+
compatible = "rohm,bu18rl82";
122+
reg = <0x30>;
123+
status = "okay";
124+
serdes-init-sequence = [
125+
/* RL82 Pattern Gen Set
126+
* Vertical Gray Scale Color Bar
127+
*/
128+
060A 00B0
129+
060B 00FF
130+
060C 00FF
131+
060D 00FF
132+
0644 0019
133+
0645 0020
134+
0646 001f
135+
...
136+
];
137+
138+
ports {
139+
#address-cells = <1>;
140+
#size-cells = <0>;
141+
142+
port@0 {
143+
reg = <0>;
144+
145+
i2c2_bu18rl82_in_i2c2_bu18tl82: endpoint {
146+
remote-endpoint = <&i2c2_bu18tl82_out_i2c2_bu18rl82>;
147+
};
148+
};
149+
150+
port@1 {
151+
reg = <1>;
152+
153+
i2c2_bu18rl82_out_panel0: endpoint {
154+
remote-endpoint = <&panel0_in_i2c2_bu18rl82>;
155+
};
156+
};
157+
};
158+
};
159+
};

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ Required properties:
1717
- #mbox-cells: Common mailbox binding property to identify the number
1818
of cells required for the mailbox specifier. Should be 1
1919

20+
Optional properties :
21+
22+
- wakeup-source: Mailbox irq can be used as a wakeup source.
23+
2024
Example:
2125
--------
2226

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
* AW36518 flash driver support
2+
3+
Required Properties:
4+
- compatible: Must contain "awinic,aw36518"
5+
- reg: I2C slave address
6+
- enable-gpios: Specifier of the GPIO connected to strobe/torch EN pin
7+
this pin is for hardware flash/torch mode, if not, will using i2c control.
8+
- tx-gpio: Specifier of the GPIO connected to TX pin
9+
this pin is synchronization input for RF power Amplifier Pulse Eventr;
10+
if not, will using assist mode.
11+
12+
A discrete LED element connected to the device must be represented by a child
13+
node - see Documentation/devicetree/bindings/leds/common.txt.
14+
15+
Required properties of the LED child node:
16+
- led-max-microamp : see Documentation/devicetree/bindings/leds/common.txt
17+
- flash-max-microamp : see Documentation/devicetree/bindings/leds/common.txt
18+
- flash-max-timeout-us : see Documentation/devicetree/bindings/leds/common.txt
19+
20+
Special properties:
21+
- rockchip,camera-module-index : indicate which camera the flash belongs to.
22+
- rockchip,camera-module-facing : indicate the camera facing.
23+
24+
Example:
25+
26+
&i2c1 {
27+
...
28+
aw36518: aw36518@63 {
29+
#address-cells = <1>;
30+
#size-cells = <0>;
31+
compatible = "awinic,aw36518";
32+
status = "okay";
33+
reg = <0x63>;
34+
rockchip,camera-module-index = <0>;
35+
rockchip,camera-module-facing = "back";
36+
enable-gpio = <&gpio3 RK_PC3 GPIO_ACTIVE_HIGH>;
37+
tx-gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_HIGH>;
38+
aw36518_led0: led@0 {
39+
reg = <0x0>;
40+
led-max-microamp = <386000>;
41+
flash-max-microamp = <1500000>;
42+
flash-max-timeout-us = <1600000>;
43+
};
44+
};
45+
...
46+
ov13850: ov13850@10 {
47+
...
48+
flash-leds = <&aw36518_led0>;
49+
...
50+
};
51+
...
52+
}
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
* CN3927V vcm driver support
2+
3+
Required Properties:
4+
- compatible: Must contain "chipnext,cn3927v"
5+
- reg: I2C slave address
6+
7+
Common Optional Properties:
8+
- rockchip,vcm-max-current: max output current, default 120, unit: mA.
9+
- rockchip,vcm-start-current: starting current.
10+
- rockchip,vcm-rated-current: rate current.
11+
12+
Normal Mode Optional Properties:
13+
- rockchip,vcm-step-mode: S[3:2]: Codes per step, S[1:0]: Step period, default 0xd.
14+
- rockchip,vcm-edlc-enable: Enhanced Dual Level Control Mode enable, default 0.
15+
- rockchip,vcm-dlc-enable: Dual level control enable, default 0.
16+
- rockchip,vcm-mclk: MCLK[1:0], default 0.
17+
- rockchip,vcm-t-src: T_SRC[4:0], default 0.
18+
19+
Advanced Mode Optional Properties:
20+
- rockchip,vcm-adcanced-mode: Enable Advanced mode, 0: Normal mode; 1: Advanced mode.
21+
- rockchip,vcm-sac-mode: SAC_MODE[3:0]: 0x0~0xe, other reserved.
22+
- rockchip,vcm-sac-time: SACT[6:0]: SAC time selection.
23+
- rockchip,vcm-prescl: PRESC[1:0]: Prescaler (SAC Period Divider).
24+
: SAC setting time = tVIB = (3.81ms+(SACT [6:0]) x 0.03ms)) x (PRESC[1:0]).
25+
26+
NRC(Noise Reduction Control) mode Properties:
27+
Current not used, for future use
28+
- rockchip,vcm-nrc-en: NRC EN: 0:Direct mode, 1:NRC mode.
29+
- rockchip,vcm-nrc-mode: NRC_MODE: 0: NRC start, 1: NRC landing.
30+
- rockchip,vcm-nrc-preset: PRESET[7:0]: NRC Current Setting.
31+
- rockchip,vcm-nrc-infl: NRC_INF[1:0]: NRC inflection point.
32+
- rockchip,vcm-nrc-time: NRC Operation Time: 0: 32ms, 1: 64ms.
33+
34+
Required Special properties:
35+
- rockchip,camera-module-index : indicate which camera the vcm belongs to.
36+
- rockchip,camera-module-facing : indicate the camera facing.
37+
38+
Example:
39+
40+
&i2c1 {
41+
...
42+
cn3927v: cn3927v@c {
43+
compatible = "chipnext,cn3927v";
44+
status = "okay";
45+
reg = <0x0c>;
46+
rockchip,vcm-max-current = <120>;
47+
rockchip,vcm-start-current = <30>;
48+
rockchip,vcm-rated-current = <80>;
49+
rockchip,vcm-step-mode = <0x8>;
50+
rockchip,vcm-edlc-enable = <0>;
51+
rockchip,vcm-dlc-enable = <0>;
52+
rockchip,vcm-mclk = <1>;
53+
rockchip,vcm-t-src = <0>;
54+
rockchip,vcm-adcanced-mode = <1>;
55+
rockchip,vcm-sac-mode = <0x03>;
56+
rockchip,vcm-sac-time = <0x28>;
57+
rockchip,vcm-prescl = <0x02>;
58+
rockchip,vcm-nrc-en = <0>;
59+
rockchip,vcm-nrc-mode = <1>;
60+
rockchip,vcm-nrc-preset = <0x11110000>;
61+
rockchip,vcm-nrc-infl = <0x01>;
62+
rockchip,vcm-nrc-time = <0>;
63+
rockchip,camera-module-index = <0>;
64+
rockchip,camera-module-facing = "back";
65+
};
66+
67+
...
68+
s5kjn1: s5kjn1@10 {
69+
...
70+
lens-focus = <&cn3927v>;
71+
...
72+
};
73+
...
74+
}

0 commit comments

Comments
 (0)