rockchip: add ROCK 3A support
Hardware -------- RockChip RK3568 ARM64 (4 cores) 2/4/8GB LPDDR4 RAM 1000 Base-T eMMC on-board M.2 Slot Micro-SD Slot HDMI Port 3.5mm Audio Jack 2x USB 3.0 Port 2x USB 2.0 Port Type-C PD Power Installation ------------ Uncompress the OpenWrt sysupgrade and write it to a micro SD card or internal eMMC using dd. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
parent
188b1bfbe9
commit
70f07967a3
@ -218,6 +218,15 @@ define Device/radxa_cm3-io
|
|||||||
endef
|
endef
|
||||||
TARGET_DEVICES += radxa_cm3-io
|
TARGET_DEVICES += radxa_cm3-io
|
||||||
|
|
||||||
|
define Device/radxa_rock-3a
|
||||||
|
DEVICE_VENDOR := Radxa
|
||||||
|
DEVICE_MODEL := ROCK 3A
|
||||||
|
SOC := rk3568
|
||||||
|
SUPPORTED_DEVICES := radxa,rock3a
|
||||||
|
BOOT_FLOW := pine64-img
|
||||||
|
endef
|
||||||
|
TARGET_DEVICES += radxa_rock-3a
|
||||||
|
|
||||||
define Device/radxa_rock-5a
|
define Device/radxa_rock-5a
|
||||||
DEVICE_VENDOR := Radxa
|
DEVICE_VENDOR := Radxa
|
||||||
DEVICE_MODEL := ROCK 5A
|
DEVICE_MODEL := ROCK 5A
|
||||||
|
|||||||
@ -0,0 +1,81 @@
|
|||||||
|
From 49665ab0ed5eed4fa7b8a6b236ff2df681c89673 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Chukun Pan <amadeus@jmu.edu.cn>
|
||||||
|
Date: Thu, 6 Oct 2022 23:25:23 +0800
|
||||||
|
Subject: [PATCH] arm64: dts: rockchip: Add regulator suffix to rock-3a
|
||||||
|
|
||||||
|
Add -regulator suffix to regulator names on Radxa ROCK3 Model A
|
||||||
|
board. This makes the naming more consistent.
|
||||||
|
|
||||||
|
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
|
||||||
|
Acked-by: Michael Riesch <michael.riesch@wolfvision.net>
|
||||||
|
Link: https://lore.kernel.org/r/20221006152524.502445-2-amadeus@jmu.edu.cn
|
||||||
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
---
|
||||||
|
arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 14 +++++++-------
|
||||||
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
@@ -60,7 +60,7 @@
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
- vcc12v_dcin: vcc12v-dcin {
|
||||||
|
+ vcc12v_dcin: vcc12v-dcin-regulator {
|
||||||
|
compatible = "regulator-fixed";
|
||||||
|
regulator-name = "vcc12v_dcin";
|
||||||
|
regulator-always-on;
|
||||||
|
@@ -79,7 +79,7 @@
|
||||||
|
vin-supply = <&vcc5v0_sys>;
|
||||||
|
};
|
||||||
|
|
||||||
|
- vcc3v3_sys: vcc3v3-sys {
|
||||||
|
+ vcc3v3_sys: vcc3v3-sys-regulator {
|
||||||
|
compatible = "regulator-fixed";
|
||||||
|
regulator-name = "vcc3v3_sys";
|
||||||
|
regulator-always-on;
|
||||||
|
@@ -89,7 +89,7 @@
|
||||||
|
vin-supply = <&vcc12v_dcin>;
|
||||||
|
};
|
||||||
|
|
||||||
|
- vcc5v0_sys: vcc5v0-sys {
|
||||||
|
+ vcc5v0_sys: vcc5v0-sys-regulator {
|
||||||
|
compatible = "regulator-fixed";
|
||||||
|
regulator-name = "vcc5v0_sys";
|
||||||
|
regulator-always-on;
|
||||||
|
@@ -99,7 +99,7 @@
|
||||||
|
vin-supply = <&vcc12v_dcin>;
|
||||||
|
};
|
||||||
|
|
||||||
|
- vcc5v0_usb: vcc5v0-usb {
|
||||||
|
+ vcc5v0_usb: vcc5v0-usb-regulator {
|
||||||
|
compatible = "regulator-fixed";
|
||||||
|
regulator-name = "vcc5v0_usb";
|
||||||
|
regulator-always-on;
|
||||||
|
@@ -109,7 +109,7 @@
|
||||||
|
vin-supply = <&vcc12v_dcin>;
|
||||||
|
};
|
||||||
|
|
||||||
|
- vcc5v0_usb_host: vcc5v0-usb-host {
|
||||||
|
+ vcc5v0_usb_host: vcc5v0-usb-host-regulator {
|
||||||
|
compatible = "regulator-fixed";
|
||||||
|
enable-active-high;
|
||||||
|
gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
|
||||||
|
@@ -144,7 +144,7 @@
|
||||||
|
vin-supply = <&vcc5v0_usb>;
|
||||||
|
};
|
||||||
|
|
||||||
|
- vcc_cam: vcc-cam {
|
||||||
|
+ vcc_cam: vcc-cam-regulator {
|
||||||
|
compatible = "regulator-fixed";
|
||||||
|
enable-active-high;
|
||||||
|
gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>;
|
||||||
|
@@ -160,7 +160,7 @@
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
- vcc_mipi: vcc-mipi {
|
||||||
|
+ vcc_mipi: vcc-mipi-regulator {
|
||||||
|
compatible = "regulator-fixed";
|
||||||
|
enable-active-high;
|
||||||
|
gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>;
|
||||||
@ -0,0 +1,75 @@
|
|||||||
|
From 0522cd8112204d124d714eee7e9f0cac6de999d9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Chukun Pan <amadeus@jmu.edu.cn>
|
||||||
|
Date: Thu, 6 Oct 2022 23:25:24 +0800
|
||||||
|
Subject: [PATCH] arm64: dts: rockchip: Add PCIe v3 nodes to rock-3a
|
||||||
|
|
||||||
|
Add Nodes to Radxa ROCK3 Model A board to support PCIe v3.
|
||||||
|
|
||||||
|
Tested-by: Anand Moon <linux.amoon@gmail.com>
|
||||||
|
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
|
||||||
|
Link: https://lore.kernel.org/r/20221006152524.502445-3-amadeus@jmu.edu.cn
|
||||||
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
---
|
||||||
|
.../boot/dts/rockchip/rk3568-rock-3a.dts | 44 +++++++++++++++++++
|
||||||
|
1 file changed, 44 insertions(+)
|
||||||
|
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
@@ -67,6 +67,37 @@
|
||||||
|
regulator-boot-on;
|
||||||
|
};
|
||||||
|
|
||||||
|
+ pcie30_avdd0v9: pcie30-avdd0v9-regulator {
|
||||||
|
+ compatible = "regulator-fixed";
|
||||||
|
+ regulator-name = "pcie30_avdd0v9";
|
||||||
|
+ regulator-always-on;
|
||||||
|
+ regulator-boot-on;
|
||||||
|
+ regulator-min-microvolt = <900000>;
|
||||||
|
+ regulator-max-microvolt = <900000>;
|
||||||
|
+ vin-supply = <&vcc3v3_sys>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ pcie30_avdd1v8: pcie30-avdd1v8-regulator {
|
||||||
|
+ compatible = "regulator-fixed";
|
||||||
|
+ regulator-name = "pcie30_avdd1v8";
|
||||||
|
+ regulator-always-on;
|
||||||
|
+ regulator-boot-on;
|
||||||
|
+ regulator-min-microvolt = <1800000>;
|
||||||
|
+ regulator-max-microvolt = <1800000>;
|
||||||
|
+ vin-supply = <&vcc3v3_sys>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ /* pi6c pcie clock generator */
|
||||||
|
+ vcc3v3_pi6c_03: vcc3v3-pi6c-03-regulator {
|
||||||
|
+ compatible = "regulator-fixed";
|
||||||
|
+ regulator-name = "vcc3v3_pi6c_03";
|
||||||
|
+ regulator-always-on;
|
||||||
|
+ regulator-boot-on;
|
||||||
|
+ regulator-min-microvolt = <3300000>;
|
||||||
|
+ regulator-max-microvolt = <3300000>;
|
||||||
|
+ vin-supply = <&vcc5v0_sys>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
vcc3v3_pcie: vcc3v3-pcie-regulator {
|
||||||
|
compatible = "regulator-fixed";
|
||||||
|
enable-active-high;
|
||||||
|
@@ -546,6 +577,19 @@
|
||||||
|
vpcie3v3-supply = <&vcc3v3_pcie>;
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
+
|
||||||
|
+&pcie30phy {
|
||||||
|
+ phy-supply = <&vcc3v3_pi6c_03>;
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&pcie3x2 {
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&pcie30x2m1_pins>;
|
||||||
|
+ reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ vpcie3v3-supply = <&vcc3v3_pcie>;
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
|
||||||
|
&pinctrl {
|
||||||
|
cam {
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
From 3a6dcf61d542fb1f4fbd546a9df91938440ece3a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shengyu Qu <wiagn233@outlook.com>
|
||||||
|
Date: Sun, 30 Oct 2022 01:09:06 +0800
|
||||||
|
Subject: [PATCH] arm64: dts: rockchip: Add I2S2 node for RADXA Rock 3A
|
||||||
|
|
||||||
|
This patch adds I2S2 node for Radxa Rock 3A's M.2 E key slot for
|
||||||
|
Bluetooth PCM input. I2S2 is not used now, but could be configured
|
||||||
|
for Bluetooth HFP over PCM in future patches.
|
||||||
|
|
||||||
|
Signed-off-by: Shengyu Qu <wiagn233@outlook.com>
|
||||||
|
Link: https://lore.kernel.org/r/OS3P286MB259791E603F96942F51332D098359@OS3P286MB2597.JPNP286.PROD.OUTLOOK.COM
|
||||||
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
---
|
||||||
|
arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
@@ -558,6 +558,11 @@
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
+&i2s2_2ch {
|
||||||
|
+ rockchip,trcm-sync-tx-only;
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&mdio1 {
|
||||||
|
rgmii_phy1: ethernet-phy@0 {
|
||||||
|
compatible = "ethernet-phy-ieee802.3-c22";
|
||||||
@ -0,0 +1,115 @@
|
|||||||
|
From 8cf890aabd45664b8f27a5581c8d2a51a8ce2e17 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shengyu Qu <wiagn233@outlook.com>
|
||||||
|
Date: Sun, 30 Oct 2022 01:09:08 +0800
|
||||||
|
Subject: [PATCH] arm64: dts: rockchip: Add nodes for SDIO/UART Wi-Fi/Bluetooth
|
||||||
|
modules to Radxa Rock 3A
|
||||||
|
|
||||||
|
This patch adds related bus/pinctrl/power nodes to enable support for
|
||||||
|
Radxa's Wi-Fi Bluetooth combo module.
|
||||||
|
Tested with RADXA A6 module, which uses AP6275S (BCM43752A2)
|
||||||
|
|
||||||
|
Signed-off-by: Shengyu Qu <wiagn233@outlook.com>
|
||||||
|
Link: https://lore.kernel.org/r/OS3P286MB25972313C916A68698B1CD8698359@OS3P286MB2597.JPNP286.PROD.OUTLOOK.COM
|
||||||
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
---
|
||||||
|
.../boot/dts/rockchip/rk3568-rock-3a.dts | 69 +++++++++++++++++++
|
||||||
|
1 file changed, 69 insertions(+)
|
||||||
|
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
@@ -60,6 +60,17 @@
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
+ sdio_pwrseq: sdio-pwrseq {
|
||||||
|
+ compatible = "mmc-pwrseq-simple";
|
||||||
|
+ clocks = <&rk809 1>;
|
||||||
|
+ clock-names = "ext_clock";
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&wifi_enable>;
|
||||||
|
+ post-power-on-delay-ms = <100>;
|
||||||
|
+ power-off-delay-us = <5000000>;
|
||||||
|
+ reset-gpios = <&gpio3 RK_PD4 GPIO_ACTIVE_LOW>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
vcc12v_dcin: vcc12v-dcin-regulator {
|
||||||
|
compatible = "regulator-fixed";
|
||||||
|
regulator-name = "vcc12v_dcin";
|
||||||
|
@@ -655,6 +666,26 @@
|
||||||
|
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
+
|
||||||
|
+ bt {
|
||||||
|
+ bt_enable: bt-enable {
|
||||||
|
+ rockchip,pins = <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ bt_host_wake: bt-host-wake {
|
||||||
|
+ rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ bt_wake: bt-wake {
|
||||||
|
+ rockchip,pins = <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ sdio-pwrseq {
|
||||||
|
+ wifi_enable: wifi-enable {
|
||||||
|
+ rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
};
|
||||||
|
|
||||||
|
&pmu_io_domains {
|
||||||
|
@@ -699,12 +730,50 @@
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
+&sdmmc2 {
|
||||||
|
+ supports-sdio;
|
||||||
|
+ bus-width = <4>;
|
||||||
|
+ disable-wp;
|
||||||
|
+ cap-sd-highspeed;
|
||||||
|
+ cap-sdio-irq;
|
||||||
|
+ keep-power-in-suspend;
|
||||||
|
+ mmc-pwrseq = <&sdio_pwrseq>;
|
||||||
|
+ non-removable;
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;
|
||||||
|
+ sd-uhs-sdr104;
|
||||||
|
+ vmmc-supply = <&vcc3v3_sys>;
|
||||||
|
+ vqmmc-supply = <&vcc_1v8>;
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&tsadc {
|
||||||
|
rockchip,hw-tshut-mode = <1>;
|
||||||
|
rockchip,hw-tshut-polarity = <0>;
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
+&uart1 {
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn &uart1m0_rtsn>;
|
||||||
|
+ uart-has-rtscts;
|
||||||
|
+ status = "okay";
|
||||||
|
+
|
||||||
|
+ bluetooth {
|
||||||
|
+ compatible = "brcm,bcm43438-bt";
|
||||||
|
+ clocks = <&rk809 1>;
|
||||||
|
+ clock-names = "lpo";
|
||||||
|
+ device-wakeup-gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ host-wakeup-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ shutdown-gpios = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&bt_host_wake &bt_wake &bt_enable>;
|
||||||
|
+ vbat-supply = <&vcc3v3_sys>;
|
||||||
|
+ vddio-supply = <&vcc_1v8>;
|
||||||
|
+ /* vddio comes from regulator on module, use IO bank voltage instead */
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&uart2 {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
@ -0,0 +1,54 @@
|
|||||||
|
From ef9f4b4a50206bedd931f45dd9fd57fd4c1714a6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Anand Moon <linux.amoon@gmail.com>
|
||||||
|
Date: Wed, 16 Nov 2022 20:01:44 +0000
|
||||||
|
Subject: [PATCH] arm64: dts: rockchip: Add support of external clock to
|
||||||
|
ethernet node on Rock 3A SBC
|
||||||
|
|
||||||
|
Add support of external clock gmac1_clkin which is used as input clock
|
||||||
|
to ethernet node.
|
||||||
|
|
||||||
|
Signed-off-by: Anand Moon <linux.amoon@gmail.com>
|
||||||
|
Reviewed-by: Michael Riesch <michael.riesch@wolfvision.net>
|
||||||
|
Tested-by: Michael Riesch <michael.riesch@wolfvision.net>
|
||||||
|
Link: https://lore.kernel.org/r/20221116200150.4657-3-linux.amoon@gmail.com
|
||||||
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
---
|
||||||
|
arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 13 ++++++++++---
|
||||||
|
1 file changed, 10 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
@@ -32,6 +32,13 @@
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
+ gmac1_clkin: external-gmac1-clock {
|
||||||
|
+ compatible = "fixed-clock";
|
||||||
|
+ clock-frequency = <125000000>;
|
||||||
|
+ clock-output-names = "gmac1_clkin";
|
||||||
|
+ #clock-cells = <0>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
leds {
|
||||||
|
compatible = "gpio-leds";
|
||||||
|
|
||||||
|
@@ -249,9 +256,8 @@
|
||||||
|
|
||||||
|
&gmac1 {
|
||||||
|
assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1>;
|
||||||
|
- assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>;
|
||||||
|
- assigned-clock-rates = <0>, <125000000>;
|
||||||
|
- clock_in_out = "output";
|
||||||
|
+ assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>, <&gmac1_clkin>;
|
||||||
|
+ clock_in_out = "input";
|
||||||
|
phy-handle = <&rgmii_phy1>;
|
||||||
|
phy-mode = "rgmii-id";
|
||||||
|
pinctrl-names = "default";
|
||||||
|
@@ -259,6 +265,7 @@
|
||||||
|
&gmac1m1_tx_bus2
|
||||||
|
&gmac1m1_rx_bus2
|
||||||
|
&gmac1m1_rgmii_clk
|
||||||
|
+ &gmac1m1_clkinout
|
||||||
|
&gmac1m1_rgmii_bus>;
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
From 79aa02ddc682558edb9bd56522ad841759c99201 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Anand Moon <linux.amoon@gmail.com>
|
||||||
|
Date: Wed, 16 Nov 2022 20:01:45 +0000
|
||||||
|
Subject: [PATCH] arm64: dts: rockchip: Add support of regulator for ethernet
|
||||||
|
node on Rock 3A SBC
|
||||||
|
|
||||||
|
Add regulator support for ethernet node
|
||||||
|
|
||||||
|
Fix following warning.
|
||||||
|
[ 7.365199] rk_gmac-dwmac fe010000.ethernet: no regulator found
|
||||||
|
|
||||||
|
Signed-off-by: Anand Moon <linux.amoon@gmail.com>
|
||||||
|
Acked-by: Michael Riesch <michael.riesch@wolfvision.net>
|
||||||
|
Tested-by: Michael Riesch <michael.riesch@wolfvision.net>
|
||||||
|
Link: https://lore.kernel.org/r/20221116200150.4657-4-linux.amoon@gmail.com
|
||||||
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
---
|
||||||
|
arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
@@ -260,6 +260,7 @@
|
||||||
|
clock_in_out = "input";
|
||||||
|
phy-handle = <&rgmii_phy1>;
|
||||||
|
phy-mode = "rgmii-id";
|
||||||
|
+ phy-supply = <&vcc_3v3>;
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&gmac1m1_miim
|
||||||
|
&gmac1m1_tx_bus2
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
From 0b693c8f8b88d50114caaa4d2337932d4d172631 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Chukun Pan <amadeus@jmu.edu.cn>
|
||||||
|
Date: Mon, 19 Dec 2022 18:10:52 +0800
|
||||||
|
Subject: [PATCH] arm64: dts: rockchip: remove unsupported property from sdmmc2
|
||||||
|
for rock-3a
|
||||||
|
|
||||||
|
'supports-sdio' is not part of the DT binding
|
||||||
|
and not supported by the Linux driver.
|
||||||
|
|
||||||
|
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
|
||||||
|
Link: https://lore.kernel.org/r/20221219101052.7899-1-amadeus@jmu.edu.cn
|
||||||
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
---
|
||||||
|
arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 1 -
|
||||||
|
1 file changed, 1 deletion(-)
|
||||||
|
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
@@ -739,7 +739,6 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
&sdmmc2 {
|
||||||
|
- supports-sdio;
|
||||||
|
bus-width = <4>;
|
||||||
|
disable-wp;
|
||||||
|
cap-sd-highspeed;
|
||||||
@ -0,0 +1,61 @@
|
|||||||
|
From d268da063b99cf1c4d8304a33c27bbed0763a474 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jagan Teki <jagan@amarulasolutions.com>
|
||||||
|
Date: Wed, 18 Jan 2023 13:34:54 +0530
|
||||||
|
Subject: [PATCH] arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SBC
|
||||||
|
boards
|
||||||
|
|
||||||
|
Radxa SBC boards like ROCK 3A/4 models do support eMMC and SDcard
|
||||||
|
via external connector slots.
|
||||||
|
|
||||||
|
Mark, the eMMC has mmc0 by considering the Rockchip boot order priority
|
||||||
|
as both MMC devices are connected externally.
|
||||||
|
|
||||||
|
Reported-by: FUKAUMI Naoki <naoki@radxa.com>
|
||||||
|
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
|
||||||
|
Link: https://lore.kernel.org/r/20230118080454.11643-2-jagan@amarulasolutions.com
|
||||||
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
---
|
||||||
|
arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts | 4 ++--
|
||||||
|
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 4 ++--
|
||||||
|
arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 4 ++--
|
||||||
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
|
||||||
|
@@ -15,8 +15,8 @@
|
||||||
|
compatible = "radxa,rock-4c-plus", "rockchip,rk3399";
|
||||||
|
|
||||||
|
aliases {
|
||||||
|
- mmc0 = &sdmmc;
|
||||||
|
- mmc1 = &sdhci;
|
||||||
|
+ mmc0 = &sdhci;
|
||||||
|
+ mmc1 = &sdmmc;
|
||||||
|
};
|
||||||
|
|
||||||
|
chosen {
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||||
|
@@ -13,8 +13,8 @@
|
||||||
|
|
||||||
|
/ {
|
||||||
|
aliases {
|
||||||
|
- mmc0 = &sdmmc;
|
||||||
|
- mmc1 = &sdhci;
|
||||||
|
+ mmc0 = &sdhci;
|
||||||
|
+ mmc1 = &sdmmc;
|
||||||
|
};
|
||||||
|
|
||||||
|
chosen {
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
@@ -13,8 +13,8 @@
|
||||||
|
|
||||||
|
aliases {
|
||||||
|
ethernet0 = &gmac1;
|
||||||
|
- mmc0 = &sdmmc0;
|
||||||
|
- mmc1 = &sdhci;
|
||||||
|
+ mmc0 = &sdhci;
|
||||||
|
+ mmc1 = &sdmmc0;
|
||||||
|
};
|
||||||
|
|
||||||
|
chosen: chosen {
|
||||||
@ -0,0 +1,39 @@
|
|||||||
|
From 0597d85859e48c4366862a6252479698590ae39c Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Tam=C3=A1s=20Sz=C5=B1cs?= <tszucs@protonmail.ch>
|
||||||
|
Date: Wed, 11 Oct 2023 19:14:56 +0000
|
||||||
|
Subject: [PATCH] arm64: dts: rockchip: Add missing sdmmc2 SDR rates to rock-3a
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Add missing UHS-I SDR rates to sdmmc2. Add explicit alias as mmc2 while at it.
|
||||||
|
It would be good to have matching timings enabled in case slower SDIO devices
|
||||||
|
are encountered.
|
||||||
|
|
||||||
|
Signed-off-by: Tamás Szűcs <tszucs@protonmail.ch>
|
||||||
|
Link: https://lore.kernel.org/r/20231011191448.58936-1-tszucs@protonmail.ch
|
||||||
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
---
|
||||||
|
arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
@@ -15,6 +15,7 @@
|
||||||
|
ethernet0 = &gmac1;
|
||||||
|
mmc0 = &sdhci;
|
||||||
|
mmc1 = &sdmmc0;
|
||||||
|
+ mmc2 = &sdmmc2;
|
||||||
|
};
|
||||||
|
|
||||||
|
chosen: chosen {
|
||||||
|
@@ -748,6 +749,9 @@
|
||||||
|
non-removable;
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;
|
||||||
|
+ sd-uhs-sdr12;
|
||||||
|
+ sd-uhs-sdr25;
|
||||||
|
+ sd-uhs-sdr50;
|
||||||
|
sd-uhs-sdr104;
|
||||||
|
vmmc-supply = <&vcc3v3_sys>;
|
||||||
|
vqmmc-supply = <&vcc_1v8>;
|
||||||
@ -304,6 +304,28 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
|
|||||||
rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
|
rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
@@ -16,6 +16,11 @@
|
||||||
|
mmc0 = &sdhci;
|
||||||
|
mmc1 = &sdmmc0;
|
||||||
|
mmc2 = &sdmmc2;
|
||||||
|
+
|
||||||
|
+ led-boot = &led_user;
|
||||||
|
+ led-failsafe = &led_user;
|
||||||
|
+ led-running = &led_user;
|
||||||
|
+ led-upgrade = &led_user;
|
||||||
|
};
|
||||||
|
|
||||||
|
chosen: chosen {
|
||||||
|
@@ -47,7 +52,6 @@
|
||||||
|
gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
|
||||||
|
function = LED_FUNCTION_HEARTBEAT;
|
||||||
|
color = <LED_COLOR_ID_BLUE>;
|
||||||
|
- linux,default-trigger = "heartbeat";
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&led_user_en>;
|
||||||
|
};
|
||||||
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
|
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
|
||||||
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
|
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
|
||||||
@@ -8,6 +8,7 @@
|
@@ -8,6 +8,7 @@
|
||||||
|
|||||||
@ -56,6 +56,19 @@
|
|||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
+&rng {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&saradc {
|
||||||
|
vref-supply = <&vcca_1v8>;
|
||||||
|
status = "okay";
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
|
||||||
|
@@ -714,6 +714,10 @@
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
+&rng {
|
+&rng {
|
||||||
+ status = "okay";
|
+ status = "okay";
|
||||||
+};
|
+};
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user