[PATCH 2/3] arm64: dts: rockchip: reorganise common rock5* nodes
Sebastian Reichel
sebastian.reichel at collabora.com
Fri May 9 06:13:11 PDT 2025
Hi,
On Fri, May 09, 2025 at 02:31:42PM +0200, Nicolas Frattaroli wrote:
> In preparation for the addition of a device tree for ROCK 5T, reorganise
> the already existing ROCK 5B and ROCK 5B+ device trees. All
> functionality shared between just 5B and 5B+ is moved into the shared
> rk3588-rock-5b.dtsi, whereas all nodes that will be shared with the ROCK
> 5T as well are now present in rk3588-rock-5b-5bp-5t.dtsi, which the
> former includes.
>
> Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli at collabora.com>
> ---
> .../boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi | 1012 ++++++++++++++++++++
> arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi | 1012 +-------------------
> 2 files changed, 1020 insertions(+), 1004 deletions(-)
This is why I send the first two patches separately in my ROCK 5B+
series and asked for them to be squashed. It's a pain to review it
the way you send it out :)
The good thing in your case is, that we are just moving things from
dtsi without involving a dts, so you can split it up in a bisectable
way:
patch 1:
- rename rk3588-rock-5b.dtsi to rk3588-rock-5b-5bp-5t.dtsi (no changes)
- change any include of rk3588-rock-5b.dtsi to rk3588-rock-5b-5bp-5t.dtsi
patch 2:
- create rk3588-rock-5b.dtsi and move over the relevant stuff from rk3588-rock-5b-5bp-5t.dtsi
- change back any include of rk3588-rock-5b-5bp-5t.dtsi to rk3588-rock-5b.dtsi
This is fully bisectable and will give you easy to review patches :)
Greetings,
-- Sebastian
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi
> new file mode 100644
> index 0000000000000000000000000000000000000000..f086f0ff9f65b514ba89f04f4614a6c0c6abefff
> --- /dev/null
> +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi
> @@ -0,0 +1,1012 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +
> +/dts-v1/;
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/leds/common.h>
> +#include <dt-bindings/soc/rockchip,vop2.h>
> +#include <dt-bindings/usb/pd.h>
> +#include "rk3588.dtsi"
> +
> +/ {
> + aliases {
> + mmc0 = &sdhci;
> + mmc1 = &sdmmc;
> + mmc2 = &sdio;
> + };
> +
> + chosen {
> + stdout-path = "serial2:1500000n8";
> + };
> +
> + hdmi0-con {
> + compatible = "hdmi-connector";
> + type = "a";
> +
> + port {
> + hdmi0_con_in: endpoint {
> + remote-endpoint = <&hdmi0_out_con>;
> + };
> + };
> + };
> +
> + hdmi1-con {
> + compatible = "hdmi-connector";
> + type = "a";
> +
> + port {
> + hdmi1_con_in: endpoint {
> + remote-endpoint = <&hdmi1_out_con>;
> + };
> + };
> + };
> +
> + 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>;
> + };
> +
> + rfkill-bt {
> + compatible = "rfkill-gpio";
> + label = "rfkill-m2-bt";
> + radio-type = "bluetooth";
> + shutdown-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
> + };
> +
> + vcc12v_dcin: regulator-vcc12v-dcin {
> + compatible = "regulator-fixed";
> + regulator-name = "vcc12v_dcin";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <12000000>;
> + regulator-max-microvolt = <12000000>;
> + };
> +
> + vcc3v3_pcie2x1l0: regulator-vcc3v3-pcie2x1l0 {
> + compatible = "regulator-fixed";
> + enable-active-high;
> + regulator-name = "vcc3v3_pcie2x1l0";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + startup-delay-us = <50000>;
> + vin-supply = <&vcc5v0_sys>;
> + status = "disabled";
> + };
> +
> + vcc3v3_pcie2x1l2: regulator-vcc3v3-pcie2x1l2 {
> + compatible = "regulator-fixed";
> + regulator-name = "vcc3v3_pcie2x1l2";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + startup-delay-us = <5000>;
> + vin-supply = <&vcc_3v3_s3>;
> + };
> +
> + vcc3v3_pcie30: regulator-vcc3v3-pcie30 {
> + 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";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + startup-delay-us = <5000>;
> + vin-supply = <&vcc5v0_sys>;
> + };
> +
> + vcc5v0_host: regulator-vcc5v0-host {
> + compatible = "regulator-fixed";
> + regulator-name = "vcc5v0_host";
> + regulator-boot-on;
> + regulator-always-on;
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + vin-supply = <&vcc5v0_sys>;
> + };
> +
> + vcc5v0_sys: regulator-vcc5v0-sys {
> + compatible = "regulator-fixed";
> + regulator-name = "vcc5v0_sys";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + vin-supply = <&vcc12v_dcin>;
> + };
> +
> + vbus5v0_typec: vbus5v0-typec {
> + compatible = "regulator-fixed";
> + enable-active-high;
> + gpio = <&gpio2 RK_PB6 GPIO_ACTIVE_HIGH>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&vbus5v0_typec_en>;
> + regulator-name = "vbus5v0_typec";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + vin-supply = <&vcc5v0_sys>;
> + };
> +
> + vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
> + compatible = "regulator-fixed";
> + regulator-name = "vcc_1v1_nldo_s3";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <1100000>;
> + regulator-max-microvolt = <1100000>;
> + vin-supply = <&vcc5v0_sys>;
> + };
> +};
> +
> +&combphy0_ps {
> + status = "okay";
> +};
> +
> +&combphy1_ps {
> + status = "okay";
> +};
> +
> +&combphy2_psu {
> + status = "okay";
> +};
> +
> +&cpu_b0 {
> + cpu-supply = <&vdd_cpu_big0_s0>;
> +};
> +
> +&cpu_b1 {
> + cpu-supply = <&vdd_cpu_big0_s0>;
> +};
> +
> +&cpu_b2 {
> + cpu-supply = <&vdd_cpu_big1_s0>;
> +};
> +
> +&cpu_b3 {
> + cpu-supply = <&vdd_cpu_big1_s0>;
> +};
> +
> +&cpu_l0 {
> + cpu-supply = <&vdd_cpu_lit_s0>;
> +};
> +
> +&cpu_l1 {
> + cpu-supply = <&vdd_cpu_lit_s0>;
> +};
> +
> +&cpu_l2 {
> + cpu-supply = <&vdd_cpu_lit_s0>;
> +};
> +
> +&cpu_l3 {
> + cpu-supply = <&vdd_cpu_lit_s0>;
> +};
> +
> +&gpu {
> + mali-supply = <&vdd_gpu_s0>;
> + status = "okay";
> +};
> +
> +&hdmi0 {
> + status = "okay";
> +};
> +
> +&hdmi0_in {
> + hdmi0_in_vp0: endpoint {
> + remote-endpoint = <&vp0_out_hdmi0>;
> + };
> +};
> +
> +&hdmi0_out {
> + hdmi0_out_con: endpoint {
> + remote-endpoint = <&hdmi0_con_in>;
> + };
> +};
> +
> +&hdmi0_sound {
> + status = "okay";
> +};
> +
> +&hdmi1 {
> + pinctrl-0 = <&hdmim0_tx1_cec &hdmim0_tx1_hpd
> + &hdmim1_tx1_scl &hdmim1_tx1_sda>;
> + status = "okay";
> +};
> +
> +&hdmi1_in {
> + hdmi1_in_vp1: endpoint {
> + remote-endpoint = <&vp1_out_hdmi1>;
> + };
> +};
> +
> +&hdmi1_out {
> + hdmi1_out_con: endpoint {
> + remote-endpoint = <&hdmi1_con_in>;
> + };
> +};
> +
> +&hdmi1_sound {
> + status = "okay";
> +};
> +
> +&hdmi_receiver_cma {
> + status = "okay";
> +};
> +
> +&hdmi_receiver {
> + pinctrl-0 = <&hdmim1_rx_cec &hdmim1_rx_hpdin &hdmim1_rx_scl &hdmim1_rx_sda &hdmirx_hpd>;
> + pinctrl-names = "default";
> +};
> +
> +&hdptxphy0 {
> + status = "okay";
> +};
> +
> +&hdptxphy1 {
> + status = "okay";
> +};
> +
> +&i2c0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&i2c0m2_xfer>;
> + status = "okay";
> +
> + vdd_cpu_big0_s0: regulator at 42 {
> + compatible = "rockchip,rk8602";
> + reg = <0x42>;
> + fcs,suspend-voltage-selector = <1>;
> + regulator-name = "vdd_cpu_big0_s0";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <550000>;
> + regulator-max-microvolt = <1050000>;
> + regulator-ramp-delay = <2300>;
> + vin-supply = <&vcc5v0_sys>;
> +
> + regulator-state-mem {
> + regulator-off-in-suspend;
> + };
> + };
> +
> + vdd_cpu_big1_s0: regulator at 43 {
> + compatible = "rockchip,rk8603", "rockchip,rk8602";
> + reg = <0x43>;
> + fcs,suspend-voltage-selector = <1>;
> + regulator-name = "vdd_cpu_big1_s0";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <550000>;
> + regulator-max-microvolt = <1050000>;
> + regulator-ramp-delay = <2300>;
> + vin-supply = <&vcc5v0_sys>;
> +
> + regulator-state-mem {
> + regulator-off-in-suspend;
> + };
> + };
> +};
> +
> +&i2c4 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&i2c4m1_xfer>;
> + status = "okay";
> +
> + usbc0: usb-typec at 22 {
> + compatible = "fcs,fusb302";
> + reg = <0x22>;
> + interrupt-parent = <&gpio3>;
> + interrupts = <RK_PB4 IRQ_TYPE_LEVEL_LOW>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&usbc0_int>;
> + vbus-supply = <&vbus5v0_typec>;
> + /*
> + * When the board is starting to send power-delivery messages
> + * too late (5 seconds according to the specification), the
> + * power-supply reacts with a hard-reset. That removes the
> + * power from VBUS for some time, which resets te whole board.
> + */
> + status = "fail";
> +
> + usb_con: connector {
> + compatible = "usb-c-connector";
> + label = "USB-C";
> + data-role = "dual";
> + power-role = "sink";
> + try-power-role = "sink";
> + op-sink-microwatt = <1000000>;
> + sink-pdos =
> + <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>,
> + <PDO_VAR(5000, 20000, 5000)>;
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port at 0 {
> + reg = <0>;
> + usbc0_role_sw: endpoint {
> + remote-endpoint = <&dwc3_0_role_switch>;
> + };
> + };
> +
> + port at 1 {
> + reg = <1>;
> + usbc0_orien_sw: endpoint {
> + remote-endpoint = <&usbdp_phy0_orientation_switch>;
> + };
> + };
> +
> + port at 2 {
> + reg = <2>;
> + dp_altmode_mux: endpoint {
> + remote-endpoint = <&usbdp_phy0_dp_altmode_mux>;
> + };
> + };
> + };
> + };
> + };
> +};
> +
> +&i2c6 {
> + status = "okay";
> +
> + hym8563: rtc at 51 {
> + compatible = "haoyu,hym8563";
> + reg = <0x51>;
> + #clock-cells = <0>;
> + clock-output-names = "hym8563";
> + pinctrl-names = "default";
> + pinctrl-0 = <&hym8563_int>;
> + interrupt-parent = <&gpio0>;
> + interrupts = <RK_PB0 IRQ_TYPE_LEVEL_LOW>;
> + wakeup-source;
> + };
> +};
> +
> +&i2c7 {
> + status = "okay";
> +
> + es8316: audio-codec at 11 {
> + compatible = "everest,es8316";
> + reg = <0x11>;
> + clocks = <&cru I2S0_8CH_MCLKOUT>;
> + clock-names = "mclk";
> + assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;
> + assigned-clock-rates = <12288000>;
> + #sound-dai-cells = <0>;
> +
> + port {
> + es8316_p0_0: endpoint {
> + remote-endpoint = <&i2s0_8ch_p0_0>;
> + };
> + };
> + };
> +};
> +
> +&i2s0_8ch {
> + pinctrl-names = "default";
> + pinctrl-0 = <&i2s0_lrck
> + &i2s0_mclk
> + &i2s0_sclk
> + &i2s0_sdi0
> + &i2s0_sdo0>;
> + status = "okay";
> +
> + i2s0_8ch_p0: port {
> + i2s0_8ch_p0_0: endpoint {
> + dai-format = "i2s";
> + mclk-fs = <256>;
> + remote-endpoint = <&es8316_p0_0>;
> + };
> + };
> +};
> +
> +&i2s5_8ch {
> + status = "okay";
> +};
> +
> +&i2s6_8ch {
> + status = "okay";
> +};
> +
> +&package_thermal {
> + polling-delay = <1000>;
> +
> + trips {
> + package_fan0: package-fan0 {
> + temperature = <55000>;
> + hysteresis = <2000>;
> + type = "active";
> + };
> +
> + package_fan1: package-fan1 {
> + temperature = <65000>;
> + hysteresis = <2000>;
> + type = "active";
> + };
> + };
> +
> + cooling-maps {
> + map0 {
> + trip = <&package_fan0>;
> + cooling-device = <&fan THERMAL_NO_LIMIT 1>;
> + };
> +
> + map1 {
> + trip = <&package_fan1>;
> + cooling-device = <&fan 2 THERMAL_NO_LIMIT>;
> + };
> + };
> +};
> +
> +&pcie2x1l0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pcie2_0_rst>;
> + reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
> + vpcie3v3-supply = <&vcc3v3_pcie2x1l0>;
> + status = "okay";
> +};
> +
> +&pcie2x1l2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pcie2_2_rst>;
> + reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_HIGH>;
> + vpcie3v3-supply = <&vcc3v3_pcie2x1l2>;
> + status = "okay";
> +};
> +
> +&pcie30phy {
> + status = "okay";
> +};
> +
> +&pcie3x4 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pcie3_rst>;
> + reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
> + vpcie3v3-supply = <&vcc3v3_pcie30>;
> + status = "okay";
> +};
> +
> +&pd_gpu {
> + domain-supply = <&vdd_gpu_s0>;
> +};
> +
> +&pinctrl {
> + hym8563 {
> + hym8563_int: hym8563-int {
> + rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> + };
> +
> + pcie2 {
> + pcie2_0_rst: pcie2-0-rst {
> + rockchip,pins = <4 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> +
> + pcie2_2_rst: pcie2-2-rst {
> + rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> + };
> +
> + pcie3 {
> + pcie3_rst: pcie3-rst {
> + rockchip,pins = <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> +
> + pcie3_vcc3v3_en: pcie3-vcc3v3-en {
> + rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> + };
> +
> + usb {
> + usbc0_int: usbc0-int {
> + rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> +
> + vbus5v0_typec_en: vbus5v0-typec-en {
> + rockchip,pins = <2 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> + };
> +};
> +
> +&pwm1 {
> + status = "okay";
> +};
> +
> +&saradc {
> + vref-supply = <&avcc_1v8_s0>;
> + status = "okay";
> +};
> +
> +&sdhci {
> + bus-width = <8>;
> + no-sdio;
> + no-sd;
> + non-removable;
> + mmc-hs400-1_8v;
> + mmc-hs400-enhanced-strobe;
> + status = "okay";
> +};
> +
> +&sdmmc {
> + max-frequency = <200000000>;
> + no-sdio;
> + no-mmc;
> + bus-width = <4>;
> + cap-mmc-highspeed;
> + cap-sd-highspeed;
> + cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
> + disable-wp;
> + sd-uhs-sdr104;
> + vmmc-supply = <&vcc_3v3_s3>;
> + vqmmc-supply = <&vccio_sd_s0>;
> + status = "okay";
> +};
> +
> +&sfc {
> + pinctrl-names = "default";
> + pinctrl-0 = <&fspim2_pins>;
> + status = "okay";
> +
> + flash at 0 {
> + compatible = "jedec,spi-nor";
> + reg = <0>;
> + spi-max-frequency = <104000000>;
> + spi-rx-bus-width = <4>;
> + spi-tx-bus-width = <1>;
> + vcc-supply = <&vcc_3v3_s3>;
> + };
> +};
> +
> +&spi2 {
> + status = "okay";
> + assigned-clocks = <&cru CLK_SPI2>;
> + assigned-clock-rates = <200000000>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>;
> + num-cs = <1>;
> +
> + pmic at 0 {
> + compatible = "rockchip,rk806";
> + spi-max-frequency = <1000000>;
> + reg = <0x0>;
> +
> + interrupt-parent = <&gpio0>;
> + interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>,
> + <&rk806_dvs2_null>, <&rk806_dvs3_null>;
> +
> + 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>;
> + vcc11-supply = <&vcc_2v0_pldo_s3>;
> + vcc12-supply = <&vcc5v0_sys>;
> + vcc13-supply = <&vcc_1v1_nldo_s3>;
> + vcc14-supply = <&vcc_1v1_nldo_s3>;
> + vcca-supply = <&vcc5v0_sys>;
> +
> + gpio-controller;
> + #gpio-cells = <2>;
> +
> + rk806_dvs1_null: dvs1-null-pins {
> + pins = "gpio_pwrctrl1";
> + function = "pin_fun0";
> + };
> +
> + rk806_dvs2_null: dvs2-null-pins {
> + pins = "gpio_pwrctrl2";
> + function = "pin_fun0";
> + };
> +
> + rk806_dvs3_null: dvs3-null-pins {
> + pins = "gpio_pwrctrl3";
> + function = "pin_fun0";
> + };
> +
> + regulators {
> + vdd_gpu_s0: vdd_gpu_mem_s0: dcdc-reg1 {
> + 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 {
> + regulator-off-in-suspend;
> + };
> + };
> +
> + vdd_cpu_lit_s0: vdd_cpu_lit_mem_s0: dcdc-reg2 {
> + 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;
> + };
> + };
> +
> + vdd_log_s0: dcdc-reg3 {
> + 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-suspend-microvolt = <750000>;
> + };
> + };
> +
> + vdd_vdenc_s0: vdd_vdenc_mem_s0: dcdc-reg4 {
> + 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;
> + };
> + };
> +
> + vdd_ddr_s0: dcdc-reg5 {
> + 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;
> + regulator-suspend-microvolt = <850000>;
> + };
> + };
> +
> + vdd2_ddr_s3: dcdc-reg6 {
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-name = "vdd2_ddr_s3";
> +
> + regulator-state-mem {
> + regulator-on-in-suspend;
> + };
> + };
> +
> + vcc_2v0_pldo_s3: dcdc-reg7 {
> + 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;
> + regulator-suspend-microvolt = <2000000>;
> + };
> + };
> +
> + vcc_3v3_s3: dcdc-reg8 {
> + 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;
> + regulator-suspend-microvolt = <3300000>;
> + };
> + };
> +
> + vddq_ddr_s0: dcdc-reg9 {
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-name = "vddq_ddr_s0";
> +
> + regulator-state-mem {
> + regulator-off-in-suspend;
> + };
> + };
> +
> + vcc_1v8_s3: dcdc-reg10 {
> + 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;
> + regulator-suspend-microvolt = <1800000>;
> + };
> + };
> +
> + avcc_1v8_s0: pldo-reg1 {
> + 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;
> + };
> + };
> +
> + vcc_1v8_s0: pldo-reg2 {
> + 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-suspend-microvolt = <1800000>;
> + };
> + };
> +
> + avdd_1v2_s0: pldo-reg3 {
> + 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 {
> + 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;
> + };
> + };
> +
> + vccio_sd_s0: pldo-reg5 {
> + 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;
> + };
> + };
> +
> + pldo6_s3: pldo-reg6 {
> + 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;
> + regulator-suspend-microvolt = <1800000>;
> + };
> + };
> +
> + vdd_0v75_s3: nldo-reg1 {
> + 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;
> + regulator-suspend-microvolt = <750000>;
> + };
> + };
> +
> + vdd_ddr_pll_s0: nldo-reg2 {
> + 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-suspend-microvolt = <850000>;
> + };
> + };
> +
> + avdd_0v75_s0: nldo-reg3 {
> + 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;
> + };
> + };
> +
> + vdd_0v85_s0: nldo-reg4 {
> + 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;
> + };
> + };
> +
> + vdd_0v75_s0: nldo-reg5 {
> + 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;
> + };
> + };
> + };
> + };
> +};
> +
> +&tsadc {
> + status = "okay";
> +};
> +
> +&uart2 {
> + pinctrl-0 = <&uart2m0_xfer>;
> + status = "okay";
> +};
> +
> +&u2phy0 {
> + status = "okay";
> +};
> +
> +&u2phy0_otg {
> + status = "okay";
> +};
> +
> +&u2phy1 {
> + status = "okay";
> +};
> +
> +&u2phy1_otg {
> + status = "okay";
> +};
> +
> +&u2phy2 {
> + status = "okay";
> +};
> +
> +&u2phy2_host {
> + /* connected to USB hub, which is powered by vcc5v0_sys */
> + phy-supply = <&vcc5v0_sys>;
> + status = "okay";
> +};
> +
> +&u2phy3 {
> + status = "okay";
> +};
> +
> +&u2phy3_host {
> + phy-supply = <&vcc5v0_host>;
> + status = "okay";
> +};
> +
> +&usbdp_phy0 {
> + mode-switch;
> + orientation-switch;
> + status = "okay";
> +
> + port {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + usbdp_phy0_orientation_switch: endpoint at 0 {
> + reg = <0>;
> + remote-endpoint = <&usbc0_orien_sw>;
> + };
> +
> + usbdp_phy0_dp_altmode_mux: endpoint at 1 {
> + reg = <1>;
> + remote-endpoint = <&dp_altmode_mux>;
> + };
> + };
> +};
> +
> +&usbdp_phy1 {
> + status = "okay";
> +};
> +
> +&usb_host0_ehci {
> + status = "okay";
> +};
> +
> +&usb_host0_ohci {
> + status = "okay";
> +};
> +
> +&usb_host0_xhci {
> + usb-role-switch;
> + status = "okay";
> +
> + port {
> + dwc3_0_role_switch: endpoint {
> + remote-endpoint = <&usbc0_role_sw>;
> + };
> + };
> +};
> +
> +&usb_host1_ehci {
> + status = "okay";
> +};
> +
> +&usb_host1_ohci {
> + status = "okay";
> +};
> +
> +&usb_host1_xhci {
> + dr_mode = "host";
> + status = "okay";
> +};
> +
> +&vop {
> + status = "okay";
> +};
> +
> +&vop_mmu {
> + status = "okay";
> +};
> +
> +&vp0 {
> + vp0_out_hdmi0: endpoint at ROCKCHIP_VOP2_EP_HDMI0 {
> + reg = <ROCKCHIP_VOP2_EP_HDMI0>;
> + remote-endpoint = <&hdmi0_in_vp0>;
> + };
> +};
> +
> +&vp1 {
> + vp1_out_hdmi1: endpoint at ROCKCHIP_VOP2_EP_HDMI1 {
> + reg = <ROCKCHIP_VOP2_EP_HDMI1>;
> + remote-endpoint = <&hdmi1_in_vp1>;
> + };
> +};
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
> index 314fdc0c1c20b25b0fdc5254f3b090586c169a00..e5c474e4d02a6582efc3bd704d95df95bf9fb0ee 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
> @@ -2,23 +2,9 @@
>
> /dts-v1/;
>
> -#include <dt-bindings/gpio/gpio.h>
> -#include <dt-bindings/leds/common.h>
> -#include <dt-bindings/soc/rockchip,vop2.h>
> -#include <dt-bindings/usb/pd.h>
> -#include "rk3588.dtsi"
> +#include "rk3588-rock-5b-5bp-5t.dtsi"
>
> / {
> - aliases {
> - mmc0 = &sdhci;
> - mmc1 = &sdmmc;
> - mmc2 = &sdio;
> - };
> -
> - chosen {
> - stdout-path = "serial2:1500000n8";
> - };
> -
> analog-sound {
> compatible = "audio-graph-card";
> label = "rk3588-es8316";
> @@ -36,28 +22,6 @@ analog-sound {
> pinctrl-0 = <&hp_detect>;
> };
>
> - hdmi0-con {
> - compatible = "hdmi-connector";
> - type = "a";
> -
> - port {
> - hdmi0_con_in: endpoint {
> - remote-endpoint = <&hdmi0_out_con>;
> - };
> - };
> - };
> -
> - hdmi1-con {
> - compatible = "hdmi-connector";
> - type = "a";
> -
> - port {
> - hdmi1_con_in: endpoint {
> - remote-endpoint = <&hdmi1_out_con>;
> - };
> - };
> - };
> -
> leds {
> compatible = "gpio-leds";
> pinctrl-names = "default";
> @@ -71,452 +35,19 @@ led_rgb_b {
> };
> };
>
> - 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>;
> - };
> -
> rfkill {
> compatible = "rfkill-gpio";
> label = "rfkill-m2-wlan";
> radio-type = "wlan";
> shutdown-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
> };
> -
> - rfkill-bt {
> - compatible = "rfkill-gpio";
> - label = "rfkill-m2-bt";
> - radio-type = "bluetooth";
> - shutdown-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
> - };
> -
> - vcc12v_dcin: regulator-vcc12v-dcin {
> - compatible = "regulator-fixed";
> - regulator-name = "vcc12v_dcin";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <12000000>;
> - regulator-max-microvolt = <12000000>;
> - };
> -
> - vcc3v3_pcie2x1l0: regulator-vcc3v3-pcie2x1l0 {
> - 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-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 {
> - compatible = "regulator-fixed";
> - regulator-name = "vcc3v3_pcie2x1l2";
> - regulator-min-microvolt = <3300000>;
> - regulator-max-microvolt = <3300000>;
> - startup-delay-us = <5000>;
> - vin-supply = <&vcc_3v3_s3>;
> - };
> -
> - vcc3v3_pcie30: regulator-vcc3v3-pcie30 {
> - 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";
> - regulator-min-microvolt = <3300000>;
> - regulator-max-microvolt = <3300000>;
> - startup-delay-us = <5000>;
> - vin-supply = <&vcc5v0_sys>;
> - };
> -
> - vcc5v0_host: regulator-vcc5v0-host {
> - compatible = "regulator-fixed";
> - regulator-name = "vcc5v0_host";
> - regulator-boot-on;
> - regulator-always-on;
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - vin-supply = <&vcc5v0_sys>;
> - };
> -
> - vcc5v0_sys: regulator-vcc5v0-sys {
> - compatible = "regulator-fixed";
> - regulator-name = "vcc5v0_sys";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - vin-supply = <&vcc12v_dcin>;
> - };
> -
> - vbus5v0_typec: vbus5v0-typec {
> - compatible = "regulator-fixed";
> - enable-active-high;
> - gpio = <&gpio2 RK_PB6 GPIO_ACTIVE_HIGH>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&vbus5v0_typec_en>;
> - regulator-name = "vbus5v0_typec";
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - vin-supply = <&vcc5v0_sys>;
> - };
> -
> - vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
> - compatible = "regulator-fixed";
> - regulator-name = "vcc_1v1_nldo_s3";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <1100000>;
> - regulator-max-microvolt = <1100000>;
> - vin-supply = <&vcc5v0_sys>;
> - };
> -};
> -
> -&combphy0_ps {
> - status = "okay";
> -};
> -
> -&combphy1_ps {
> - status = "okay";
> -};
> -
> -&combphy2_psu {
> - status = "okay";
> -};
> -
> -&cpu_b0 {
> - cpu-supply = <&vdd_cpu_big0_s0>;
> -};
> -
> -&cpu_b1 {
> - cpu-supply = <&vdd_cpu_big0_s0>;
> -};
> -
> -&cpu_b2 {
> - cpu-supply = <&vdd_cpu_big1_s0>;
> -};
> -
> -&cpu_b3 {
> - cpu-supply = <&vdd_cpu_big1_s0>;
> -};
> -
> -&cpu_l0 {
> - cpu-supply = <&vdd_cpu_lit_s0>;
> -};
> -
> -&cpu_l1 {
> - cpu-supply = <&vdd_cpu_lit_s0>;
> -};
> -
> -&cpu_l2 {
> - cpu-supply = <&vdd_cpu_lit_s0>;
> -};
> -
> -&cpu_l3 {
> - cpu-supply = <&vdd_cpu_lit_s0>;
> -};
> -
> -&gpu {
> - mali-supply = <&vdd_gpu_s0>;
> - status = "okay";
> -};
> -
> -&hdmi0 {
> - status = "okay";
> -};
> -
> -&hdmi0_in {
> - hdmi0_in_vp0: endpoint {
> - remote-endpoint = <&vp0_out_hdmi0>;
> - };
> -};
> -
> -&hdmi0_out {
> - hdmi0_out_con: endpoint {
> - remote-endpoint = <&hdmi0_con_in>;
> - };
> -};
> -
> -&hdmi0_sound {
> - status = "okay";
> -};
> -
> -&hdmi1 {
> - pinctrl-0 = <&hdmim0_tx1_cec &hdmim0_tx1_hpd
> - &hdmim1_tx1_scl &hdmim1_tx1_sda>;
> - status = "okay";
> -};
> -
> -&hdmi1_in {
> - hdmi1_in_vp1: endpoint {
> - remote-endpoint = <&vp1_out_hdmi1>;
> - };
> -};
> -
> -&hdmi1_out {
> - hdmi1_out_con: endpoint {
> - remote-endpoint = <&hdmi1_con_in>;
> - };
> -};
> -
> -&hdmi1_sound {
> - status = "okay";
> -};
> -
> -&hdmi_receiver_cma {
> - status = "okay";
> };
>
> &hdmi_receiver {
> hpd-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>;
> - pinctrl-0 = <&hdmim1_rx_cec &hdmim1_rx_hpdin &hdmim1_rx_scl &hdmim1_rx_sda &hdmirx_hpd>;
> - pinctrl-names = "default";
> - status = "okay";
> -};
> -
> -&hdptxphy0 {
> - status = "okay";
> -};
> -
> -&hdptxphy1 {
> - status = "okay";
> -};
> -
> -&i2c0 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&i2c0m2_xfer>;
> - status = "okay";
> -
> - vdd_cpu_big0_s0: regulator at 42 {
> - compatible = "rockchip,rk8602";
> - reg = <0x42>;
> - fcs,suspend-voltage-selector = <1>;
> - regulator-name = "vdd_cpu_big0_s0";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <550000>;
> - regulator-max-microvolt = <1050000>;
> - regulator-ramp-delay = <2300>;
> - vin-supply = <&vcc5v0_sys>;
> -
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vdd_cpu_big1_s0: regulator at 43 {
> - compatible = "rockchip,rk8603", "rockchip,rk8602";
> - reg = <0x43>;
> - fcs,suspend-voltage-selector = <1>;
> - regulator-name = "vdd_cpu_big1_s0";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <550000>;
> - regulator-max-microvolt = <1050000>;
> - regulator-ramp-delay = <2300>;
> - vin-supply = <&vcc5v0_sys>;
> -
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -};
> -
> -&i2c4 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&i2c4m1_xfer>;
> - status = "okay";
> -
> - usbc0: usb-typec at 22 {
> - compatible = "fcs,fusb302";
> - reg = <0x22>;
> - interrupt-parent = <&gpio3>;
> - interrupts = <RK_PB4 IRQ_TYPE_LEVEL_LOW>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&usbc0_int>;
> - vbus-supply = <&vbus5v0_typec>;
> - /*
> - * When the board is starting to send power-delivery messages
> - * too late (5 seconds according to the specification), the
> - * power-supply reacts with a hard-reset. That removes the
> - * power from VBUS for some time, which resets te whole board.
> - */
> - status = "fail";
> -
> - usb_con: connector {
> - compatible = "usb-c-connector";
> - label = "USB-C";
> - data-role = "dual";
> - power-role = "sink";
> - try-power-role = "sink";
> - op-sink-microwatt = <1000000>;
> - sink-pdos =
> - <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>,
> - <PDO_VAR(5000, 20000, 5000)>;
> -
> - ports {
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - port at 0 {
> - reg = <0>;
> - usbc0_role_sw: endpoint {
> - remote-endpoint = <&dwc3_0_role_switch>;
> - };
> - };
> -
> - port at 1 {
> - reg = <1>;
> - usbc0_orien_sw: endpoint {
> - remote-endpoint = <&usbdp_phy0_orientation_switch>;
> - };
> - };
> -
> - port at 2 {
> - reg = <2>;
> - dp_altmode_mux: endpoint {
> - remote-endpoint = <&usbdp_phy0_dp_altmode_mux>;
> - };
> - };
> - };
> - };
> - };
> -};
> -
> -&i2c6 {
> - status = "okay";
> -
> - hym8563: rtc at 51 {
> - compatible = "haoyu,hym8563";
> - reg = <0x51>;
> - #clock-cells = <0>;
> - clock-output-names = "hym8563";
> - pinctrl-names = "default";
> - pinctrl-0 = <&hym8563_int>;
> - interrupt-parent = <&gpio0>;
> - interrupts = <RK_PB0 IRQ_TYPE_LEVEL_LOW>;
> - wakeup-source;
> - };
> -};
> -
> -&i2c7 {
> - status = "okay";
> -
> - es8316: audio-codec at 11 {
> - compatible = "everest,es8316";
> - reg = <0x11>;
> - clocks = <&cru I2S0_8CH_MCLKOUT>;
> - clock-names = "mclk";
> - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;
> - assigned-clock-rates = <12288000>;
> - #sound-dai-cells = <0>;
> -
> - port {
> - es8316_p0_0: endpoint {
> - remote-endpoint = <&i2s0_8ch_p0_0>;
> - };
> - };
> - };
> -};
> -
> -&i2s0_8ch {
> - pinctrl-names = "default";
> - pinctrl-0 = <&i2s0_lrck
> - &i2s0_mclk
> - &i2s0_sclk
> - &i2s0_sdi0
> - &i2s0_sdo0>;
> - status = "okay";
> -
> - i2s0_8ch_p0: port {
> - i2s0_8ch_p0_0: endpoint {
> - dai-format = "i2s";
> - mclk-fs = <256>;
> - remote-endpoint = <&es8316_p0_0>;
> - };
> - };
> -};
> -
> -&i2s5_8ch {
> - status = "okay";
> -};
> -
> -&i2s6_8ch {
> - status = "okay";
> -};
> -
> -&package_thermal {
> - polling-delay = <1000>;
> -
> - trips {
> - package_fan0: package-fan0 {
> - temperature = <55000>;
> - hysteresis = <2000>;
> - type = "active";
> - };
> -
> - package_fan1: package-fan1 {
> - temperature = <65000>;
> - hysteresis = <2000>;
> - type = "active";
> - };
> - };
> -
> - cooling-maps {
> - map0 {
> - trip = <&package_fan0>;
> - cooling-device = <&fan THERMAL_NO_LIMIT 1>;
> - };
> -
> - map1 {
> - trip = <&package_fan1>;
> - cooling-device = <&fan 2 THERMAL_NO_LIMIT>;
> - };
> - };
> -};
> -
> -&pcie2x1l0 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&pcie2_0_rst>;
> - reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
> - vpcie3v3-supply = <&vcc3v3_pcie2x1l0>;
> - status = "okay";
> -};
> -
> -&pcie2x1l2 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&pcie2_2_rst>;
> - reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_HIGH>;
> - vpcie3v3-supply = <&vcc3v3_pcie2x1l2>;
> - status = "okay";
> -};
> -
> -&pcie30phy {
> status = "okay";
> };
>
> -&pcie3x4 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&pcie3_rst>;
> - reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
> - vpcie3v3-supply = <&vcc3v3_pcie30>;
> - status = "okay";
> -};
> -
> -&pd_gpu {
> - domain-supply = <&vdd_gpu_s0>;
> -};
> -
> &pinctrl {
> hdmirx {
> hdmirx_hpd: hdmirx-5v-detection {
> @@ -524,559 +55,32 @@ hdmirx_hpd: hdmirx-5v-detection {
> };
> };
>
> - hym8563 {
> - hym8563_int: hym8563-int {
> - rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> - };
> -
> 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>;
> - };
> - };
> -
> pcie2 {
> - pcie2_0_rst: pcie2-0-rst {
> - rockchip,pins = <4 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> -
> pcie2_0_vcc3v3_en: pcie2-0-vcc-en {
> rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
> };
> -
> - pcie2_2_rst: pcie2-2-rst {
> - rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> };
>
> - pcie3 {
> - pcie3_rst: pcie3-rst {
> - rockchip,pins = <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> -
> - pcie3_vcc3v3_en: pcie3-vcc3v3-en {
> - rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> - };
> -
> - usb {
> - usbc0_int: usbc0-int {
> - rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> -
> - vbus5v0_typec_en: vbus5v0-typec-en {
> - rockchip,pins = <2 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> - };
> -};
> -
> -&pwm1 {
> - status = "okay";
> -};
> -
> -&saradc {
> - vref-supply = <&avcc_1v8_s0>;
> - status = "okay";
> -};
> -
> -&sdhci {
> - bus-width = <8>;
> - no-sdio;
> - no-sd;
> - non-removable;
> - mmc-hs400-1_8v;
> - mmc-hs400-enhanced-strobe;
> - status = "okay";
> -};
> -
> -&sdmmc {
> - max-frequency = <200000000>;
> - no-sdio;
> - no-mmc;
> - bus-width = <4>;
> - cap-mmc-highspeed;
> - cap-sd-highspeed;
> - cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
> - disable-wp;
> - sd-uhs-sdr104;
> - vmmc-supply = <&vcc_3v3_s3>;
> - vqmmc-supply = <&vccio_sd_s0>;
> - status = "okay";
> -};
> -
> -&sfc {
> - pinctrl-names = "default";
> - pinctrl-0 = <&fspim2_pins>;
> - status = "okay";
> -
> - flash at 0 {
> - compatible = "jedec,spi-nor";
> - reg = <0>;
> - spi-max-frequency = <104000000>;
> - spi-rx-bus-width = <4>;
> - spi-tx-bus-width = <1>;
> - vcc-supply = <&vcc_3v3_s3>;
> - };
> -};
> -
> -&spi2 {
> - status = "okay";
> - assigned-clocks = <&cru CLK_SPI2>;
> - assigned-clock-rates = <200000000>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>;
> - num-cs = <1>;
> -
> - pmic at 0 {
> - compatible = "rockchip,rk806";
> - spi-max-frequency = <1000000>;
> - reg = <0x0>;
> -
> - interrupt-parent = <&gpio0>;
> - interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
> -
> - pinctrl-names = "default";
> - pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>,
> - <&rk806_dvs2_null>, <&rk806_dvs3_null>;
> -
> - 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>;
> - vcc11-supply = <&vcc_2v0_pldo_s3>;
> - vcc12-supply = <&vcc5v0_sys>;
> - vcc13-supply = <&vcc_1v1_nldo_s3>;
> - vcc14-supply = <&vcc_1v1_nldo_s3>;
> - vcca-supply = <&vcc5v0_sys>;
> -
> - gpio-controller;
> - #gpio-cells = <2>;
> -
> - rk806_dvs1_null: dvs1-null-pins {
> - pins = "gpio_pwrctrl1";
> - function = "pin_fun0";
> - };
> -
> - rk806_dvs2_null: dvs2-null-pins {
> - pins = "gpio_pwrctrl2";
> - function = "pin_fun0";
> - };
> -
> - rk806_dvs3_null: dvs3-null-pins {
> - pins = "gpio_pwrctrl3";
> - function = "pin_fun0";
> - };
> -
> - regulators {
> - vdd_gpu_s0: vdd_gpu_mem_s0: dcdc-reg1 {
> - 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 {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vdd_cpu_lit_s0: vdd_cpu_lit_mem_s0: dcdc-reg2 {
> - 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;
> - };
> - };
> -
> - vdd_log_s0: dcdc-reg3 {
> - 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-suspend-microvolt = <750000>;
> - };
> - };
> -
> - vdd_vdenc_s0: vdd_vdenc_mem_s0: dcdc-reg4 {
> - 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;
> - };
> - };
> -
> - vdd_ddr_s0: dcdc-reg5 {
> - 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;
> - regulator-suspend-microvolt = <850000>;
> - };
> - };
> -
> - vdd2_ddr_s3: dcdc-reg6 {
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-name = "vdd2_ddr_s3";
> -
> - regulator-state-mem {
> - regulator-on-in-suspend;
> - };
> - };
> -
> - vcc_2v0_pldo_s3: dcdc-reg7 {
> - 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;
> - regulator-suspend-microvolt = <2000000>;
> - };
> - };
> -
> - vcc_3v3_s3: dcdc-reg8 {
> - 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;
> - regulator-suspend-microvolt = <3300000>;
> - };
> - };
> -
> - vddq_ddr_s0: dcdc-reg9 {
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-name = "vddq_ddr_s0";
> -
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vcc_1v8_s3: dcdc-reg10 {
> - 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;
> - regulator-suspend-microvolt = <1800000>;
> - };
> - };
> -
> - avcc_1v8_s0: pldo-reg1 {
> - 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;
> - };
> - };
> -
> - vcc_1v8_s0: pldo-reg2 {
> - 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-suspend-microvolt = <1800000>;
> - };
> - };
> -
> - avdd_1v2_s0: pldo-reg3 {
> - 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 {
> - 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;
> - };
> - };
> -
> - vccio_sd_s0: pldo-reg5 {
> - 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;
> - };
> - };
> -
> - pldo6_s3: pldo-reg6 {
> - 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;
> - regulator-suspend-microvolt = <1800000>;
> - };
> - };
> -
> - vdd_0v75_s3: nldo-reg1 {
> - 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;
> - regulator-suspend-microvolt = <750000>;
> - };
> - };
> -
> - vdd_ddr_pll_s0: nldo-reg2 {
> - 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-suspend-microvolt = <850000>;
> - };
> - };
> -
> - avdd_0v75_s0: nldo-reg3 {
> - 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;
> - };
> - };
> -
> - vdd_0v85_s0: nldo-reg4 {
> - 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;
> - };
> - };
> -
> - vdd_0v75_s0: nldo-reg5 {
> - 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;
> - };
> - };
> - };
> - };
> -};
> -
> -&tsadc {
> - status = "okay";
> -};
> -
> -&uart2 {
> - pinctrl-0 = <&uart2m0_xfer>;
> - status = "okay";
> -};
> -
> -&u2phy0 {
> - status = "okay";
> -};
> -
> -&u2phy0_otg {
> - status = "okay";
> -};
> -
> -&u2phy1 {
> - status = "okay";
> -};
> -
> -&u2phy1_otg {
> - status = "okay";
> -};
> -
> -&u2phy2 {
> - status = "okay";
> -};
> -
> -&u2phy2_host {
> - /* connected to USB hub, which is powered by vcc5v0_sys */
> - phy-supply = <&vcc5v0_sys>;
> - status = "okay";
> -};
> -
> -&u2phy3 {
> - status = "okay";
> -};
> -
> -&u2phy3_host {
> - phy-supply = <&vcc5v0_host>;
> - status = "okay";
> -};
> -
> -&usbdp_phy0 {
> - mode-switch;
> - orientation-switch;
> - status = "okay";
> -
> - port {
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - usbdp_phy0_orientation_switch: endpoint at 0 {
> - reg = <0>;
> - remote-endpoint = <&usbc0_orien_sw>;
> - };
> -
> - usbdp_phy0_dp_altmode_mux: endpoint at 1 {
> - reg = <1>;
> - remote-endpoint = <&dp_altmode_mux>;
> - };
> - };
> -};
> -
> -&usbdp_phy1 {
> - status = "okay";
> -};
> -
> -&usb_host0_ehci {
> - status = "okay";
> -};
> -
> -&usb_host0_ohci {
> - status = "okay";
> -};
> -
> -&usb_host0_xhci {
> - usb-role-switch;
> - status = "okay";
> -
> - port {
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - dwc3_0_role_switch: endpoint {
> - remote-endpoint = <&usbc0_role_sw>;
> + sound {
> + hp_detect: hp-detect {
> + rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
> };
> };
> };
>
> -&usb_host1_ehci {
> - status = "okay";
> -};
> -
> -&usb_host1_ohci {
> - status = "okay";
> -};
> -
> -&usb_host1_xhci {
> - dr_mode = "host";
> - status = "okay";
> -};
> -
> &usb_host2_xhci {
> status = "okay";
> };
>
> -&vop {
> - status = "okay";
> -};
> -
> -&vop_mmu {
> +&vcc3v3_pcie2x1l0 {
> + gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pcie2_0_vcc3v3_en>;
> status = "okay";
> };
> -
> -&vp0 {
> - vp0_out_hdmi0: endpoint at ROCKCHIP_VOP2_EP_HDMI0 {
> - reg = <ROCKCHIP_VOP2_EP_HDMI0>;
> - remote-endpoint = <&hdmi0_in_vp0>;
> - };
> -};
> -
> -&vp1 {
> - vp1_out_hdmi1: endpoint at ROCKCHIP_VOP2_EP_HDMI1 {
> - reg = <ROCKCHIP_VOP2_EP_HDMI1>;
> - remote-endpoint = <&hdmi1_in_vp1>;
> - };
> -};
>
> --
> 2.49.0
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20250509/7fcea063/attachment.sig>
More information about the linux-arm-kernel
mailing list