1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
| # 修改HDMIRX-AUDIO使用的驱动并为设备HDMIRX添加预留内存
# 将下面补丁内容写入：/home/leux/rk3588-hinlink-hdmirx.patch
# 然后在 /home/leux/ 下执行：patch -p1 < rk3588-hinlink-hdmirx.patch
@@ -71,24 +71,16 @@
rockchip,jack-det;
};
- hdmiin_dc: hdmiin-dc {
- compatible = "rockchip,dummy-codec";
- #sound-dai-cells = <0>;
- };
-
hdmiin-sound {
- compatible = "simple-audio-card";
- simple-audio-card,format = "i2s";
- simple-audio-card,name = "rockchip,hdmiin";
- simple-audio-card,bitclock-master = <&dailink0_master>;
- simple-audio-card,frame-master = <&dailink0_master>;
-
- simple-audio-card,cpu {
- sound-dai = <&i2s7_8ch>;
- };
- dailink0_master: simple-audio-card,codec {
- sound-dai = <&hdmiin_dc>;
- };
+ compatible = "rockchip,hdmi";
+ rockchip,mclk-fs = <128>;
+ rockchip,format = "i2s";
+ rockchip,bitclock-master = <&hdmirx_ctrler>;
+ rockchip,frame-master = <&hdmirx_ctrler>;
+ rockchip,card-name = "rockchip,hdmiin";
+ rockchip,cpu = <&i2s7_8ch>;
+ rockchip,codec = <&hdmirx_ctrler 0>;
+ rockchip,jack-det;
};
ir-receiver {
@@ -182,6 +174,19 @@
vin-supply = <&avcc_1v8_s0>;
};
+ reserved-memory {
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+
+ cma {
+ compatible = "shared-dma-pool";
+ reusable;
+ reg = <0x0 (256 * 0x100000) 0x0 (256 * 0x100000)>;
+ linux,cma-default;
+ };
+ };
+
rk_headset: rk-headset {
compatible = "rockchip_headset";
headset_gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
@@ -405,6 +410,7 @@
&hdmirx_ctrler {
status = "okay";
+ #sound-dai-cells = <1>;
/* Effective level used to trigger HPD: 0-low, 1-high */
hpd-trigger-level = <1>;
hdmirx-det-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
|