Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rock5 mainline hs400 mode fix #7921

Merged
merged 4 commits into from
Mar 9, 2025
+69 −17
Merged

Rock5 mainline hs400 mode fix #7921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b109b3
rockchip64-6.12: slow down emmc freq instead of toggling to HS200 for…
amazingfate Mar 7, 2025
ad2748f
rockchip64-6.14: slow down emmc freq instead of toggling to HS200 for…
amazingfate Mar 7, 2025
b77fc33
rockchip64-6.12: rock-5-itx: slow down emmc freq
amazingfate Mar 7, 2025
7407ce0
rockchip64-6.14: rock-5-itx: slow down emmc freq
amazingfate Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions ...ve/rockchip64-6.12/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: amazingfate <[email protected]>
Date: Wed, 27 Dec 2023 15:03:57 +0800
Subject: arm64: dts: rock-5b: Slow down emmc to hs200 and add tsadc node
Subject: arm64: dts: rock-5b: Slow down emmc freq and add tsadc node

---
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -408,8 +408,7 @@ &sdhci {
@@ -408,6 +408,7 @@ &sdhci {
no-sdio;
no-sd;
non-removable;
- mmc-hs400-1_8v;
- mmc-hs400-enhanced-strobe;
+ mmc-hs200-1_8v;
+ max-frequency = <150000000>;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
status = "okay";
};

@@ -463,6 +462,10 @@ flash@0 {
@@ -463,6 +464,10 @@ flash@0 {
};
};

Expand Down
28 changes: 28 additions & 0 deletions ...ve/rockchip64-6.12/rk3588-1013-arm64-dts-rockchip-disable-emmc-hs400-for-rock-5-itx.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jianfeng Liu <[email protected]>
Date: Fri, 28 Feb 2025 22:04:34 +0800
Subject: arm64: dts: rockchip: slow down emmc freq for rock 5 itx

---
arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
@@ -656,10 +656,9 @@ &saradc {

&sdhci {
bus-width = <8>;
- max-frequency = <200000000>;
+ max-frequency = <150000000>;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
- mmc-hs200-1_8v;
no-sdio;
no-sd;
non-removable;
--
Armbian

12 changes: 5 additions & 7 deletions ...ve/rockchip64-6.14/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: amazingfate <[email protected]>
Date: Wed, 27 Dec 2023 15:03:57 +0800
Subject: arm64: dts: rock-5b: Slow down emmc to hs200 and add tsadc node
Subject: arm64: dts: rock-5b: Slow down emmc freq and add tsadc node

---
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 7 +++++--
Expand All @@ -11,16 +11,14 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/d
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -440,8 +440,7 @@ &sdhci {
@@ -440,6 +440,7 @@ &sdhci {
no-sdio;
no-sd;
non-removable;
- mmc-hs400-1_8v;
- mmc-hs400-enhanced-strobe;
+ mmc-hs200-1_8v;
+ max-frequency = <150000000>;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
status = "okay";
};

@@ -495,6 +494,10 @@ flash@0 {
};
};
Expand Down
28 changes: 28 additions & 0 deletions ...ve/rockchip64-6.14/rk3588-1013-arm64-dts-rockchip-disable-emmc-hs400-for-rock-5-itx.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jianfeng Liu <[email protected]>
Date: Fri, 28 Feb 2025 22:04:34 +0800
Subject: arm64: dts: rockchip: slow down emmc freq for rock 5 itx

---
arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
@@ -656,10 +656,9 @@ &saradc {

&sdhci {
bus-width = <8>;
- max-frequency = <200000000>;
+ max-frequency = <150000000>;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
- mmc-hs200-1_8v;
no-sdio;
no-sd;
non-removable;
--
Armbian

Loading