From ea5bfeff0abd72a5232ce3460820643f7d1c6e0e Mon Sep 17 00:00:00 2001 From: Oleg Date: Wed, 12 Jan 2022 10:07:54 +0300 Subject: [PATCH] fix kernel media-edge (#3396) --- config/sources/families/media.conf | 3 +- ...0-v99-rk356x.patch => 00-v90-rk356x.patch} | 0 .../kernel/media-edge/00-v91-rk356x-vpu.patch | 32 +++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) rename patch/kernel/media-edge/{00-v99-rk356x.patch => 00-v90-rk356x.patch} (100%) create mode 100644 patch/kernel/media-edge/00-v91-rk356x-vpu.patch diff --git a/config/sources/families/media.conf b/config/sources/families/media.conf index 9838698b1a..90897a5ca1 100644 --- a/config/sources/families/media.conf +++ b/config/sources/families/media.conf @@ -36,8 +36,7 @@ case $BRANCH in edge) SKIP_BOOTSPLASH="yes" - KERNELSOURCE='https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git' - KERNELBRANCH='tag:v5.16-rc8' + KERNELBRANCH="branch:linux-5.16.y" KERNELPATCHDIR='media-'$BRANCH LINUXFAMILY=media LINUXCONFIG='linux-media-'$BRANCH diff --git a/patch/kernel/media-edge/00-v99-rk356x.patch b/patch/kernel/media-edge/00-v90-rk356x.patch similarity index 100% rename from patch/kernel/media-edge/00-v99-rk356x.patch rename to patch/kernel/media-edge/00-v90-rk356x.patch diff --git a/patch/kernel/media-edge/00-v91-rk356x-vpu.patch b/patch/kernel/media-edge/00-v91-rk356x-vpu.patch new file mode 100644 index 0000000000..491f196ab9 --- /dev/null +++ b/patch/kernel/media-edge/00-v91-rk356x-vpu.patch @@ -0,0 +1,32 @@ +--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi +@@ -617,6 +617,28 @@ + #cooling-cells = <2>; + power-domains = <&power RK3568_PD_GPU>; + status = "disabled"; ++ }; ++ ++ vpu: video-codec@fdea0400 { ++ compatible = "rockchip,rk3328-vpu"; ++ reg = <0x0 0xfdea0000 0x0 0x800>; ++ interrupts = ; ++ interrupt-names = "vdpu"; ++ clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; ++ clock-names = "aclk", "hclk"; ++ iommus = <&vdpu_mmu>; ++ power-domains = <&power RK3568_PD_VPU>; ++ }; ++ ++ vdpu_mmu: iommu@fdea0800 { ++ compatible = "rockchip,rk3568-iommu"; ++ reg = <0x0 0xfdea0800 0x0 0x40>; ++ interrupts = ; ++ interrupt-names = "vdpu_mmu"; ++ clock-names = "aclk", "iface"; ++ clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; ++ power-domains = <&power RK3568_PD_VPU>; ++ #iommu-cells = <0>; + }; + + sdmmc2: mmc@fe000000 { +