From 16f0518f47fade2b0abb27bf57f138ae93dae633 Mon Sep 17 00:00:00 2001 From: hmz007 Date: Thu, 22 May 2025 10:59:58 +0800 Subject: [PATCH] [kernel] merge commit 'b82a697bd7..0e5f3111c7' Signed-off-by: hmz007 --- .../arch/arm64/boot/dts/rockchip/rk3576-nanopi5-common.dtsi | 1 + .../arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev01.dts | 6 +++--- .../arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev02.dts | 6 +++--- .../arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev08.dts | 6 +++--- .../arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev09.dts | 6 +++--- .../arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev0a.dts | 4 ++-- kernel-6.1/arch/arm64/configs/nanopi5_android_defconfig | 1 + 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3576-nanopi5-common.dtsi b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3576-nanopi5-common.dtsi index 56f118bc683..b0bb6d57630 100644 --- a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3576-nanopi5-common.dtsi +++ b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3576-nanopi5-common.dtsi @@ -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; diff --git a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev01.dts b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev01.dts index 99e1a0df487..82fb22ad29e 100644 --- a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev01.dts +++ b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev01.dts @@ -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,primary-plane = ; }; &vp1 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER2 | 1 << ROCKCHIP_VOP2_ESMART1 | 1 << ROCKCHIP_VOP2_ESMART2)>; - rockchip,primary-plane = ; + rockchip,primary-plane = ; }; &vp2 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER3 | 1 << ROCKCHIP_VOP2_ESMART3)>; - rockchip,primary-plane = ; + rockchip,primary-plane = ; }; &vp3 { diff --git a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev02.dts b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev02.dts index 2b46498b801..9888130a3c1 100644 --- a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev02.dts +++ b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev02.dts @@ -191,18 +191,18 @@ &vp0 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 | 1 << ROCKCHIP_VOP2_CLUSTER1)>; - rockchip,primary-plane = ; + rockchip,primary-plane = ; }; &vp1 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER2 | 1 << ROCKCHIP_VOP2_ESMART1 | 1 << ROCKCHIP_VOP2_ESMART2)>; - rockchip,primary-plane = ; + rockchip,primary-plane = ; }; &vp2 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER3 | 1 << ROCKCHIP_VOP2_ESMART3)>; - rockchip,primary-plane = ; + rockchip,primary-plane = ; }; &vp3 { diff --git a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev08.dts b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev08.dts index 6381e979ea8..843016a61ac 100644 --- a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev08.dts +++ b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev08.dts @@ -724,17 +724,17 @@ &vp0 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0)>; - rockchip,primary-plane = ; + rockchip,primary-plane = ; }; &vp1 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER1 | 1 << ROCKCHIP_VOP2_ESMART1)>; - rockchip,primary-plane = ; + rockchip,primary-plane = ; }; &vp2 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER2 | 1 << ROCKCHIP_VOP2_ESMART2)>; - rockchip,primary-plane = ; + rockchip,primary-plane = ; }; &vp3 { diff --git a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev09.dts b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev09.dts index a6796be7661..2bbf160669a 100644 --- a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev09.dts +++ b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev09.dts @@ -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,primary-plane = ; }; &vp1 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER2 | 1 << ROCKCHIP_VOP2_ESMART1 | 1 << ROCKCHIP_VOP2_ESMART2)>; - rockchip,primary-plane = ; + rockchip,primary-plane = ; }; &vp2 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER3 | 1 << ROCKCHIP_VOP2_ESMART3)>; - rockchip,primary-plane = ; + rockchip,primary-plane = ; }; &vp3 { diff --git a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev0a.dts b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev0a.dts index 44544dc1bc9..cf976503199 100644 --- a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev0a.dts +++ b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev0a.dts @@ -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,primary-plane = ; }; &vp1 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER2 | 1 << ROCKCHIP_VOP2_ESMART1 | 1 << ROCKCHIP_VOP2_ESMART2)>; - rockchip,primary-plane = ; + rockchip,primary-plane = ; }; &vp2 { diff --git a/kernel-6.1/arch/arm64/configs/nanopi5_android_defconfig b/kernel-6.1/arch/arm64/configs/nanopi5_android_defconfig index 1232c39b010..5a699933f8d 100644 --- a/kernel-6.1/arch/arm64/configs/nanopi5_android_defconfig +++ b/kernel-6.1/arch/arm64/configs/nanopi5_android_defconfig @@ -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