From 5409e1dd0f27e83ad640526178bb96c06cf58aa2 Mon Sep 17 00:00:00 2001 From: Nascs Fang Date: Fri, 24 Nov 2023 18:44:51 +0800 Subject: [PATCH 1/7] arm64: dts: cm5 io: add gpiod label Signed-off-by: Nascs --- .../dts/rockchip/rk3588s-radxa-cm5-io.dts | 115 ++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts index 81299650de4f0..69c8f72e635ac 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts @@ -535,3 +535,118 @@ pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_det>; status = "okay"; }; + +&gpio0 { + gpio-line-names = + /* GPIO0_A0-A3 */ + "", "", "", "", + /* GPIO0_A4-A7 */ + "", "", "", "", + + /* GPIO0_B0-B3 */ + "", "", "", "", + /* GPIO0_B4-B7 */ + "", "PIN_8", "PIN_10", "", + + /* GPIO0_C0-C3 */ + "", "PIN_33", "PIN_12", "", + /* GPIO0_C4-C7 */ + "PIN_16", "", "", "PIN_31", + + /* GPIO0_D0-D3 */ + "PIN_29", "", "", "PIN_40", + /* GPIO0_D4-D7 */ + "", "PIN_18", "", ""; +}; + +&gpio1 { + gpio-line-names = + /* GPIO1_A0-A3 */ + "", "", "", "", + /* GPIO1_A4-A7 */ + "", "", "", "", + + /* GPIO1_B0-B3 */ + "", "PIN_22", "", "", + /* GPIO1_B4-B7 */ + "", "", "", "PIN_32", + + /* GPIO1_C0-C3 */ + "", "", "", "", + /* GPIO1_C4-C7 */ + "", "", "PIN_36", "", + + /* GPIO1_D0-D3 */ + "", "", "PIN_38", "", + /* GPIO1_D4-D7 */ + "", "", "PIN_28", "PIN_27"; +}; + +&gpio2 { + gpio-line-names = + /* GPIO2_A0-A3 */ + "", "", "", "", + /* GPIO2_A4-A7 */ + "", "", "", "", + + /* GPIO2_B0-B3 */ + "", "", "", "", + /* GPIO2_B4-B7 */ + "", "", "", "", + + /* GPIO2_C0-C3 */ + "", "", "", "", + /* GPIO2_C4-C7 */ + "", "", "", "", + + /* GPIO2_D0-D3 */ + "", "", "", "", + /* GPIO2_D4-D7 */ + "", "", "", ""; +}; + +&gpio3 { + gpio-line-names = + /* GPIO3_A0-A3 */ + "", "", "", "", + /* GPIO3_A4-A7 */ + "", "", "", "", + + /* GPIO3_B0-B3 */ + "", "", "", "", + /* GPIO3_B4-B7 */ + "", "", "", "PIN_26", + + /* GPIO3_C0-C3 */ + "PIN_35", "", "", "", + /* GPIO3_C4-C7 */ + "", "", "", "", + + /* GPIO3_D0-D3 */ + "", "", "PIN_5", "PIN_3", + /* GPIO3_D4-D7 */ + "", "", "", ""; +}; + +&gpio4 { + gpio-line-names = + /* GPIO4_A0-A3 */ + "PIN_21", "PIN_19", "PIN_23", "", + /* GPIO4_A4-A7 */ + "PIN_15", "PIN_13", "PIN_11", "PIN_7", + + /* GPIO4_B0-B3 */ + "", "", "PIN_24", "", + /* GPIO4_B4-B7 */ + "", "", "", "", + + /* GPIO4_C0-C3 */ + "", "", "", "", + /* GPIO4_C4-C7 */ + "", "", "", "", + + /* GPIO4_D0-D3 */ + "", "", "", "", + /* GPIO4_D4-D7 */ + "", "", "", ""; +}; From 1a25c0547a4e28e4068a872229a050def0688219 Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Tue, 10 Oct 2023 15:10:30 +0800 Subject: [PATCH 2/7] arm64: dts: cm5 io: update type-c configuration Signed-off-by: Ken Wang --- arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts index 69c8f72e635ac..de68babca7b5c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts @@ -41,7 +41,6 @@ pinctrl-names = "default"; pinctrl-0 = <&vbus5v0_typec_en>; enable-active-high; - regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; vin-supply = <&vcc5v0_sys>; @@ -451,7 +450,6 @@ }; &u2phy0_otg { - rockchip,sel-pipe-phystatus; rockchip,typec-vbus-det; status = "okay"; }; @@ -480,10 +478,6 @@ status = "okay"; }; -&usbdp_phy0 { - status = "okay"; -}; - &usbdp_phy0_dp { status = "okay"; }; @@ -498,7 +492,6 @@ &usbdrd_dwc3_0 { dr_mode = "otg"; - extcon = <&u2phy0>; status = "okay"; usb-role-switch; From 012b1584f6b4c8a31f12afc2deffc3c173a1b985 Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Thu, 16 Nov 2023 15:47:34 +0800 Subject: [PATCH 3/7] arm64: dts: cm5: enable usb wakeup Signed-off-by: Ken Wang --- .../boot/dts/rockchip/rk3588s-radxa-cm5.dtsi | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi index 38cecdff277c2..40856a832cae9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi @@ -302,3 +302,62 @@ phy-handle = <&rgmii_phy1>; status = "okay"; }; + +&rockchip_suspend { + compatible = "rockchip,pm-rk3588"; + status = "okay"; + rockchip,sleep-debug-en = <1>; + rockchip,sleep-mode-config = < + (0 + | RKPM_SLP_ARMOFF_DDRPD + ) + >; + rockchip,wakeup-config = < + (0 + | RKPM_GPIO_WKUP_EN + | RKPM_USB_WKUP_EN + ) + >; +}; + +&avdd_0v75_s0 { + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <837500>; + }; +}; + +&avcc_1v8_s0 { + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; + }; +}; + +&vcc_1v8_s0 { + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; + }; +}; + +&vcc_3v3_s0 { + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <3300000>; + }; +}; + +&vdd_log_s0 { + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <750000>; + }; +}; + +&vdd_ddr_pll_s0 { + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <850000>; + }; +}; From c0cfc79c522121c1fd3ba9b956ba8102b0e445f2 Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Wed, 10 Jan 2024 10:42:03 +0800 Subject: [PATCH 4/7] arm64: dts: cm5 io: update gpiod gpio-line-names Signed-off-by: Ken Wang --- .../arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts index de68babca7b5c..d461ba2e3de84 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts @@ -542,14 +542,14 @@ "", "PIN_8", "PIN_10", "", /* GPIO0_C0-C3 */ - "", "PIN_33", "PIN_12", "", + "", "", "PIN_12", "", /* GPIO0_C4-C7 */ - "PIN_16", "", "", "PIN_31", + "", "", "", "PIN_31", /* GPIO0_D0-D3 */ "PIN_29", "", "", "PIN_40", /* GPIO0_D4-D7 */ - "", "PIN_18", "", ""; + "", "", "", ""; }; &gpio1 { @@ -565,14 +565,14 @@ "", "", "", "PIN_32", /* GPIO1_C0-C3 */ - "", "", "", "", + "", "PIN_33", "", "", /* GPIO1_C4-C7 */ - "", "", "PIN_36", "", + "PIN_16", "", "PIN_36", "", /* GPIO1_D0-D3 */ "", "", "PIN_38", "", /* GPIO1_D4-D7 */ - "", "", "PIN_28", "PIN_27"; + "", "PIN_18", "PIN_28", "PIN_27"; }; &gpio2 { From 118c117efadf95094cd26de7b5ad0b3b2d5467b2 Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Wed, 10 Jan 2024 14:53:58 +0800 Subject: [PATCH 5/7] arm64: dts: cm5: modify vdd_0v75_s0 regulator-microvolt Increased compatibility with different monitors. Signed-off-by: Ken Wang --- arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi index 40856a832cae9..7a53c7f59a601 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi @@ -361,3 +361,8 @@ regulator-suspend-microvolt = <850000>; }; }; + +&vdd_0v75_s0 { + regulator-min-microvolt = <837500>; + regulator-max-microvolt = <837500>; +}; From b970b8b8166bf0eeec030cc4a79b5a1960118c07 Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Thu, 11 Jan 2024 10:36:59 +0800 Subject: [PATCH 6/7] arm46: dts: cm5: enable hdmi0 cec Signed-off-by: Ken Wang --- arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi index 7a53c7f59a601..89ffc1d016aeb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi @@ -266,6 +266,11 @@ status = "okay"; }; +&hdmi0 { + status = "okay"; + cec-enable = "true"; +}; + &sdhci { bus-width = <8>; non-removable; From 75b18670837890347a4ec0e2abbc6a05544f3918 Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Mon, 15 Jan 2024 11:29:05 +0800 Subject: [PATCH 7/7] arm64: dts: cm5: enable emmc hs400 mode Signed-off-by: Ken Wang --- arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi index 89ffc1d016aeb..4b82fde22bbf8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi @@ -273,9 +273,14 @@ &sdhci { bus-width = <8>; + no-sdio; + no-sd; non-removable; - max-frequency = <150000000>; + max-frequency = <200000000>; + mmc-hs400-1_8v; + mmc-hs400-enhanced-strobe; mmc-hs200-1_8v; + status = "okay"; }; &mdio1 {