JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

rockchip-rk3588/edge: bump to 6.3, drop 6.2 patches

Browse Source
This commit is contained in:
Ricardo Pardini
2023-04-28 12:35:16 +02:00
committed by igorpecovnik
parent 324953f5d7
commit 506189dd8b
4 changed files with 2 additions and 6309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/sources/families/rockchip-rk3588.conf
View File

@@ -32,8 +32,8 @@ case $BRANCH in
SKIP_BOOTSPLASH="yes"
LINUXFAMILY=rockchip-rk3588
LINUXCONFIG='linux-rockchip-rk3588-'$BRANCH
KERNEL_MAJOR_MINOR="6.2" # Major and minor versions of this kernel.
KERNELBRANCH='branch:linux-6.2.y'
KERNEL_MAJOR_MINOR="6.3" # Major and minor versions of this kernel.
KERNELBRANCH='branch:linux-6.3.y'
KERNELPATCHDIR='rockchip-rk3588-edge'
;;

6226
patch/kernel/rockchip-rk3588-edge/0001-initial-rk3588-dt.patch
View File

File diff suppressed because it is too large Load Diff

38
patch/kernel/rockchip-rk3588-edge/0002-sdmmc-support.patch
View File

@@ -1,38 +0,0 @@
From aabc5267237373c630f2e9ee2f1a4981c12730fe Mon Sep 17 00:00:00 2001
From: Michal Lazo <xlazom00@gmail.com>
Date: Tue, 3 Jan 2023 13:36:57 +0100
Subject: [PATCH] sdmmc
---
arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
index dd7155397da7..f2e00c762fff 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
@@ -1099,6 +1099,21 @@ gmac1_mtl_tx_setup: tx-queues-config {
};
};
+ sdmmc: mmc@fe2c0000 {
+ compatible = "rockchip,rk3588-dw-mshc", "rockchip,rk3288-dw-mshc";
+ reg = <0x0 0xfe2c0000 0x0 0x4000>;
+ interrupts = <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH 0>;
+ clocks = <&scmi_clk SCMI_HCLK_SD>, <&scmi_clk SCMI_CCLK_SD>,
+ <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
+ clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
+ fifo-depth = <0x100>;
+ max-frequency = <200000000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_det &sdmmc_bus4>;
+ power-domains = <&power RK3588_PD_SDMMC>;
+ status = "disabled";
+ };
+
sdhci: mmc@fe2e0000 {
compatible = "rockchip,rk3588-dwcmshc";
reg = <0x0 0xfe2e0000 0x0 0x10000>;
--
2.39.0

43
patch/kernel/rockchip-rk3588-edge/0002-sdmmc-support2.patch
View File

@@ -1,43 +0,0 @@
From 491e2027ebabf420bda4557b26576f133f7b5176 Mon Sep 17 00:00:00 2001
From: Michal Lazo <xlazom00@gmail.com>
Date: Tue, 3 Jan 2023 13:20:37 +0100
Subject: [PATCH] sdmmc support
---
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index baf46bd30b3..2048a109227 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -10,6 +10,7 @@ / {
aliases {
mmc1 = &sdhci;
+ mmc2 = &sdmmc;
serial2 = &uart2;
};
@@ -38,6 +39,18 @@ &sdhci {
status = "okay";
};
+&sdmmc {
+ max-frequency = <200000000>;
+ no-sdio;
+ no-mmc;
+ bus-width = <4>;
+ cap-sd-highspeed;
+ disable-wp;
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_det>;
+ status = "okay";
+};
+
&uart2 {
pinctrl-0 = <&uart2m0_xfer>;
status = "okay";
--
2.39.0