rockchip64/edge 6.3.y: manually fix Radxa E25/CM3 patches
This commit is contained in:
parent
5200172a37
commit
fde9ca206e
@ -1,16 +1,35 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: krachlatte <krachlatte1977@gmail.com>
|
||||
Date: Wed, 17 May 2023 00:55:30 +0200
|
||||
Subject: [ARCHEOLOGY] Improve SD card compatibility on Radxa E25 (#5165)
|
||||
|
||||
> X-Git-Archeology: - Revision 45c85878613108c238e491aa69650fcad1fba4bb: https://github.com/armbian/build/commit/45c85878613108c238e491aa69650fcad1fba4bb
|
||||
> X-Git-Archeology: Date: Wed, 17 May 2023 00:55:30 +0200
|
||||
> X-Git-Archeology: From: krachlatte <krachlatte1977@gmail.com>
|
||||
> X-Git-Archeology: Subject: Improve SD card compatibility on Radxa E25 (#5165)
|
||||
> X-Git-Archeology:
|
||||
> X-Git-Archeology: - Revision f6a0c53d08f53aadd0588a571662dc199232825b: https://github.com/armbian/build/commit/f6a0c53d08f53aadd0588a571662dc199232825b
|
||||
> X-Git-Archeology: Date: Wed, 24 May 2023 10:39:21 +0200
|
||||
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
|
||||
> X-Git-Archeology: Subject: manual e25 patch fix
|
||||
> X-Git-Archeology:
|
||||
---
|
||||
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
|
||||
index 63c4bd873188..924857469afd 100644
|
||||
index 63c4bd873188..9bc67abff3ea 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
|
||||
@@ -184,11 +184,11 @@ &sdmmc0 {
|
||||
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
|
||||
/* Also used in pcie30x1_clkreqnm0 */
|
||||
disable-wp;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd>;
|
||||
- sd-uhs-sdr104;
|
||||
+ sd-uhs-sdr50;
|
||||
vmmc-supply = <&vcc3v3_sd>;
|
||||
vqmmc-supply = <&vccio_sd>;
|
||||
status = "okay";
|
||||
};
|
||||
@@ -186,7 +186,7 @@ &sdmmc0 {
|
||||
disable-wp;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd>;
|
||||
- sd-uhs-sdr104;
|
||||
+ sd-uhs-sdr50;
|
||||
vmmc-supply = <&vcc3v3_sd>;
|
||||
vqmmc-supply = <&vccio_sd>;
|
||||
status = "okay";
|
||||
--
|
||||
Armbian
|
||||
|
||||
|
||||
@ -1,54 +1,64 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: krachlatte <krachlatte1977@gmail.com>
|
||||
Date: Wed, 17 May 2023 00:55:30 +0200
|
||||
Subject: [ARCHEOLOGY] Improve SD card compatibility on Radxa E25 (#5165)
|
||||
|
||||
> X-Git-Archeology: - Revision 45c85878613108c238e491aa69650fcad1fba4bb: https://github.com/armbian/build/commit/45c85878613108c238e491aa69650fcad1fba4bb
|
||||
> X-Git-Archeology: Date: Wed, 17 May 2023 00:55:30 +0200
|
||||
> X-Git-Archeology: From: krachlatte <krachlatte1977@gmail.com>
|
||||
> X-Git-Archeology: Subject: Improve SD card compatibility on Radxa E25 (#5165)
|
||||
> X-Git-Archeology:
|
||||
> X-Git-Archeology: - Revision f6a0c53d08f53aadd0588a571662dc199232825b: https://github.com/armbian/build/commit/f6a0c53d08f53aadd0588a571662dc199232825b
|
||||
> X-Git-Archeology: Date: Wed, 24 May 2023 10:39:21 +0200
|
||||
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
|
||||
> X-Git-Archeology: Subject: manual e25 patch fix
|
||||
> X-Git-Archeology:
|
||||
---
|
||||
arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 12 ++++++++++
|
||||
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 2 ++
|
||||
2 files changed, 14 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
|
||||
index c50fbdd48680..b9d317cab48b 100644
|
||||
index c50fbdd48680..67328c2b5e4d 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
|
||||
@@ -390,10 +390,23 @@ &sdhci {
|
||||
vmmc-supply = <&vcc_3v3>;
|
||||
vqmmc-supply = <&vcc_1v8>;
|
||||
status = "okay";
|
||||
@@ -392,6 +392,17 @@ &sdhci {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+
|
||||
+
|
||||
|
||||
+&sfc {
|
||||
+ status = "okay";
|
||||
+ flash@0 {
|
||||
+ compatible = "jedec,spi-nor";
|
||||
+ reg = <0>;
|
||||
+ spi-max-frequency = <108000000>;
|
||||
+ spi-rx-bus-width = <2>;
|
||||
+ spi-tx-bus-width = <2>;
|
||||
+ };
|
||||
+ status = "okay";
|
||||
+ flash@0 {
|
||||
+ compatible = "jedec,spi-nor";
|
||||
+ reg = <0>;
|
||||
+ spi-max-frequency = <108000000>;
|
||||
+ spi-rx-bus-width = <2>;
|
||||
+ spi-tx-bus-width = <2>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
&tsadc {
|
||||
rockchip,hw-tshut-mode = <1>;
|
||||
rockchip,hw-tshut-polarity = <0>;
|
||||
status = "okay";
|
||||
};
|
||||
@@ -410,6 +423,7 @@ &usb2phy1 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
rockchip,hw-tshut-mode = <1>;
|
||||
rockchip,hw-tshut-polarity = <0>;
|
||||
@@ -412,4 +423,5 @@ &usb2phy1 {
|
||||
|
||||
&usb_host0_xhci {
|
||||
extcon = <&usb2phy0>;
|
||||
+ dr_mode = "host";
|
||||
extcon = <&usb2phy0>;
|
||||
+ dr_mode = "host";
|
||||
};
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
|
||||
index 924857469afd..38caecb1ef67 100644
|
||||
index 9bc67abff3ea..8046c941e611 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
|
||||
@@ -199,10 +199,12 @@ &usb_host0_ehci {
|
||||
&usb_host0_ohci {
|
||||
status = "okay";
|
||||
@@ -201,6 +201,8 @@ &usb_host0_ohci {
|
||||
};
|
||||
|
||||
|
||||
&usb_host0_xhci {
|
||||
+ extcon = <&usb2phy0>;
|
||||
+ dr_mode = "host";
|
||||
status = "okay";
|
||||
+ extcon = <&usb2phy0>;
|
||||
+ dr_mode = "host";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
--
|
||||
Armbian
|
||||
|
||||
&usb_host1_ehci {
|
||||
status = "okay";
|
||||
--
|
||||
|
||||
Loading…
Reference in New Issue
Block a user