enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add reset properties for rkvdec and iep nodes, minor fix to rkvdec

Browse Source
This commit is contained in:
Paolo Sabatino 2022-11-06 18:26:40 +00:00 committed by Paolo
parent c29e51c708
commit ae36e56171
5 changed files with 68 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
patch/kernel/archive/rk322x-5.15/012-linux-1000-rockchip-wip.patch
View File

@ -780,3 +780,32 @@ index 272ae5722..cec178404 100644
--
2.25.1
From 4dbf4c09e78cd79c61dd7ecf134829b3c8b4695b Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Sun, 6 Nov 2022 17:52:27 +0000
Subject: [PATCH] add reset properties
---
arch/arm/boot/dts/rk322x.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index c9d71a776587..0b6516c6a476 100644
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -783,6 +783,12 @@ vdec: video-codec@20030000 {
clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>,
<&cru SCLK_VDEC_CABAC>, <&cru SCLK_VDEC_CORE>;
clock-names = "axi", "ahb", "cabac", "core";
+ resets = <&cru SRST_RKVDEC_H>, <&cru SRST_RKVDEC_A>,
+ <&cru SRST_RKVDEC_CORE>, <&cru SRST_RKVDEC_CABAC>,
+ <&cru SRST_RKVDEC_NOC_A>, <&cru SRST_RKVDEC_NOC_H>;
+ reset-names = "video_h", "video_a",
+ "video_core", "video_cabac",
+ "niu_a", "niu_h";
assigned-clocks = <&cru SCLK_VDEC_CABAC>, <&cru SCLK_VDEC_CORE>;
assigned-clock-rates = <300000000>, <300000000>;
iommus = <&vdec_mmu>;
--
2.34.1

5
patch/kernel/archive/rk322x-5.15/02-linux-0006-add-iep-node-for-rk322x.patch
View File

@ -11,7 +11,7 @@ diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index 0ae753c1d..271e7835f 100644
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -834,6 +834,17 @@ rga: rga@20060000 {
@@ -834,6 +834,20 @@ rga: rga@20060000 {
reset-names = "core", "axi", "ahb";
};
@ -21,6 +21,9 @@ index 0ae753c1d..271e7835f 100644
+ interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;
+ clock-names = "axi", "ahb";
+ resets = <&cru SRST_IEP_A>,
+ <&cru SRST_IEP_H>;
+ reset-names = "axi", "ahb";
+ iommus = <&iep_mmu>;
+ power-domains = <&power RK3228_PD_VIO>;
+ status = "disabled";

4
patch/kernel/archive/rk322x-5.19/01-linux-2000-v4l2-wip-rkvdec-hevc.patch
View File

@ -2508,7 +2508,7 @@ index 000000000000..c3cceba837c2
+ writel_relaxed(refer_addr | reg,
+ rkvdec->regs + RKVDEC_REG_H264_BASE_REFER(i));
+
+ reg = RKVDEC_POC_REFER(i < sl_params->num_active_dpb_entries ? dpb[i].pic_order_cnt[0] : 0);
+ reg = RKVDEC_POC_REFER(i < sl_params->num_active_dpb_entries ? dpb[i].pic_order_cnt_val : 0);
+ writel_relaxed(reg,
+ rkvdec->regs + RKVDEC_REG_H264_POC_REFER0(i));
+ }
@ -2857,7 +2857,7 @@ index c3cceba837c2..5c341b5fa534 100644
writel_relaxed(refer_addr | reg,
rkvdec->regs + RKVDEC_REG_H264_BASE_REFER(i));
- reg = RKVDEC_POC_REFER(i < sl_params->num_active_dpb_entries ? dpb[i].pic_order_cnt[0] : 0);
- reg = RKVDEC_POC_REFER(i < sl_params->num_active_dpb_entries ? dpb[i].pic_order_cnt_val : 0);
+ reg = RKVDEC_POC_REFER(i < decode_params->num_active_dpb_entries ? dpb[i].pic_order_cnt_val : 0);
writel_relaxed(reg,
rkvdec->regs + RKVDEC_REG_H264_POC_REFER0(i));

29
patch/kernel/archive/rk322x-5.19/012-linux-1000-rockchip-wip.patch
View File

@ -780,3 +780,32 @@ index 272ae5722..cec178404 100644
--
2.25.1
From 4dbf4c09e78cd79c61dd7ecf134829b3c8b4695b Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Sun, 6 Nov 2022 17:52:27 +0000
Subject: [PATCH] add reset properties
---
arch/arm/boot/dts/rk322x.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index c9d71a776587..0b6516c6a476 100644
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -783,6 +783,12 @@ vdec: video-codec@20030000 {
clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>,
<&cru SCLK_VDEC_CABAC>, <&cru SCLK_VDEC_CORE>;
clock-names = "axi", "ahb", "cabac", "core";
+ resets = <&cru SRST_RKVDEC_H>, <&cru SRST_RKVDEC_A>,
+ <&cru SRST_RKVDEC_CORE>, <&cru SRST_RKVDEC_CABAC>,
+ <&cru SRST_RKVDEC_NOC_A>, <&cru SRST_RKVDEC_NOC_H>;
+ reset-names = "video_h", "video_a",
+ "video_core", "video_cabac",
+ "niu_a", "niu_h";
assigned-clocks = <&cru SCLK_VDEC_CABAC>, <&cru SCLK_VDEC_CORE>;
assigned-clock-rates = <300000000>, <300000000>;
iommus = <&vdec_mmu>;
--
2.34.1

5
patch/kernel/archive/rk322x-5.19/02-linux-0006-add-iep-node-for-rk322x.patch
View File

@ -11,7 +11,7 @@ diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index 0ae753c1d..271e7835f 100644
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -834,6 +834,17 @@ rga: rga@20060000 {
@@ -834,6 +834,20 @@ rga: rga@20060000 {
reset-names = "core", "axi", "ahb";
};
@ -21,6 +21,9 @@ index 0ae753c1d..271e7835f 100644
+ interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;
+ clock-names = "axi", "ahb";
+ resets = <&cru SRST_IEP_A>,
+ <&cru SRST_IEP_H>;
+ reset-names = "axi", "ahb";
+ iommus = <&iep_mmu>;
+ power-domains = <&power RK3228_PD_VIO>;
+ status = "disabled";