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

rk3399: fix again OrangePi 4 LTS sdcard detection

Browse Source
This commit is contained in:
Paolo Sabatino 2023-05-21 18:46:52 +02:00 committed by igorpecovnik
parent 526070d866
commit 59363d5a0f
2 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
patch/kernel/archive/rockchip64-6.1/add-board-orangepi-4-lts.patch
View File

@ -1,9 +1,19 @@
From 4af18a7595fc0bf36b91867217ac1bfbb7e5503f Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Sun, 21 May 2023 17:35:55 +0200
Subject: [PATCH] rk3399: add Orange Pi 4 LTS device tree
---
.../dts/rockchip/rk3399-orangepi-4-lts.dts | 1244 +++++++++++++++++
1 file changed, 1244 insertions(+)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-orangepi-4-lts.dts
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-orangepi-4-lts.dts b/arch/arm64/boot/dts/rockchip/rk3399-orangepi-4-lts.dts
new file mode 100644
index 00000000000..43f081ec1ab
index 000000000000..0a4abf995e4b
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi-4-lts.dts
@@ -0,0 +1,1254 @@
@@ -0,0 +1,1244 @@
+/*
+ * SPDX-License-Identifier: (GPL-2.0+ or MIT)
+ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
@ -123,7 +133,7 @@ index 00000000000..43f081ec1ab
+ enable-active-high;
+ gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdmmc0_pwr_h>;
+ pinctrl-0 = <&sdmmc_pwr>;
+ regulator-name = "vcc3v0_sd";
+ regulator-always-on;
+ regulator-min-microvolt = <3000000>;
@ -955,7 +965,7 @@ index 00000000000..43f081ec1ab
+ disable-wp;
+ max-frequency = <150000000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc0_det_l>;
+ pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_cd>;
+ sd-uhs-sdr104;
+ vmmc-supply = <&vcc3v0_sd>;
+ vqmmc-supply = <&vcc_sdio>;
@ -1113,16 +1123,6 @@ index 00000000000..43f081ec1ab
+ };
+ };
+
+ sdmmc {
+ sdmmc0_det_l: sdmmc0-det-l {
+ rockchip,pins = <0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+
+ sdmmc0_pwr_h: sdmmc0-pwr-h {
+ rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+ };
+
+ usb-typec {
+ vcc5v0_typec_en: vcc5v0_typec_en {
+ rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>;
@ -1258,3 +1258,6 @@ index 00000000000..43f081ec1ab
+&dfi {
+ status = "okay";
+};
--
2.34.1

28
patch/kernel/archive/rockchip64-6.1/rk3399-sd-pwr-pinctrl.patch Normal file
View File

@ -0,0 +1,28 @@
From b64beb18f2beb3d1188dd19fb0411687065a35ea Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Sun, 21 May 2023 13:14:26 +0200
Subject: [PATCH] rk3399: add sd power pin to pinctrl node
---
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 59858f2dc8b9..b4ec5ffdbf8a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -2526,6 +2526,11 @@ sdmmc_wp: sdmmc-wp {
rockchip,pins =
<0 RK_PB0 1 &pcfg_pull_up>;
};
+
+ sdmmc_pwr: sdmmc-pwr {
+ rockchip,pins =
+ <0 RK_PA1 1 &pcfg_pull_up>;
+ };
};
suspend {
--
2.34.1