arm64: dts: rockchip: add properties for pcie2x1l2 for Radxa ROCK 5C
Subsystems (2)
PATCH v2 1/9 arm64: dts: rockchip: add properties for pcie2x1l2 for Radxa ROCK 5C
by schematic[1], pcie2x1l2 CLKREQ and WAKE pins are connected. describe them in dts.
[1] https://dl.radxa.com/rock5/5c/docs/hw/v1100/radxa_rock_5c_schematic_v1100.pdf
---
Changes in v2:
- reword commit message
--- arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +3 -1
@@ -419,7 +419,9 @@ rgmii_phy1: ethernet-phy@1 { &pcie2x1l2 { pinctrl-names = "default"; - pinctrl-0 = <&pcie20x1_2_perstn_m0>; + pinctrl-0 = <&pcie20x1_2_perstn_m0>, + <&pcie20x1m0_clkreqn>, + <&pcie20x1m0_waken>; reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>; vpcie3v3-supply = <&pcie2x1l2_3v3>; status = "okay";
Signature · 1 line
2.43.0
PATCH v2 2/9 arm64: dts: rockchip: add cd-gpios for sdmmc for Radxa ROCK 5C
by discussion about cd-gpios and sdmmmc_det pin function[1], it's better to add cd-gpios for now.
[1] https://lore.kernel.org/linux-rockchip/4920950.GXAFRqVoOG@diego/T/#u
---
Changes in v2:
- none
--- arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +1 -0
@@ -501,6 +501,7 @@ &sdmmc { bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; + cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; disable-wp; no-sdio; no-mmc;
Signature · 1 line
2.43.0
PATCH v2 3/9 arm64: dts: rockchip: fix pmic dcdc-reg10 label for Radxa ROCK 5C
In reply to FUKAUMI Naokifix pmic dcdc-reg10 label to match with schematic[1].
[1] https://dl.radxa.com/rock5/5c/docs/hw/v1100/radxa_rock_5c_schematic_v1100.pdf
---
Changes in v2:
- split from "arm64: dts: rockchip: fix pmic properties for Radxa ROCK 5C"
--- arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +2 -2
@@ -691,8 +691,8 @@ regulator-state-mem { }; }; - vcc1v8_pmu_ddr_s3: dcdc-reg10 { - regulator-name = "vcc1v8_pmu_ddr_s3"; + vcc_1v8_s3: dcdc-reg10 { + regulator-name = "vcc_1v8_s3"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>;
Signature · 1 line
2.43.0
PATCH v2 4/9 arm64: dts: rockchip: fix proparties for pmic regulators for Radxa ROCK 5C
In reply to FUKAUMI Naokifix proparties for dcdc-reg7 and nldo-reg3 regulators to match with vendor kernel[1].
---
Changes in v2:
- split from "arm64: dts: rockchip: fix pmic properties for Radxa ROCK 5C"
--- arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +2 -2
@@ -660,7 +660,6 @@ vcc_2v0_pldo_s3: dcdc-reg7 { regulator-boot-on; regulator-min-microvolt = <2000000>; regulator-max-microvolt = <2000000>; - regulator-ramp-delay = <12500>; regulator-state-mem { regulator-on-in-suspend;
@@ -814,7 +813,8 @@ vdda_0v75_s0: nldo-reg3 { regulator-max-microvolt = <750000>; regulator-state-mem { - regulator-off-in-suspend; + regulator-on-in-suspend; + regulator-suspend-microvolt = <750000>; }; };
Signature · 1 line
2.43.0
PATCH v2 5/9 arm64: dts: rockchip: add property for usbdp_phy0 for Radxa ROCK 5C
In reply to FUKAUMI Naokiadd rockchip,dp-lane-mux to usbdp_phy0.
---
Changes in v2:
- reword commit message
--- arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +1 -0
@@ -883,6 +883,7 @@ &uart2 { }; &usbdp_phy0 { + rockchip,dp-lane-mux = <2 3>; status = "okay"; };
Signature · 1 line
2.43.0
PATCH v2 6/9 arm64: dts: rockchip: fix property for pwm-fan for Radxa ROCK 5C
In reply to FUKAUMI Naokifix pwm period to match with vendor kernel[1].
---
Changes in v2:
- reword commit message
--- arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +1 -1
@@ -73,7 +73,7 @@ fan { #cooling-cells = <2>; cooling-levels = <0 64 128 192 255>; fan-supply = <&vcc_5v0>; - pwms = <&pwm3 0 10000 0>; + pwms = <&pwm3 0 60000 0>; }; pcie2x1l2_3v3: regulator-pcie2x1l2-3v3 {
Signature · 1 line
2.43.0
PATCH v2 7/9 arm64: dts: rockchip: rename regulator for pcie2x1l2 for Radxa ROCK 5C
In reply to FUKAUMI Naokiuse better name. no functional change is intended.
---
Changes in v2:
- new
--- arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +3 -3
@@ -76,13 +76,13 @@ fan { pwms = <&pwm3 0 60000 0>; }; - pcie2x1l2_3v3: regulator-pcie2x1l2-3v3 { + vcc3v3_pcie2x1l2: regulator-vcc3v3_pcie2x1l2 { compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pow_en>; - regulator-name = "pcie2x1l2_3v3"; + regulator-name = "vcc3v3_pcie2x1l2"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; vin-supply = <&vcc_sysin>;
@@ -423,7 +423,7 @@ &pcie2x1l2 { <&pcie20x1m0_clkreqn>, <&pcie20x1m0_waken>; reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&pcie2x1l2_3v3>; + vpcie3v3-supply = <&vcc3v3_pcie2x1l2>; status = "okay"; };
Signature · 1 line
2.43.0
PATCH v2 8/9 arm64: dts: rockchip: remove RTC and related node for Radxa ROCK 5C
In reply to FUKAUMI NaokiRTC doesn't exist on actual board. remove it.
---
Changes in v2:
- new
--- .../boot/dts/rockchip/rk3588s-rock-5c.dts | 23 ------------------- 1 file changed, 23 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +0 -23
@@ -350,23 +350,6 @@ regulator-state-mem { }; }; -&i2c5 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c5m2_xfer>; - status = "okay"; - - rtc@51 { - compatible = "haoyu,hym8563"; - reg = <0x51>; - #clock-cells = <0>; - clock-output-names = "rtcic_32kout"; - interrupt-parent = <&gpio0>; - interrupts = <RK_PB0 IRQ_TYPE_LEVEL_LOW>; - pinctrl-names = "default"; - pinctrl-0 = <&rtc_int_l>; - }; -}; - &i2c7 { status = "okay";
@@ -451,12 +434,6 @@ pow_en: pow-en { }; }; - rtc { - rtc_int_l: rtc-int-l { - rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - usb { usb_host_pwren_h: usb-host-pwren-h { rockchip,pins = <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
Signature · 1 line
2.43.0
PATCH v2 9/9 arm64: dts: rockchip: sort nodes for Radxa ROCK 5C
In reply to FUKAUMI Naokisort nodes alphanumerically.
---
Changes in v2:
- new
--- .../boot/dts/rockchip/rk3588s-rock-5c.dts | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +14 -14
@@ -36,6 +36,14 @@ analog-sound { "Headphone", "Headphones"; }; + fan { + compatible = "pwm-fan"; + #cooling-cells = <2>; + cooling-levels = <0 64 128 192 255>; + fan-supply = <&vcc_5v0>; + pwms = <&pwm3 0 60000 0>; + }; + hdmi0-con { compatible = "hdmi-connector"; type = "a";
@@ -68,14 +76,6 @@ led-1 { }; }; - fan { - compatible = "pwm-fan"; - #cooling-cells = <2>; - cooling-levels = <0 64 128 192 255>; - fan-supply = <&vcc_5v0>; - pwms = <&pwm3 0 60000 0>; - }; - vcc3v3_pcie2x1l2: regulator-vcc3v3_pcie2x1l2 { compatible = "regulator-fixed"; enable-active-high;
@@ -859,11 +859,6 @@ &uart2 { status = "okay"; }; -&usbdp_phy0 { - rockchip,dp-lane-mux = <2 3>; - status = "okay"; -}; - &usb_host0_ehci { status = "okay"; };
@@ -885,7 +880,8 @@ &usb_host2_xhci { status = "okay"; }; -&vop_mmu { +&usbdp_phy0 { + rockchip,dp-lane-mux = <2 3>; status = "okay"; };
@@ -893,6 +889,10 @@ &vop { status = "okay"; }; +&vop_mmu { + status = "okay"; +}; + &vp0 { vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { reg = <ROCKCHIP_VOP2_EP_HDMI0>;
Signature · 1 line
2.43.0