linux (Rockchip): rebase patches for 6.13

dad35f7d2f
This commit is contained in:
Rudi Heitbaum 2025-01-26 17:04:48 +00:00
parent 848c5b5024
commit 31d81ae01a
2 changed files with 9 additions and 9 deletions

View File

@ -289,7 +289,7 @@ index eaf2f133a264..f55abb7c377f 100644
} }
+ +
+ rkvdec->rstc = devm_reset_control_array_get(&pdev->dev, false, true); + rkvdec->rstc = devm_reset_control_array_get(&pdev->dev, RESET_CONTROL_OPTIONAL_EXCLUSIVE);
+ if (IS_ERR(rkvdec->rstc)) { + if (IS_ERR(rkvdec->rstc)) {
+ dev_err(&pdev->dev, + dev_err(&pdev->dev,
+ "get resets failed %ld\n", PTR_ERR(rkvdec->rstc)); + "get resets failed %ld\n", PTR_ERR(rkvdec->rstc));

View File

@ -11,15 +11,15 @@ is running at the same time (voltage to high)
Signed-off-by: Alex Bee <knaerzche@gmail.com> Signed-off-by: Alex Bee <knaerzche@gmail.com>
--- ---
.../arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 4 +++ .../arm64/boot/dts/rockchip/rk3328-roc.dtsi | 4 +++
.../arm64/boot/dts/rockchip/rk3328-rock64.dts | 4 +++ .../arm64/boot/dts/rockchip/rk3328-rock64.dts | 4 +++
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 35 +++++++++++++++++++ arch/arm64/boot/dts/rockchip/rk3328.dtsi | 35 +++++++++++++++++++
3 files changed, 43 insertions(+) 3 files changed, 43 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
index aa22a0c22265..51c7723d6762 100644 index aa22a0c22265..51c7723d6762 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts --- a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
@@ -166,6 +166,10 @@ &gmac2io { @@ -166,6 +166,10 @@ &gmac2io {
status = "okay"; status = "okay";
}; };
@ -254,13 +254,13 @@ Subject: [PATCH] arm64: dts: rockchip: Add ir-receiver node for RK3328 ROC CC
Signed-off-by: Alex Bee <knaerzche@gmail.com> Signed-off-by: Alex Bee <knaerzche@gmail.com>
--- ---
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 14 ++++++++++++++ arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi | 14 ++++++++++++++
1 file changed, 14 insertions(+) 1 file changed, 14 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
index 51c7723d6762..cf321302daec 100644 index 51c7723d6762..cf321302daec 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts --- a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
@@ -88,6 +88,13 @@ vcc_phy: vcc-phy-regulator { @@ -88,6 +88,13 @@ vcc_phy: vcc-phy-regulator {
regulator-boot-on; regulator-boot-on;
}; };