friendlyelec
/
rk35xx-android14
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[kernel] merge commit 'b82a697bd7..0e5f3111c7'

Browse Source 
Signed-off-by: hmz007 <hmz007@gmail.com>
master
hmz007 9 months ago
parent 60b0ed0740
commit 16f0518f47
7 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File

1
kernel-6.1/arch/arm64/boot/dts/rockchip/rk3576-nanopi5-common.dtsi
Unescape View File

@ -422,6 +422,7 @@
&hdmi {
status = "okay";
cec-enable;
enable-gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;
rockchip,sda-falling-delay-ns = <360>;
audio-no-capture;

6
kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev01.dts
Unescape View File

@ -700,18 +700,18 @@ dsi1_pwm: &pwm11 {
&vp0 {
rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 |
1 << ROCKCHIP_VOP2_CLUSTER1)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER0>;
rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART0>;
};
&vp1 {
rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER2 | 1 << ROCKCHIP_VOP2_ESMART1 |
1 << ROCKCHIP_VOP2_ESMART2)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER2>;
rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART1>;
};
&vp2 {
rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER3 | 1 << ROCKCHIP_VOP2_ESMART3)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER3>;
rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART3>;
};
&vp3 {

6
kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev02.dts
Unescape View File

@ -191,18 +191,18 @@
&vp0 {
rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 |
1 << ROCKCHIP_VOP2_CLUSTER1)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER0>;
rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART0>;
};
&vp1 {
rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER2 | 1 << ROCKCHIP_VOP2_ESMART1 |
1 << ROCKCHIP_VOP2_ESMART2)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER2>;
rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART1>;
};
&vp2 {
rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER3 | 1 << ROCKCHIP_VOP2_ESMART3)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER3>;
rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART3>;
};
&vp3 {

6
kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev08.dts
Unescape View File

@ -724,17 +724,17 @@
&vp0 {
rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER0>;
rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART0>;
};
&vp1 {
rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER1 | 1 << ROCKCHIP_VOP2_ESMART1)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER1>;
rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART1>;
};
&vp2 {
rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER2 | 1 << ROCKCHIP_VOP2_ESMART2)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER2>;
rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART2>;
};
&vp3 {

6
kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev09.dts
Unescape View File

@ -778,18 +778,18 @@ dsi0_pwm: &pwm2 {
&vp0 {
rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 |
1 << ROCKCHIP_VOP2_CLUSTER1)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER0>;
rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART0>;
};
&vp1 {
rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER2 | 1 << ROCKCHIP_VOP2_ESMART1 |
1 << ROCKCHIP_VOP2_ESMART2)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER2>;
rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART1>;
};
&vp2 {
rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER3 | 1 << ROCKCHIP_VOP2_ESMART3)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER3>;
rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART3>;
};
&vp3 {

4
kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev0a.dts
Unescape View File

@ -370,13 +370,13 @@ dsi1_pwm: &pwm11 {
&vp0 {
rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 |
1 << ROCKCHIP_VOP2_CLUSTER1)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER0>;
rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART0>;
};
&vp1 {
rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER2 | 1 << ROCKCHIP_VOP2_ESMART1 |
1 << ROCKCHIP_VOP2_ESMART2)>;
rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER2>;
rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART1>;
};
&vp2 {

1
kernel-6.1/arch/arm64/configs/nanopi5_android_defconfig
Unescape View File

@ -643,6 +643,7 @@ CONFIG_SND_SOC_RK3328=y
CONFIG_SND_SOC_RK3528=y
CONFIG_SND_SOC_RK_CODEC_DIGITAL=y
CONFIG_SND_SOC_RK_DSM=y
CONFIG_SND_SOC_RT5616=y
CONFIG_SND_SOC_SPDIF=y
CONFIG_SND_SIMPLE_CARD=y
CONFIG_HIDRAW=y

Write Preview
Loading…
Cancel
Save