arm64: dts: rockchip: sync dts with schematic for Radxa ROCK 5B
Subsystems (2)
cover arm64: dts: rockchip: sync dts with schematic for Radxa ROCK 5B
this patch series fixes regulators, pmic, pwm-fan, and rtc to match with schematic[1]. some missing info is taken from vendor kernel[2].
in addition to above, convert heartbeat LED to "pwm-led" to control brightness.
this patch series depend on following patch:
"arm64: dts: rockchip: rename rfkill label for Radxa ROCK 5B"
https://patchwork.kernel.org/project/linux-rockchip/patch/[email protected]/
[1] https://dl.radxa.com/rock5/5b/docs/hw/radxa_rock_5b_v1450_schematic.pdf
[2] https://github.com/radxa/kernel
FUKAUMI Naoki (6):
arm64: dts: rockchip: fix regulators for Radxa ROCK 5B
arm64: dts: rockchip: add regulator for NPU for Radxa ROCK 5B
arm64: dts: rockchip: fix pmic regulators for Radxa ROCK 5B
arm64: dts: rockchip: convert leds node to "pwm-led" for Radxa ROCK 5B
arm64: dts: rockchip: fix pwm-fan node for Radxa ROCK 5B
arm64: dts: rockchip: fix rtc node for Radxa ROCK 5B
.../boot/dts/rockchip/rk3588-rock-5b.dts | 247 ++++++++++-------- 1 file changed, 138 insertions(+), 109 deletions(-)
Signature · 7 lines
2.43.0 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH 1/6 arm64: dts: rockchip: fix regulators for Radxa ROCK 5B
fix regulator and pin names to match with schematic. regulator for USB ports are unnamed, so I referred schematic for Radxa ROCK 5B+.
add missing "typec_vin" and "vcc4v0_sys" regulator, and add missing "phy-supply" for "pcie30phy" and "u2phy1_otg". remove now unused and non-existent "vcc3v3_pcie2x1l2" regulator.
remove "regulator-always-on" and "regulator-boot-on" from regulators which is turned on by consumer.
--- .../boot/dts/rockchip/rk3588-rock-5b.dts | 106 ++++++++++-------- 1 file changed, 57 insertions(+), 49 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +57 -49
@@ -84,54 +84,59 @@ rfkill-bt { shutdown-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; }; - vcc3v3_pcie2x1l0: regulator-vcc3v3-pcie2x1l0 { + typec_vin: regulator-typec-vin { compatible = "regulator-fixed"; - enable-active-high; - gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&pcie2_0_vcc3v3_en>; - regulator-name = "vcc3v3_pcie2x1l0"; + regulator-name = "typec_vin"; regulator-always-on; regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - startup-delay-us = <50000>; - vin-supply = <&vcc5v0_sys>; }; - vcc3v3_pcie2x1l2: regulator-vcc3v3-pcie2x1l2 { + vcc3v3_wf: regulator-vcc3v3-wf { compatible = "regulator-fixed"; - regulator-name = "vcc3v3_pcie2x1l2"; + enable-active-high; + gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&ekey_en>; + regulator-name = "vcc3v3_wf"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - startup-delay-us = <5000>; - vin-supply = <&vcc_3v3_s3>; + startup-delay-us = <50000>; + vin-supply = <&vcc5v0_sys>; }; - vcc3v3_pcie30: regulator-vcc3v3-pcie30 { + /* pi6c pcie clock generator */ + vcc3v3_pi6c_05: vcc3v3_pcie30: regulator-vcc3v3-pi6c-05 { compatible = "regulator-fixed"; enable-active-high; gpios = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; - pinctrl-0 = <&pcie3_vcc3v3_en>; - regulator-name = "vcc3v3_pcie30"; + pinctrl-0 = <&pcie30x4_pwren_h>; + regulator-name = "vcc3v3_pi6c_05"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; startup-delay-us = <5000>; vin-supply = <&vcc5v0_sys>; }; - vcc5v0_host: regulator-vcc5v0-host { + vcc4v0_sys: regulator-vcc4v0-sys { compatible = "regulator-fixed"; - regulator-name = "vcc5v0_host"; - regulator-boot-on; + regulator-name = "vcc4v0_sys"; regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <4000000>; + regulator-max-microvolt = <4000000>; + vin-supply = <&vcc5v0_sys>; + }; + + vcc5v_usb: regulator-vcc5v-usb { + compatible = "regulator-fixed"; + regulator-name = "vcc5v_usb"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; enable-active-high; gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; - pinctrl-0 = <&vcc5v0_host_en>; + pinctrl-0 = <&usb_host_pwren_h>; vin-supply = <&vcc5v0_sys>; };
@@ -142,6 +147,7 @@ vcc5v0_sys: regulator-vcc5v0-sys { regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; + vin-supply = <&typec_vin>; }; vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
@@ -151,7 +157,7 @@ vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 { regulator-boot-on; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; - vin-supply = <&vcc5v0_sys>; + vin-supply = <&vcc4v0_sys>; }; };
@@ -239,7 +245,7 @@ vdd_cpu_big0_s0: regulator@42 { regulator-min-microvolt = <550000>; regulator-max-microvolt = <1050000>; regulator-ramp-delay = <2300>; - vin-supply = <&vcc5v0_sys>; + vin-supply = <&vcc4v0_sys>; regulator-state-mem { regulator-off-in-suspend;
@@ -256,7 +262,7 @@ vdd_cpu_big1_s0: regulator@43 { regulator-min-microvolt = <550000>; regulator-max-microvolt = <1050000>; regulator-ramp-delay = <2300>; - vin-supply = <&vcc5v0_sys>; + vin-supply = <&vcc4v0_sys>; regulator-state-mem { regulator-off-in-suspend;
@@ -350,27 +356,28 @@ map1 { &pcie2x1l0 { pinctrl-names = "default"; - pinctrl-0 = <&pcie2_0_rst>; + pinctrl-0 = <&pcie30x1_0_perstn_m1_l>; reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_pcie2x1l0>; + vpcie3v3-supply = <&vcc3v3_wf>; status = "okay"; }; &pcie2x1l2 { pinctrl-names = "default"; - pinctrl-0 = <&pcie2_2_rst>; + pinctrl-0 = <&pcie_perst_l>; reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_pcie2x1l2>; + vpcie3v3-supply = <&vcc_3v3_s3>; status = "okay"; }; &pcie30phy { + phy-supply = <&vcc3v3_pi6c_05>; status = "okay"; }; &pcie3x4 { pinctrl-names = "default"; - pinctrl-0 = <&pcie3_rst>; + pinctrl-0 = <&pcie30x4_perstn_m1_l>; reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; vpcie3v3-supply = <&vcc3v3_pcie30>; status = "okay";
@@ -396,31 +403,31 @@ hp_detect: hp-detect { }; pcie2 { - pcie2_0_rst: pcie2-0-rst { + pcie30x1_0_perstn_m1_l: pcie30x1-0-perstn-m1-l { rockchip,pins = <4 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; }; - pcie2_0_vcc3v3_en: pcie2-0-vcc-en { + ekey_en: ekey-en { rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; }; - pcie2_2_rst: pcie2-2-rst { + pcie_perst_l: pcie-perst-l { rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; }; pcie3 { - pcie3_rst: pcie3-rst { + pcie30x4_perstn_m1_l: pcie30x4-perstn-m1-l { rockchip,pins = <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; }; - pcie3_vcc3v3_en: pcie3-vcc3v3-en { + pcie30x4_pwren_h: pcie30x4-pwren-h { rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; }; }; usb { - vcc5v0_host_en: vcc5v0-host-en { + usb_host_pwren_h: usb-host-pwren-h { rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; };
@@ -474,7 +481,7 @@ &sdio { sd-uhs-sdr25; sd-uhs-sdr50; sd-uhs-sdr104; - vmmc-supply = <&vcc3v3_pcie2x1l0>; + vmmc-supply = <&vcc3v3_wf>; vqmmc-supply = <&vcc_1v8_s3>; pinctrl-names = "default"; pinctrl-0 = <&sdiom0_pins>;
@@ -523,21 +530,21 @@ pmic@0 { system-power-controller; - vcc1-supply = <&vcc5v0_sys>; - vcc2-supply = <&vcc5v0_sys>; - vcc3-supply = <&vcc5v0_sys>; - vcc4-supply = <&vcc5v0_sys>; - vcc5-supply = <&vcc5v0_sys>; - vcc6-supply = <&vcc5v0_sys>; - vcc7-supply = <&vcc5v0_sys>; - vcc8-supply = <&vcc5v0_sys>; - vcc9-supply = <&vcc5v0_sys>; - vcc10-supply = <&vcc5v0_sys>; + vcc1-supply = <&vcc4v0_sys>; + vcc2-supply = <&vcc4v0_sys>; + vcc3-supply = <&vcc4v0_sys>; + vcc4-supply = <&vcc4v0_sys>; + vcc5-supply = <&vcc4v0_sys>; + vcc6-supply = <&vcc4v0_sys>; + vcc7-supply = <&vcc4v0_sys>; + vcc8-supply = <&vcc4v0_sys>; + vcc9-supply = <&vcc4v0_sys>; + vcc10-supply = <&vcc4v0_sys>; vcc11-supply = <&vcc_2v0_pldo_s3>; - vcc12-supply = <&vcc5v0_sys>; + vcc12-supply = <&vcc4v0_sys>; vcc13-supply = <&vcc_1v1_nldo_s3>; vcc14-supply = <&vcc_1v1_nldo_s3>; - vcca-supply = <&vcc5v0_sys>; + vcca-supply = <&vcc4v0_sys>; gpio-controller; #gpio-cells = <2>;
@@ -840,6 +847,7 @@ &u2phy1 { }; &u2phy1_otg { + phy-supply = <&vcc5v_usb>; status = "okay"; };
@@ -858,7 +866,7 @@ &u2phy3 { }; &u2phy3_host { - phy-supply = <&vcc5v0_host>; + phy-supply = <&vcc5v_usb>; status = "okay"; };
Signature · 7 lines
2.43.0 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH 2/6 arm64: dts: rockchip: add regulator for NPU for Radxa ROCK 5B
In reply to FUKAUMI Naokiadd "vdd_vpu_s0" regulator for NPU.
--- .../boot/dts/rockchip/rk3588-rock-5b.dts | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+)
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +23 -0
@@ -270,6 +270,29 @@ regulator-state-mem { }; }; +&i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1m2_xfer>; + status = "okay"; + + vdd_npu_s0: regulator@42 { + compatible = "rockchip,rk8602"; + reg = <0x42>; + fcs,suspend-voltage-selector = <1>; + regulator-name = "vdd_npu_s0"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <550000>; + regulator-max-microvolt = <950000>; + regulator-ramp-delay = <2300>; + vin-supply = <&vcc4v0_sys>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; +}; + &i2c6 { status = "okay";
Signature · 7 lines
2.43.0 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH 3/6 arm64: dts: rockchip: fix pmic regulators for Radxa ROCK 5B
In reply to FUKAUMI Naokifix regulator names to match with schematic. fix properties to match with vendor kernel.
--- .../boot/dts/rockchip/rk3588-rock-5b.dts | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +40 -40
@@ -461,7 +461,7 @@ &pwm1 { }; &saradc { - vref-supply = <&avcc_1v8_s0>; + vref-supply = <&vcca_1v8_s0>; status = "okay"; };
@@ -588,12 +588,12 @@ rk806_dvs3_null: dvs3-null-pins { }; regulators { - vdd_gpu_s0: vdd_gpu_mem_s0: dcdc-reg1 { + vdd_gpu_s0: dcdc-reg1 { + regulator-name = "vdd_gpu_s0"; regulator-boot-on; regulator-min-microvolt = <550000>; regulator-max-microvolt = <950000>; regulator-ramp-delay = <12500>; - regulator-name = "vdd_gpu_s0"; regulator-enable-ramp-delay = <400>; regulator-state-mem {
@@ -601,13 +601,13 @@ regulator-state-mem { }; }; - vdd_cpu_lit_s0: vdd_cpu_lit_mem_s0: dcdc-reg2 { + vdd_cpu_lit_s0: dcdc-reg2 { + regulator-name = "vdd_cpu_lit_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <550000>; regulator-max-microvolt = <950000>; regulator-ramp-delay = <12500>; - regulator-name = "vdd_cpu_lit_s0"; regulator-state-mem { regulator-off-in-suspend;
@@ -615,26 +615,26 @@ regulator-state-mem { }; vdd_log_s0: dcdc-reg3 { + regulator-name = "vdd_log_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <675000>; regulator-max-microvolt = <750000>; regulator-ramp-delay = <12500>; - regulator-name = "vdd_log_s0"; regulator-state-mem { - regulator-off-in-suspend; + regulator-on-in-suspend; regulator-suspend-microvolt = <750000>; }; }; - vdd_vdenc_s0: vdd_vdenc_mem_s0: dcdc-reg4 { + vdd_vdenc_s0: dcdc-reg4 { + regulator-name = "vdd_vdenc_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <550000>; regulator-max-microvolt = <950000>; regulator-ramp-delay = <12500>; - regulator-name = "vdd_vdenc_s0"; regulator-state-mem { regulator-off-in-suspend;
@@ -642,12 +642,12 @@ regulator-state-mem { }; vdd_ddr_s0: dcdc-reg5 { + regulator-name = "vdd_ddr_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <675000>; regulator-max-microvolt = <900000>; regulator-ramp-delay = <12500>; - regulator-name = "vdd_ddr_s0"; regulator-state-mem { regulator-off-in-suspend;
@@ -656,9 +656,9 @@ regulator-state-mem { }; vdd2_ddr_s3: dcdc-reg6 { + regulator-name = "vdd2_ddr_s3"; regulator-always-on; regulator-boot-on; - regulator-name = "vdd2_ddr_s3"; regulator-state-mem { regulator-on-in-suspend;
@@ -666,12 +666,11 @@ regulator-state-mem { }; vcc_2v0_pldo_s3: dcdc-reg7 { + regulator-name = "vcc_2v0_pldo_s3"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <2000000>; regulator-max-microvolt = <2000000>; - regulator-ramp-delay = <12500>; - regulator-name = "vdd_2v0_pldo_s3"; regulator-state-mem { regulator-on-in-suspend;
@@ -680,11 +679,11 @@ regulator-state-mem { }; vcc_3v3_s3: dcdc-reg8 { + regulator-name = "vcc_3v3_s3"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - regulator-name = "vcc_3v3_s3"; regulator-state-mem { regulator-on-in-suspend;
@@ -693,9 +692,9 @@ regulator-state-mem { }; vddq_ddr_s0: dcdc-reg9 { + regulator-name = "vddq_ddr_s0"; regulator-always-on; regulator-boot-on; - regulator-name = "vddq_ddr_s0"; regulator-state-mem { regulator-off-in-suspend;
@@ -703,11 +702,11 @@ regulator-state-mem { }; vcc_1v8_s3: dcdc-reg10 { + regulator-name = "vcc_1v8_s3"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - regulator-name = "vcc_1v8_s3"; regulator-state-mem { regulator-on-in-suspend;
@@ -715,63 +714,63 @@ regulator-state-mem { }; }; - avcc_1v8_s0: pldo-reg1 { + vcca_1v8_s0: pldo-reg1 { + regulator-name = "vcca_1v8_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - regulator-name = "avcc_1v8_s0"; regulator-state-mem { - regulator-off-in-suspend; + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; }; }; vcc_1v8_s0: pldo-reg2 { + regulator-name = "vcc_1v8_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - regulator-name = "vcc_1v8_s0"; regulator-state-mem { - regulator-off-in-suspend; + regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; }; }; - avdd_1v2_s0: pldo-reg3 { + vdda_1v2_s0: pldo-reg3 { + regulator-name = "vdda_1v2_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; - regulator-name = "avdd_1v2_s0"; regulator-state-mem { regulator-off-in-suspend; }; }; - vcc_3v3_s0: pldo-reg4 { + vcca_3v3_s0: pldo-reg4 { + regulator-name = "vcca_3v3_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - regulator-ramp-delay = <12500>; - regulator-name = "vcc_3v3_s0"; regulator-state-mem { - regulator-off-in-suspend; + regulator-on-in-suspend; + regulator-suspend-microvolt = <3300000>; }; }; vccio_sd_s0: pldo-reg5 { + regulator-name = "vccio_sd_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; - regulator-ramp-delay = <12500>; - regulator-name = "vccio_sd_s0"; regulator-state-mem { regulator-off-in-suspend;
@@ -779,11 +778,11 @@ regulator-state-mem { }; pldo6_s3: pldo-reg6 { + regulator-name = "pldo6_s3"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - regulator-name = "pldo6_s3"; regulator-state-mem { regulator-on-in-suspend;
@@ -792,11 +791,11 @@ regulator-state-mem { }; vdd_0v75_s3: nldo-reg1 { + regulator-name = "vdd_0v75_s3"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <750000>; regulator-max-microvolt = <750000>; - regulator-name = "vdd_0v75_s3"; regulator-state-mem { regulator-on-in-suspend;
@@ -804,37 +803,38 @@ regulator-state-mem { }; }; - vdd_ddr_pll_s0: nldo-reg2 { + vdda_ddr_pll_s0: nldo-reg2 { + regulator-name = "vdda_ddr_pll_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <850000>; regulator-max-microvolt = <850000>; - regulator-name = "vdd_ddr_pll_s0"; regulator-state-mem { - regulator-off-in-suspend; + regulator-on-in-suspend; regulator-suspend-microvolt = <850000>; }; }; - avdd_0v75_s0: nldo-reg3 { + vdda_0v75_s0: nldo-reg3 { + regulator-name = "vdda_0v75_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <750000>; regulator-max-microvolt = <750000>; - regulator-name = "avdd_0v75_s0"; regulator-state-mem { - regulator-off-in-suspend; + regulator-on-in-suspend; + regulator-suspend-microvolt = <750000>; }; }; - vdd_0v85_s0: nldo-reg4 { + vdda_0v85_s0: nldo-reg4 { + regulator-name = "vdda_0v85_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <850000>; regulator-max-microvolt = <850000>; - regulator-name = "vdd_0v85_s0"; regulator-state-mem { regulator-off-in-suspend;
@@ -842,11 +842,11 @@ regulator-state-mem { }; vdd_0v75_s0: nldo-reg5 { + regulator-name = "vdd_0v75_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <750000>; regulator-max-microvolt = <750000>; - regulator-name = "vdd_0v75_s0"; regulator-state-mem { regulator-off-in-suspend;
Signature · 7 lines
2.43.0 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH 4/6 arm64: dts: rockchip: convert leds node to "pwm-led" for Radxa ROCK 5B
In reply to FUKAUMI Naokiconvert heartbeat LED to use "pwm-led" to control birghtness. also, define default-state = "on" to match with U-Boot.
--- .../boot/dts/rockchip/rk3588-rock-5b.dts | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +10 -12
@@ -50,15 +50,15 @@ hdmi0_con_in: endpoint { }; leds { - compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&led_rgb_b>; + compatible = "pwm-leds"; - led_rgb_b { - function = LED_FUNCTION_STATUS; + led-0 { color = <LED_COLOR_ID_BLUE>; - gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; + default-state = "on"; + function = LED_FUNCTION_STATUS; linux,default-trigger = "heartbeat"; + pwms = <&pwm0 0 1000000 0>; + max-brightness = <255>; }; };
@@ -413,12 +413,6 @@ hym8563_int: hym8563-int { }; }; - leds { - led_rgb_b: led-rgb-b { - rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - sound { hp_detect: hp-detect { rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -456,6 +450,10 @@ usb_host_pwren_h: usb-host-pwren-h { }; }; +&pwm0 { + status = "okay"; +}; + &pwm1 { status = "okay"; };
Signature · 7 lines
2.43.0 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH 5/6 arm64: dts: rockchip: fix pwm-fan node for Radxa ROCK 5B
In reply to FUKAUMI Naokifix properties to match with vendor kernel.
--- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +3 -3
@@ -64,10 +64,10 @@ led-0 { fan: pwm-fan { compatible = "pwm-fan"; - cooling-levels = <0 120 150 180 210 240 255>; - fan-supply = <&vcc5v0_sys>; - pwms = <&pwm1 0 50000 0>; #cooling-cells = <2>; + cooling-levels = <0 64 128 192 255>; + fan-supply = <&vcc5v0_sys>; + pwms = <&pwm1 0 60000 0>; }; rfkill {
Signature · 7 lines
2.43.0 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH 5/6] arm64: dts: rockchip: fix pwm-fan node for Radxa ROCK 5B
Hi Naoki,
Quoted 13 lines · FUKAUMI Naoki
fix properties to match with vendor kernel.
Signed-off-by FUKAUMI Naoki <[email protected]>--- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +0
-0
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts led-0 { · line 68
Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +1
-3@@ -64,10 +64,10 @@ led-0 { fan: pwm-fan { compatible = "pwm-fan"; - cooling-levels = <0 120 150 180 210 240 255>; - fan-supply = <&vcc5v0_sys>; - pwms = <&pwm1 0 50000 0>; #cooling-cells = <2>; + cooling-levels = <0 64 128 192 255>;
Could you please share your testing setup for this part? In my experience using Radxa 4010 fan, it didn't spin up reliably below 120, so the value of 64 looks not helpful here.
Best regards,
Alexey
Re: [PATCH 5/6] arm64: dts: rockchip: fix pwm-fan node for Radxa ROCK 5B
Hi Alexey Charkov,
Quoted 17 lines · Alexey Charkov
Hi Naoki,
Quoted 14 lines · FUKAUMI Naoki
fix properties to match with vendor kernel.
Signed-off-by FUKAUMI Naoki <[email protected]>--- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +0
-0@@ -64,10 +64,10 @@ led-0 {
Quoted 11 lines
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts led-0 { · line 68
Quoted 7 lines
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +1
-3fan: pwm-fan { compatible = "pwm-fan"; - cooling-levels = <0 120 150 180 210 240 255>; - fan-supply = <&vcc5v0_sys>; - pwms = <&pwm1 0 50000 0>; #cooling-cells = <2>; + cooling-levels = <0 64 128 192 255>;Could you please share your testing setup for this part? In my experience using Radxa 4010 fan, it didn't spin up reliably below 120, so the value of 64 looks not helpful here.
I'm sorry, I have only 2513, it doesn't work on 5B with/without this patch. so I couldn't test this part. (btw I'll get 4012 soon)
then, thank you for your test report, I'll keep old value.
Best regards,
--
FUKAUMI Naoki
Radxa Computer (Shenzhen) Co., Ltd.
Quoted 3 lines
Best regards,
Alexey
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH 6/6 arm64: dts: rockchip: fix rtc node for Radxa ROCK 5B
In reply to FUKAUMI Naokifix pin names to match with schematic.
--- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +5 -5
@@ -300,11 +300,11 @@ hym8563: rtc@51 { compatible = "haoyu,hym8563"; reg = <0x51>; #clock-cells = <0>; - clock-output-names = "hym8563"; - pinctrl-names = "default"; - pinctrl-0 = <&hym8563_int>; + clock-output-names = "32kout_wifi"; interrupt-parent = <&gpio0>; interrupts = <RK_PB0 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&rtc_int_l>; wakeup-source; }; };
@@ -407,8 +407,8 @@ &pcie3x4 { }; &pinctrl { - hym8563 { - hym8563_int: hym8563-int { + rtc { + rtc_int_l: rtc-int-l { rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; };
Signature · 7 lines
2.43.0 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip