[PATCH 0/8] rockchip: Add support for FriendlyElec NanoPC-T6 LTS
This series picks minimum required commits from v6.12-rc1-dts to add initial support for the FriendlyElec NanoPC-T6 LTS variant.
The adc-uclass and rockchip-saradc drivers are adopted to support cases when DM_REGULATOR is disabled and using a fallback voltage reference from the vdd-microvolts prop in DT.
Finally board specific code is added to help detect non-LTS vs LTS variant at runtime and nanopc-t6-rk3588_defconfig is extended to enable Kconfig options for updated DTs.
Please note that this has only been runtime tested on a non-LTS variant of a NanoPC-T6 board.
Jonas Karlman (4): rockchip: rk3588-nanopc-t6: Drop upstream props from u-boot.dtsi adc: Allow use of adc with DM_REGULATOR disabled adc: rockchip-saradc: Use vdd-microvolts prop as fallback rockchip: rk3588-nanopc-t6: Add support for NanoPC-T6 LTS
Marcin Juszkiewicz (4): arm64: dts: rockchip: prepare NanoPC-T6 for LTS board arm64: dts: rockchip: move NanoPC-T6 parts to DTS arm64: dts: rockchip: add NanoPC-T6 LTS arm64: dts: rockchip: add SPI flash on NanoPC-T6
arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi | 16 +- board/friendlyelec/nanopc-t6-rk3588/Makefile | 3 + .../nanopc-t6-rk3588/nanopc-t6-rk3588.c | 59 ++ configs/nanopc-t6-rk3588_defconfig | 12 + drivers/adc/adc-uclass.c | 4 +- drivers/adc/rockchip-saradc.c | 9 +- .../arm64/rockchip/rk3588-nanopc-t6-lts.dts | 60 ++ .../src/arm64/rockchip/rk3588-nanopc-t6.dts | 909 +---------------- .../src/arm64/rockchip/rk3588-nanopc-t6.dtsi | 943 ++++++++++++++++++ 9 files changed, 1092 insertions(+), 923 deletions(-) create mode 100644 board/friendlyelec/nanopc-t6-rk3588/Makefile create mode 100644 board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-rk3588.c create mode 100644 dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6-lts.dts create mode 100644 dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi
From: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org
FriendlyELEC introduced a second version of NanoPC-T6 SBC.
Create common include file and make NanoPC-T6 use it. Following patches will add LTS version.
Signed-off-by: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org Link: https://lore.kernel.org/r/20240829-friendlyelec-nanopc-t6-lts-v6-2-edff247e8... Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: d14f3a4f1feabb6bb5935bf3b275a1e6bf2208eb ]
(cherry picked from commit e8b52bdfe5a1444edd1b9bb7cc10b9781d72cc84) Signed-off-by: Jonas Karlman jonas@kwiboo.se --- .../src/arm64/rockchip/rk3588-nanopc-t6.dts | 932 +---------------- .../src/arm64/rockchip/rk3588-nanopc-t6.dtsi | 945 ++++++++++++++++++ 2 files changed, 947 insertions(+), 930 deletions(-) create mode 100644 dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi
diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts index ad8e36a339dc..3f8fbec65098 100644 --- a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts @@ -2,944 +2,16 @@ /* * Copyright (c) 2021 Rockchip Electronics Co., Ltd. * Copyright (c) 2023 Thomas McKahan + * Copyright (c) 2024 Linaro Ltd. * */
/dts-v1/;
-#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/pinctrl/rockchip.h> -#include <dt-bindings/usb/pd.h> -#include "rk3588.dtsi" +#include "rk3588-nanopc-t6.dtsi"
/ { model = "FriendlyElec NanoPC-T6"; compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588";
- aliases { - mmc0 = &sdhci; - mmc1 = &sdmmc; - }; - - chosen { - stdout-path = "serial2:1500000n8"; - }; - - leds { - compatible = "gpio-leds"; - - sys_led: led-0 { - gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; - label = "system-led"; - linux,default-trigger = "heartbeat"; - pinctrl-names = "default"; - pinctrl-0 = <&sys_led_pin>; - }; - - usr_led: led-1 { - gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; - label = "user-led"; - pinctrl-names = "default"; - pinctrl-0 = <&usr_led_pin>; - }; - }; - - sound { - compatible = "simple-audio-card"; - pinctrl-names = "default"; - pinctrl-0 = <&hp_det>; - - simple-audio-card,name = "realtek,rt5616-codec"; - simple-audio-card,format = "i2s"; - simple-audio-card,mclk-fs = <256>; - - simple-audio-card,hp-det-gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_LOW>; - simple-audio-card,hp-pin-name = "Headphones"; - - simple-audio-card,widgets = - "Headphone", "Headphones", - "Microphone", "Microphone Jack"; - simple-audio-card,routing = - "Headphones", "HPOL", - "Headphones", "HPOR", - "MIC1", "Microphone Jack", - "Microphone Jack", "micbias1"; - - simple-audio-card,cpu { - sound-dai = <&i2s0_8ch>; - }; - simple-audio-card,codec { - sound-dai = <&rt5616>; - }; - }; - - vcc12v_dcin: vcc12v-dcin-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc12v_dcin"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <12000000>; - regulator-max-microvolt = <12000000>; - }; - - /* vcc5v0_sys powers peripherals */ - vcc5v0_sys: vcc5v0-sys-regulator { - 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>; - }; - - /* vcc4v0_sys powers the RK806, RK860's */ - vcc4v0_sys: vcc4v0-sys-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc4v0_sys"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <4000000>; - regulator-max-microvolt = <4000000>; - vin-supply = <&vcc12v_dcin>; - }; - - vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator { - 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 = <&vcc4v0_sys>; - }; - - vcc_3v3_pcie20: vcc3v3-pcie20-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc_3v3_pcie20"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc_3v3_s3>; - }; - - vbus5v0_typec: vbus5v0-typec-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&typec5v_pwren>; - regulator-name = "vbus5v0_typec"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <&vcc5v0_sys>; - }; - - vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&pcie_m2_1_pwren>; - regulator-name = "vcc3v3_pcie2x1l0"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc5v0_sys>; - }; - - vcc3v3_pcie30: vcc3v3-pcie30-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&pcie_m2_0_pwren>; - regulator-name = "vcc3v3_pcie30"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc5v0_sys>; - }; - - vcc3v3_sd_s0: vcc3v3-sd-s0-regulator { - compatible = "regulator-fixed"; - enable-active-low; - gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>; - regulator-boot-on; - regulator-max-microvolt = <3300000>; - regulator-min-microvolt = <3300000>; - regulator-name = "vcc3v3_sd_s0"; - vin-supply = <&vcc_3v3_s3>; - }; - - vdd_4g_3v3: vdd-4g-3v3-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&pin_4g_lte_pwren>; - regulator-name = "vdd_4g_3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc5v0_sys>; - }; -}; - -&combphy0_ps { - status = "okay"; -}; - -&combphy1_ps { - status = "okay"; -}; - -&combphy2_psu { - status = "okay"; -}; - -&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>; -}; - -&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>; -}; - -&gpio0 { - gpio-line-names = /* GPIO0 A0-A7 */ - "", "", "", "", - "", "", "", "", - /* GPIO0 B0-B7 */ - "", "", "", "", - "", "", "", "", - /* GPIO0 C0-C7 */ - "", "", "", "", - "HEADER_10", "HEADER_08", "HEADER_32", "", - /* GPIO0 D0-D7 */ - "", "", "", "", - "", "", "", ""; -}; - -&gpio1 { - gpio-line-names = /* GPIO1 A0-A7 */ - "HEADER_27", "HEADER_28", "", "", - "", "", "", "HEADER_15", - /* GPIO1 B0-B7 */ - "HEADER_26", "HEADER_21", "HEADER_19", "HEADER_23", - "HEADER_24", "HEADER_22", "", "", - /* GPIO1 C0-C7 */ - "", "", "", "", - "", "", "", "", - /* GPIO1 D0-D7 */ - "", "", "", "", - "", "", "HEADER_05", "HEADER_03"; -}; - -&gpio2 { - gpio-line-names = /* GPIO2 A0-A7 */ - "", "", "", "", - "", "", "", "", - /* GPIO2 B0-B7 */ - "", "", "", "", - "", "", "", "", - /* GPIO2 C0-C7 */ - "", "CSI1_11", "CSI1_12", "", - "", "", "", "", - /* GPIO2 D0-D7 */ - "", "", "", "", - "", "", "", ""; -}; - -&gpio3 { - gpio-line-names = /* GPIO3 A0-A7 */ - "HEADER_35", "HEADER_38", "HEADER_40", "HEADER_36", - "HEADER_37", "", "DSI0_12", "", - /* GPIO3 B0-B7 */ - "HEADER_33", "DSI0_10", "HEADER_07", "HEADER_16", - "HEADER_18", "HEADER_29", "HEADER_31", "HEADER_12", - /* GPIO3 C0-C7 */ - "DSI0_08", "DSI0_14", "HEADER_11", "HEADER_13", - "", "", "", "", - /* GPIO3 D0-D7 */ - "", "", "", "", - "", "DSI1_10", "", ""; -}; - -&gpio4 { - gpio-line-names = /* GPIO4 A0-A7 */ - "DSI1_08", "DSI1_14", "", "DSI1_12", - "", "", "", "", - /* GPIO4 B0-B7 */ - "", "", "", "", - "", "", "", "", - /* GPIO4 C0-C7 */ - "", "", "", "", - "CSI0_11", "CSI0_12", "", "", - /* GPIO4 D0-D7 */ - "", "", "", "", - "", "", "", ""; -}; - -&i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0m2_xfer>; - status = "okay"; - - vdd_cpu_big0_s0: regulator@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 = <&vcc4v0_sys>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vdd_cpu_big1_s0: regulator@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 = <&vcc4v0_sys>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; -}; - -&i2c2 { - status = "okay"; - - vdd_npu_s0: regulator@42 { - compatible = "rockchip,rk8602"; - reg = <0x42>; - rockchip,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 { - clock-frequency = <200000>; - status = "okay"; - - fusb302: typec-portc@22 { - compatible = "fcs,fusb302"; - reg = <0x22>; - interrupt-parent = <&gpio0>; - interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>; - pinctrl-0 = <&usbc0_int>; - pinctrl-names = "default"; - vbus-supply = <&vbus5v0_typec>; - - connector { - compatible = "usb-c-connector"; - data-role = "dual"; - label = "USB-C"; - power-role = "dual"; - try-power-role = "sink"; - source-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)>; - sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>; - op-sink-microwatt = <1000000>; - }; - }; - - hym8563: rtc@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 { - clock-frequency = <200000>; - status = "okay"; - - rt5616: codec@1b { - compatible = "realtek,rt5616"; - reg = <0x1b>; - clocks = <&cru I2S0_8CH_MCLKOUT>; - clock-names = "mclk"; - #sound-dai-cells = <0>; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; - assigned-clock-rates = <12288000>; - - port { - rt5616_p0_0: endpoint { - remote-endpoint = <&i2s0_8ch_p0_0>; - }; - }; - }; - - /* connected with MIPI-CSI1 */ -}; - -&i2c8 { - pinctrl-0 = <&i2c8m2_xfer>; -}; - -&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 = <&rt5616_p0_0>; - }; - }; -}; - -&pcie2x1l0 { - reset-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc_3v3_pcie20>; - pinctrl-names = "default"; - pinctrl-0 = <&pcie2_0_rst>; - status = "okay"; -}; - -&pcie2x1l1 { - reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_pcie2x1l0>; - pinctrl-names = "default"; - pinctrl-0 = <&pcie2_1_rst>; - status = "okay"; -}; - -&pcie2x1l2 { - reset-gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc_3v3_pcie20>; - pinctrl-names = "default"; - pinctrl-0 = <&pcie2_2_rst>; - status = "okay"; -}; - -&pcie30phy { - status = "okay"; -}; - -&pcie3x4 { - reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_pcie30>; - status = "okay"; -}; - -&pinctrl { - gpio-leds { - sys_led_pin: sys-led-pin { - rockchip,pins = <2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - usr_led_pin: usr-led-pin { - rockchip,pins = <2 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - - headphone { - hp_det: hp-det { - rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - - hym8563 { - hym8563_int: hym8563-int { - rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - - pcie { - pcie2_0_rst: pcie2-0-rst { - rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - pcie2_1_rst: pcie2-1-rst { - rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - pcie2_2_rst: pcie2-2-rst { - rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - pcie_m2_0_pwren: pcie-m20-pwren { - rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - pcie_m2_1_pwren: pcie-m21-pwren { - rockchip,pins = <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - - usb { - pin_4g_lte_pwren: 4g-lte-pwren { - rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - typec5v_pwren: typec5v-pwren { - rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - usbc0_int: usbc0-int { - rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; -}; - -&pwm1 { - pinctrl-0 = <&pwm1m1_pins>; - status = "okay"; -}; - -&saradc { - vref-supply = <&avcc_1v8_s0>; - status = "okay"; -}; - -&sdhci { - bus-width = <8>; - no-sdio; - no-sd; - non-removable; - max-frequency = <200000000>; - mmc-hs400-1_8v; - mmc-hs400-enhanced-strobe; - status = "okay"; -}; - -&sdmmc { - bus-width = <4>; - cap-mmc-highspeed; - cap-sd-highspeed; - cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; - disable-wp; - no-mmc; - no-sdio; - sd-uhs-sdr104; - vmmc-supply = <&vcc3v3_sd_s0>; - vqmmc-supply = <&vccio_sd_s0>; - status = "okay"; -}; - -&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@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 = <&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 = <&vcc4v0_sys>; - vcc13-supply = <&vcc_1v1_nldo_s3>; - vcc14-supply = <&vcc_1v1_nldo_s3>; - vcca-supply = <&vcc4v0_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-init-microvolt = <750000>; - 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"; -}; - -&u2phy2_host { - phy-supply = <&vdd_4g_3v3>; - status = "okay"; -}; - -&u2phy3_host { - status = "okay"; -}; - -&u2phy2 { - status = "okay"; -}; - -&u2phy3 { - status = "okay"; -}; - -&usb_host0_ehci { - status = "okay"; -}; - -&usb_host0_ohci { - status = "okay"; -}; - -&usb_host1_ehci { - status = "okay"; -}; - -&usb_host1_ohci { - status = "okay"; }; diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi new file mode 100644 index 000000000000..ad8e36a339dc --- /dev/null +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi @@ -0,0 +1,945 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2021 Rockchip Electronics Co., Ltd. + * Copyright (c) 2023 Thomas McKahan + * + */ + +/dts-v1/; + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/pinctrl/rockchip.h> +#include <dt-bindings/usb/pd.h> +#include "rk3588.dtsi" + +/ { + model = "FriendlyElec NanoPC-T6"; + compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588"; + + aliases { + mmc0 = &sdhci; + mmc1 = &sdmmc; + }; + + chosen { + stdout-path = "serial2:1500000n8"; + }; + + leds { + compatible = "gpio-leds"; + + sys_led: led-0 { + gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + label = "system-led"; + linux,default-trigger = "heartbeat"; + pinctrl-names = "default"; + pinctrl-0 = <&sys_led_pin>; + }; + + usr_led: led-1 { + gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; + label = "user-led"; + pinctrl-names = "default"; + pinctrl-0 = <&usr_led_pin>; + }; + }; + + sound { + compatible = "simple-audio-card"; + pinctrl-names = "default"; + pinctrl-0 = <&hp_det>; + + simple-audio-card,name = "realtek,rt5616-codec"; + simple-audio-card,format = "i2s"; + simple-audio-card,mclk-fs = <256>; + + simple-audio-card,hp-det-gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_LOW>; + simple-audio-card,hp-pin-name = "Headphones"; + + simple-audio-card,widgets = + "Headphone", "Headphones", + "Microphone", "Microphone Jack"; + simple-audio-card,routing = + "Headphones", "HPOL", + "Headphones", "HPOR", + "MIC1", "Microphone Jack", + "Microphone Jack", "micbias1"; + + simple-audio-card,cpu { + sound-dai = <&i2s0_8ch>; + }; + simple-audio-card,codec { + sound-dai = <&rt5616>; + }; + }; + + vcc12v_dcin: vcc12v-dcin-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc12v_dcin"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <12000000>; + regulator-max-microvolt = <12000000>; + }; + + /* vcc5v0_sys powers peripherals */ + vcc5v0_sys: vcc5v0-sys-regulator { + 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>; + }; + + /* vcc4v0_sys powers the RK806, RK860's */ + vcc4v0_sys: vcc4v0-sys-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc4v0_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <4000000>; + regulator-max-microvolt = <4000000>; + vin-supply = <&vcc12v_dcin>; + }; + + vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator { + 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 = <&vcc4v0_sys>; + }; + + vcc_3v3_pcie20: vcc3v3-pcie20-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc_3v3_pcie20"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc_3v3_s3>; + }; + + vbus5v0_typec: vbus5v0-typec-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&typec5v_pwren>; + regulator-name = "vbus5v0_typec"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vcc5v0_sys>; + }; + + vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pcie_m2_1_pwren>; + regulator-name = "vcc3v3_pcie2x1l0"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc5v0_sys>; + }; + + vcc3v3_pcie30: vcc3v3-pcie30-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pcie_m2_0_pwren>; + regulator-name = "vcc3v3_pcie30"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc5v0_sys>; + }; + + vcc3v3_sd_s0: vcc3v3-sd-s0-regulator { + compatible = "regulator-fixed"; + enable-active-low; + gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>; + regulator-boot-on; + regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <3300000>; + regulator-name = "vcc3v3_sd_s0"; + vin-supply = <&vcc_3v3_s3>; + }; + + vdd_4g_3v3: vdd-4g-3v3-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pin_4g_lte_pwren>; + regulator-name = "vdd_4g_3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc5v0_sys>; + }; +}; + +&combphy0_ps { + status = "okay"; +}; + +&combphy1_ps { + status = "okay"; +}; + +&combphy2_psu { + status = "okay"; +}; + +&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>; +}; + +&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>; +}; + +&gpio0 { + gpio-line-names = /* GPIO0 A0-A7 */ + "", "", "", "", + "", "", "", "", + /* GPIO0 B0-B7 */ + "", "", "", "", + "", "", "", "", + /* GPIO0 C0-C7 */ + "", "", "", "", + "HEADER_10", "HEADER_08", "HEADER_32", "", + /* GPIO0 D0-D7 */ + "", "", "", "", + "", "", "", ""; +}; + +&gpio1 { + gpio-line-names = /* GPIO1 A0-A7 */ + "HEADER_27", "HEADER_28", "", "", + "", "", "", "HEADER_15", + /* GPIO1 B0-B7 */ + "HEADER_26", "HEADER_21", "HEADER_19", "HEADER_23", + "HEADER_24", "HEADER_22", "", "", + /* GPIO1 C0-C7 */ + "", "", "", "", + "", "", "", "", + /* GPIO1 D0-D7 */ + "", "", "", "", + "", "", "HEADER_05", "HEADER_03"; +}; + +&gpio2 { + gpio-line-names = /* GPIO2 A0-A7 */ + "", "", "", "", + "", "", "", "", + /* GPIO2 B0-B7 */ + "", "", "", "", + "", "", "", "", + /* GPIO2 C0-C7 */ + "", "CSI1_11", "CSI1_12", "", + "", "", "", "", + /* GPIO2 D0-D7 */ + "", "", "", "", + "", "", "", ""; +}; + +&gpio3 { + gpio-line-names = /* GPIO3 A0-A7 */ + "HEADER_35", "HEADER_38", "HEADER_40", "HEADER_36", + "HEADER_37", "", "DSI0_12", "", + /* GPIO3 B0-B7 */ + "HEADER_33", "DSI0_10", "HEADER_07", "HEADER_16", + "HEADER_18", "HEADER_29", "HEADER_31", "HEADER_12", + /* GPIO3 C0-C7 */ + "DSI0_08", "DSI0_14", "HEADER_11", "HEADER_13", + "", "", "", "", + /* GPIO3 D0-D7 */ + "", "", "", "", + "", "DSI1_10", "", ""; +}; + +&gpio4 { + gpio-line-names = /* GPIO4 A0-A7 */ + "DSI1_08", "DSI1_14", "", "DSI1_12", + "", "", "", "", + /* GPIO4 B0-B7 */ + "", "", "", "", + "", "", "", "", + /* GPIO4 C0-C7 */ + "", "", "", "", + "CSI0_11", "CSI0_12", "", "", + /* GPIO4 D0-D7 */ + "", "", "", "", + "", "", "", ""; +}; + +&i2c0 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c0m2_xfer>; + status = "okay"; + + vdd_cpu_big0_s0: regulator@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 = <&vcc4v0_sys>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vdd_cpu_big1_s0: regulator@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 = <&vcc4v0_sys>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; +}; + +&i2c2 { + status = "okay"; + + vdd_npu_s0: regulator@42 { + compatible = "rockchip,rk8602"; + reg = <0x42>; + rockchip,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 { + clock-frequency = <200000>; + status = "okay"; + + fusb302: typec-portc@22 { + compatible = "fcs,fusb302"; + reg = <0x22>; + interrupt-parent = <&gpio0>; + interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>; + pinctrl-0 = <&usbc0_int>; + pinctrl-names = "default"; + vbus-supply = <&vbus5v0_typec>; + + connector { + compatible = "usb-c-connector"; + data-role = "dual"; + label = "USB-C"; + power-role = "dual"; + try-power-role = "sink"; + source-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)>; + sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>; + op-sink-microwatt = <1000000>; + }; + }; + + hym8563: rtc@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 { + clock-frequency = <200000>; + status = "okay"; + + rt5616: codec@1b { + compatible = "realtek,rt5616"; + reg = <0x1b>; + clocks = <&cru I2S0_8CH_MCLKOUT>; + clock-names = "mclk"; + #sound-dai-cells = <0>; + assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clock-rates = <12288000>; + + port { + rt5616_p0_0: endpoint { + remote-endpoint = <&i2s0_8ch_p0_0>; + }; + }; + }; + + /* connected with MIPI-CSI1 */ +}; + +&i2c8 { + pinctrl-0 = <&i2c8m2_xfer>; +}; + +&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 = <&rt5616_p0_0>; + }; + }; +}; + +&pcie2x1l0 { + reset-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; + vpcie3v3-supply = <&vcc_3v3_pcie20>; + pinctrl-names = "default"; + pinctrl-0 = <&pcie2_0_rst>; + status = "okay"; +}; + +&pcie2x1l1 { + reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>; + vpcie3v3-supply = <&vcc3v3_pcie2x1l0>; + pinctrl-names = "default"; + pinctrl-0 = <&pcie2_1_rst>; + status = "okay"; +}; + +&pcie2x1l2 { + reset-gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>; + vpcie3v3-supply = <&vcc_3v3_pcie20>; + pinctrl-names = "default"; + pinctrl-0 = <&pcie2_2_rst>; + status = "okay"; +}; + +&pcie30phy { + status = "okay"; +}; + +&pcie3x4 { + reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; + vpcie3v3-supply = <&vcc3v3_pcie30>; + status = "okay"; +}; + +&pinctrl { + gpio-leds { + sys_led_pin: sys-led-pin { + rockchip,pins = <2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + usr_led_pin: usr-led-pin { + rockchip,pins = <2 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + headphone { + hp_det: hp-det { + rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + hym8563 { + hym8563_int: hym8563-int { + rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + pcie { + pcie2_0_rst: pcie2-0-rst { + rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + pcie2_1_rst: pcie2-1-rst { + rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + pcie2_2_rst: pcie2-2-rst { + rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + pcie_m2_0_pwren: pcie-m20-pwren { + rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + pcie_m2_1_pwren: pcie-m21-pwren { + rockchip,pins = <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + usb { + pin_4g_lte_pwren: 4g-lte-pwren { + rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + typec5v_pwren: typec5v-pwren { + rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + usbc0_int: usbc0-int { + rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; +}; + +&pwm1 { + pinctrl-0 = <&pwm1m1_pins>; + status = "okay"; +}; + +&saradc { + vref-supply = <&avcc_1v8_s0>; + status = "okay"; +}; + +&sdhci { + bus-width = <8>; + no-sdio; + no-sd; + non-removable; + max-frequency = <200000000>; + mmc-hs400-1_8v; + mmc-hs400-enhanced-strobe; + status = "okay"; +}; + +&sdmmc { + bus-width = <4>; + cap-mmc-highspeed; + cap-sd-highspeed; + cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; + disable-wp; + no-mmc; + no-sdio; + sd-uhs-sdr104; + vmmc-supply = <&vcc3v3_sd_s0>; + vqmmc-supply = <&vccio_sd_s0>; + status = "okay"; +}; + +&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@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 = <&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 = <&vcc4v0_sys>; + vcc13-supply = <&vcc_1v1_nldo_s3>; + vcc14-supply = <&vcc_1v1_nldo_s3>; + vcca-supply = <&vcc4v0_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-init-microvolt = <750000>; + 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"; +}; + +&u2phy2_host { + phy-supply = <&vdd_4g_3v3>; + status = "okay"; +}; + +&u2phy3_host { + status = "okay"; +}; + +&u2phy2 { + status = "okay"; +}; + +&u2phy3 { + status = "okay"; +}; + +&usb_host0_ehci { + status = "okay"; +}; + +&usb_host0_ohci { + status = "okay"; +}; + +&usb_host1_ehci { + status = "okay"; +}; + +&usb_host1_ohci { + status = "okay"; +};
On Fri, 18 Oct 2024 at 01:30, Jonas Karlman jonas@kwiboo.se wrote:
From: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org
FriendlyELEC introduced a second version of NanoPC-T6 SBC.
Create common include file and make NanoPC-T6 use it. Following patches will add LTS version.
Signed-off-by: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org Link: https://lore.kernel.org/r/20240829-friendlyelec-nanopc-t6-lts-v6-2-edff247e8... Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: d14f3a4f1feabb6bb5935bf3b275a1e6bf2208eb ]
(cherry picked from commit e8b52bdfe5a1444edd1b9bb7cc10b9781d72cc84) Signed-off-by: Jonas Karlman jonas@kwiboo.se
.../src/arm64/rockchip/rk3588-nanopc-t6.dts | 932 +---------------- .../src/arm64/rockchip/rk3588-nanopc-t6.dtsi | 945 ++++++++++++++++++ 2 files changed, 947 insertions(+), 930 deletions(-) create mode 100644 dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi
For the series:
Acked-by: Sumit Garg sumit.garg@linaro.org
-Sumit
diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts index ad8e36a339dc..3f8fbec65098 100644 --- a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts @@ -2,944 +2,16 @@ /*
- Copyright (c) 2021 Rockchip Electronics Co., Ltd.
- Copyright (c) 2023 Thomas McKahan
*/
- Copyright (c) 2024 Linaro Ltd.
/dts-v1/;
-#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/pinctrl/rockchip.h> -#include <dt-bindings/usb/pd.h> -#include "rk3588.dtsi" +#include "rk3588-nanopc-t6.dtsi"
/ { model = "FriendlyElec NanoPC-T6"; compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588";
aliases {mmc0 = &sdhci;mmc1 = &sdmmc;};chosen {stdout-path = "serial2:1500000n8";};leds {compatible = "gpio-leds";sys_led: led-0 {gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;label = "system-led";linux,default-trigger = "heartbeat";pinctrl-names = "default";pinctrl-0 = <&sys_led_pin>;};usr_led: led-1 {gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;label = "user-led";pinctrl-names = "default";pinctrl-0 = <&usr_led_pin>;};};sound {compatible = "simple-audio-card";pinctrl-names = "default";pinctrl-0 = <&hp_det>;simple-audio-card,name = "realtek,rt5616-codec";simple-audio-card,format = "i2s";simple-audio-card,mclk-fs = <256>;simple-audio-card,hp-det-gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_LOW>;simple-audio-card,hp-pin-name = "Headphones";simple-audio-card,widgets ="Headphone", "Headphones","Microphone", "Microphone Jack";simple-audio-card,routing ="Headphones", "HPOL","Headphones", "HPOR","MIC1", "Microphone Jack","Microphone Jack", "micbias1";simple-audio-card,cpu {sound-dai = <&i2s0_8ch>;};simple-audio-card,codec {sound-dai = <&rt5616>;};};vcc12v_dcin: vcc12v-dcin-regulator {compatible = "regulator-fixed";regulator-name = "vcc12v_dcin";regulator-always-on;regulator-boot-on;regulator-min-microvolt = <12000000>;regulator-max-microvolt = <12000000>;};/* vcc5v0_sys powers peripherals */vcc5v0_sys: vcc5v0-sys-regulator {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>;};/* vcc4v0_sys powers the RK806, RK860's */vcc4v0_sys: vcc4v0-sys-regulator {compatible = "regulator-fixed";regulator-name = "vcc4v0_sys";regulator-always-on;regulator-boot-on;regulator-min-microvolt = <4000000>;regulator-max-microvolt = <4000000>;vin-supply = <&vcc12v_dcin>;};vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {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 = <&vcc4v0_sys>;};vcc_3v3_pcie20: vcc3v3-pcie20-regulator {compatible = "regulator-fixed";regulator-name = "vcc_3v3_pcie20";regulator-always-on;regulator-boot-on;regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc_3v3_s3>;};vbus5v0_typec: vbus5v0-typec-regulator {compatible = "regulator-fixed";enable-active-high;gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&typec5v_pwren>;regulator-name = "vbus5v0_typec";regulator-min-microvolt = <5000000>;regulator-max-microvolt = <5000000>;vin-supply = <&vcc5v0_sys>;};vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {compatible = "regulator-fixed";enable-active-high;gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&pcie_m2_1_pwren>;regulator-name = "vcc3v3_pcie2x1l0";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc5v0_sys>;};vcc3v3_pcie30: vcc3v3-pcie30-regulator {compatible = "regulator-fixed";enable-active-high;gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&pcie_m2_0_pwren>;regulator-name = "vcc3v3_pcie30";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc5v0_sys>;};vcc3v3_sd_s0: vcc3v3-sd-s0-regulator {compatible = "regulator-fixed";enable-active-low;gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>;regulator-boot-on;regulator-max-microvolt = <3300000>;regulator-min-microvolt = <3300000>;regulator-name = "vcc3v3_sd_s0";vin-supply = <&vcc_3v3_s3>;};vdd_4g_3v3: vdd-4g-3v3-regulator {compatible = "regulator-fixed";enable-active-high;gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&pin_4g_lte_pwren>;regulator-name = "vdd_4g_3v3";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc5v0_sys>;};-};
-&combphy0_ps {
status = "okay";-};
-&combphy1_ps {
status = "okay";-};
-&combphy2_psu {
status = "okay";-};
-&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>;-};
-&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>;-};
-&gpio0 {
gpio-line-names = /* GPIO0 A0-A7 */"", "", "", "","", "", "", "",/* GPIO0 B0-B7 */"", "", "", "","", "", "", "",/* GPIO0 C0-C7 */"", "", "", "","HEADER_10", "HEADER_08", "HEADER_32", "",/* GPIO0 D0-D7 */"", "", "", "","", "", "", "";-};
-&gpio1 {
gpio-line-names = /* GPIO1 A0-A7 */"HEADER_27", "HEADER_28", "", "","", "", "", "HEADER_15",/* GPIO1 B0-B7 */"HEADER_26", "HEADER_21", "HEADER_19", "HEADER_23","HEADER_24", "HEADER_22", "", "",/* GPIO1 C0-C7 */"", "", "", "","", "", "", "",/* GPIO1 D0-D7 */"", "", "", "","", "", "HEADER_05", "HEADER_03";-};
-&gpio2 {
gpio-line-names = /* GPIO2 A0-A7 */"", "", "", "","", "", "", "",/* GPIO2 B0-B7 */"", "", "", "","", "", "", "",/* GPIO2 C0-C7 */"", "CSI1_11", "CSI1_12", "","", "", "", "",/* GPIO2 D0-D7 */"", "", "", "","", "", "", "";-};
-&gpio3 {
gpio-line-names = /* GPIO3 A0-A7 */"HEADER_35", "HEADER_38", "HEADER_40", "HEADER_36","HEADER_37", "", "DSI0_12", "",/* GPIO3 B0-B7 */"HEADER_33", "DSI0_10", "HEADER_07", "HEADER_16","HEADER_18", "HEADER_29", "HEADER_31", "HEADER_12",/* GPIO3 C0-C7 */"DSI0_08", "DSI0_14", "HEADER_11", "HEADER_13","", "", "", "",/* GPIO3 D0-D7 */"", "", "", "","", "DSI1_10", "", "";-};
-&gpio4 {
gpio-line-names = /* GPIO4 A0-A7 */"DSI1_08", "DSI1_14", "", "DSI1_12","", "", "", "",/* GPIO4 B0-B7 */"", "", "", "","", "", "", "",/* GPIO4 C0-C7 */"", "", "", "","CSI0_11", "CSI0_12", "", "",/* GPIO4 D0-D7 */"", "", "", "","", "", "", "";-};
-&i2c0 {
pinctrl-names = "default";pinctrl-0 = <&i2c0m2_xfer>;status = "okay";vdd_cpu_big0_s0: regulator@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 = <&vcc4v0_sys>;regulator-state-mem {regulator-off-in-suspend;};};vdd_cpu_big1_s0: regulator@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 = <&vcc4v0_sys>;regulator-state-mem {regulator-off-in-suspend;};};-};
-&i2c2 {
status = "okay";vdd_npu_s0: regulator@42 {compatible = "rockchip,rk8602";reg = <0x42>;rockchip,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 {
clock-frequency = <200000>;status = "okay";fusb302: typec-portc@22 {compatible = "fcs,fusb302";reg = <0x22>;interrupt-parent = <&gpio0>;interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>;pinctrl-0 = <&usbc0_int>;pinctrl-names = "default";vbus-supply = <&vbus5v0_typec>;connector {compatible = "usb-c-connector";data-role = "dual";label = "USB-C";power-role = "dual";try-power-role = "sink";source-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)>;sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;op-sink-microwatt = <1000000>;};};hym8563: rtc@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 {
clock-frequency = <200000>;status = "okay";rt5616: codec@1b {compatible = "realtek,rt5616";reg = <0x1b>;clocks = <&cru I2S0_8CH_MCLKOUT>;clock-names = "mclk";#sound-dai-cells = <0>;assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;assigned-clock-rates = <12288000>;port {rt5616_p0_0: endpoint {remote-endpoint = <&i2s0_8ch_p0_0>;};};};/* connected with MIPI-CSI1 */-};
-&i2c8 {
pinctrl-0 = <&i2c8m2_xfer>;-};
-&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 = <&rt5616_p0_0>;};};-};
-&pcie2x1l0 {
reset-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;vpcie3v3-supply = <&vcc_3v3_pcie20>;pinctrl-names = "default";pinctrl-0 = <&pcie2_0_rst>;status = "okay";-};
-&pcie2x1l1 {
reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;vpcie3v3-supply = <&vcc3v3_pcie2x1l0>;pinctrl-names = "default";pinctrl-0 = <&pcie2_1_rst>;status = "okay";-};
-&pcie2x1l2 {
reset-gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>;vpcie3v3-supply = <&vcc_3v3_pcie20>;pinctrl-names = "default";pinctrl-0 = <&pcie2_2_rst>;status = "okay";-};
-&pcie30phy {
status = "okay";-};
-&pcie3x4 {
reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;vpcie3v3-supply = <&vcc3v3_pcie30>;status = "okay";-};
-&pinctrl {
gpio-leds {sys_led_pin: sys-led-pin {rockchip,pins = <2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;};usr_led_pin: usr-led-pin {rockchip,pins = <2 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;};};headphone {hp_det: hp-det {rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;};};hym8563 {hym8563_int: hym8563-int {rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;};};pcie {pcie2_0_rst: pcie2-0-rst {rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;};pcie2_1_rst: pcie2-1-rst {rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;};pcie2_2_rst: pcie2-2-rst {rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;};pcie_m2_0_pwren: pcie-m20-pwren {rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;};pcie_m2_1_pwren: pcie-m21-pwren {rockchip,pins = <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;};};usb {pin_4g_lte_pwren: 4g-lte-pwren {rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;};typec5v_pwren: typec5v-pwren {rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;};usbc0_int: usbc0-int {rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;};};-};
-&pwm1 {
pinctrl-0 = <&pwm1m1_pins>;status = "okay";-};
-&saradc {
vref-supply = <&avcc_1v8_s0>;status = "okay";-};
-&sdhci {
bus-width = <8>;no-sdio;no-sd;non-removable;max-frequency = <200000000>;mmc-hs400-1_8v;mmc-hs400-enhanced-strobe;status = "okay";-};
-&sdmmc {
bus-width = <4>;cap-mmc-highspeed;cap-sd-highspeed;cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;disable-wp;no-mmc;no-sdio;sd-uhs-sdr104;vmmc-supply = <&vcc3v3_sd_s0>;vqmmc-supply = <&vccio_sd_s0>;status = "okay";-};
-&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@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 = <&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 = <&vcc4v0_sys>;vcc13-supply = <&vcc_1v1_nldo_s3>;vcc14-supply = <&vcc_1v1_nldo_s3>;vcca-supply = <&vcc4v0_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-init-microvolt = <750000>;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";-};
-&u2phy2_host {
phy-supply = <&vdd_4g_3v3>;status = "okay";-};
-&u2phy3_host {
status = "okay";-};
-&u2phy2 {
status = "okay";-};
-&u2phy3 {
status = "okay";-};
-&usb_host0_ehci {
status = "okay";-};
-&usb_host0_ohci {
status = "okay";-};
-&usb_host1_ehci {
status = "okay";-};
-&usb_host1_ohci {
status = "okay";}; diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi new file mode 100644 index 000000000000..ad8e36a339dc --- /dev/null +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi @@ -0,0 +1,945 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/*
- Copyright (c) 2021 Rockchip Electronics Co., Ltd.
- Copyright (c) 2023 Thomas McKahan
- */
+/dts-v1/;
+#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/pinctrl/rockchip.h> +#include <dt-bindings/usb/pd.h> +#include "rk3588.dtsi"
+/ {
model = "FriendlyElec NanoPC-T6";compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588";aliases {mmc0 = &sdhci;mmc1 = &sdmmc;};chosen {stdout-path = "serial2:1500000n8";};leds {compatible = "gpio-leds";sys_led: led-0 {gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;label = "system-led";linux,default-trigger = "heartbeat";pinctrl-names = "default";pinctrl-0 = <&sys_led_pin>;};usr_led: led-1 {gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;label = "user-led";pinctrl-names = "default";pinctrl-0 = <&usr_led_pin>;};};sound {compatible = "simple-audio-card";pinctrl-names = "default";pinctrl-0 = <&hp_det>;simple-audio-card,name = "realtek,rt5616-codec";simple-audio-card,format = "i2s";simple-audio-card,mclk-fs = <256>;simple-audio-card,hp-det-gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_LOW>;simple-audio-card,hp-pin-name = "Headphones";simple-audio-card,widgets ="Headphone", "Headphones","Microphone", "Microphone Jack";simple-audio-card,routing ="Headphones", "HPOL","Headphones", "HPOR","MIC1", "Microphone Jack","Microphone Jack", "micbias1";simple-audio-card,cpu {sound-dai = <&i2s0_8ch>;};simple-audio-card,codec {sound-dai = <&rt5616>;};};vcc12v_dcin: vcc12v-dcin-regulator {compatible = "regulator-fixed";regulator-name = "vcc12v_dcin";regulator-always-on;regulator-boot-on;regulator-min-microvolt = <12000000>;regulator-max-microvolt = <12000000>;};/* vcc5v0_sys powers peripherals */vcc5v0_sys: vcc5v0-sys-regulator {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>;};/* vcc4v0_sys powers the RK806, RK860's */vcc4v0_sys: vcc4v0-sys-regulator {compatible = "regulator-fixed";regulator-name = "vcc4v0_sys";regulator-always-on;regulator-boot-on;regulator-min-microvolt = <4000000>;regulator-max-microvolt = <4000000>;vin-supply = <&vcc12v_dcin>;};vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {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 = <&vcc4v0_sys>;};vcc_3v3_pcie20: vcc3v3-pcie20-regulator {compatible = "regulator-fixed";regulator-name = "vcc_3v3_pcie20";regulator-always-on;regulator-boot-on;regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc_3v3_s3>;};vbus5v0_typec: vbus5v0-typec-regulator {compatible = "regulator-fixed";enable-active-high;gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&typec5v_pwren>;regulator-name = "vbus5v0_typec";regulator-min-microvolt = <5000000>;regulator-max-microvolt = <5000000>;vin-supply = <&vcc5v0_sys>;};vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {compatible = "regulator-fixed";enable-active-high;gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&pcie_m2_1_pwren>;regulator-name = "vcc3v3_pcie2x1l0";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc5v0_sys>;};vcc3v3_pcie30: vcc3v3-pcie30-regulator {compatible = "regulator-fixed";enable-active-high;gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&pcie_m2_0_pwren>;regulator-name = "vcc3v3_pcie30";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc5v0_sys>;};vcc3v3_sd_s0: vcc3v3-sd-s0-regulator {compatible = "regulator-fixed";enable-active-low;gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>;regulator-boot-on;regulator-max-microvolt = <3300000>;regulator-min-microvolt = <3300000>;regulator-name = "vcc3v3_sd_s0";vin-supply = <&vcc_3v3_s3>;};vdd_4g_3v3: vdd-4g-3v3-regulator {compatible = "regulator-fixed";enable-active-high;gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&pin_4g_lte_pwren>;regulator-name = "vdd_4g_3v3";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc5v0_sys>;};+};
+&combphy0_ps {
status = "okay";+};
+&combphy1_ps {
status = "okay";+};
+&combphy2_psu {
status = "okay";+};
+&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>;+};
+&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>;+};
+&gpio0 {
gpio-line-names = /* GPIO0 A0-A7 */"", "", "", "","", "", "", "",/* GPIO0 B0-B7 */"", "", "", "","", "", "", "",/* GPIO0 C0-C7 */"", "", "", "","HEADER_10", "HEADER_08", "HEADER_32", "",/* GPIO0 D0-D7 */"", "", "", "","", "", "", "";+};
+&gpio1 {
gpio-line-names = /* GPIO1 A0-A7 */"HEADER_27", "HEADER_28", "", "","", "", "", "HEADER_15",/* GPIO1 B0-B7 */"HEADER_26", "HEADER_21", "HEADER_19", "HEADER_23","HEADER_24", "HEADER_22", "", "",/* GPIO1 C0-C7 */"", "", "", "","", "", "", "",/* GPIO1 D0-D7 */"", "", "", "","", "", "HEADER_05", "HEADER_03";+};
+&gpio2 {
gpio-line-names = /* GPIO2 A0-A7 */"", "", "", "","", "", "", "",/* GPIO2 B0-B7 */"", "", "", "","", "", "", "",/* GPIO2 C0-C7 */"", "CSI1_11", "CSI1_12", "","", "", "", "",/* GPIO2 D0-D7 */"", "", "", "","", "", "", "";+};
+&gpio3 {
gpio-line-names = /* GPIO3 A0-A7 */"HEADER_35", "HEADER_38", "HEADER_40", "HEADER_36","HEADER_37", "", "DSI0_12", "",/* GPIO3 B0-B7 */"HEADER_33", "DSI0_10", "HEADER_07", "HEADER_16","HEADER_18", "HEADER_29", "HEADER_31", "HEADER_12",/* GPIO3 C0-C7 */"DSI0_08", "DSI0_14", "HEADER_11", "HEADER_13","", "", "", "",/* GPIO3 D0-D7 */"", "", "", "","", "DSI1_10", "", "";+};
+&gpio4 {
gpio-line-names = /* GPIO4 A0-A7 */"DSI1_08", "DSI1_14", "", "DSI1_12","", "", "", "",/* GPIO4 B0-B7 */"", "", "", "","", "", "", "",/* GPIO4 C0-C7 */"", "", "", "","CSI0_11", "CSI0_12", "", "",/* GPIO4 D0-D7 */"", "", "", "","", "", "", "";+};
+&i2c0 {
pinctrl-names = "default";pinctrl-0 = <&i2c0m2_xfer>;status = "okay";vdd_cpu_big0_s0: regulator@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 = <&vcc4v0_sys>;regulator-state-mem {regulator-off-in-suspend;};};vdd_cpu_big1_s0: regulator@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 = <&vcc4v0_sys>;regulator-state-mem {regulator-off-in-suspend;};};+};
+&i2c2 {
status = "okay";vdd_npu_s0: regulator@42 {compatible = "rockchip,rk8602";reg = <0x42>;rockchip,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 {
clock-frequency = <200000>;status = "okay";fusb302: typec-portc@22 {compatible = "fcs,fusb302";reg = <0x22>;interrupt-parent = <&gpio0>;interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>;pinctrl-0 = <&usbc0_int>;pinctrl-names = "default";vbus-supply = <&vbus5v0_typec>;connector {compatible = "usb-c-connector";data-role = "dual";label = "USB-C";power-role = "dual";try-power-role = "sink";source-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)>;sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;op-sink-microwatt = <1000000>;};};hym8563: rtc@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 {
clock-frequency = <200000>;status = "okay";rt5616: codec@1b {compatible = "realtek,rt5616";reg = <0x1b>;clocks = <&cru I2S0_8CH_MCLKOUT>;clock-names = "mclk";#sound-dai-cells = <0>;assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;assigned-clock-rates = <12288000>;port {rt5616_p0_0: endpoint {remote-endpoint = <&i2s0_8ch_p0_0>;};};};/* connected with MIPI-CSI1 */+};
+&i2c8 {
pinctrl-0 = <&i2c8m2_xfer>;+};
+&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 = <&rt5616_p0_0>;};};+};
+&pcie2x1l0 {
reset-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;vpcie3v3-supply = <&vcc_3v3_pcie20>;pinctrl-names = "default";pinctrl-0 = <&pcie2_0_rst>;status = "okay";+};
+&pcie2x1l1 {
reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;vpcie3v3-supply = <&vcc3v3_pcie2x1l0>;pinctrl-names = "default";pinctrl-0 = <&pcie2_1_rst>;status = "okay";+};
+&pcie2x1l2 {
reset-gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>;vpcie3v3-supply = <&vcc_3v3_pcie20>;pinctrl-names = "default";pinctrl-0 = <&pcie2_2_rst>;status = "okay";+};
+&pcie30phy {
status = "okay";+};
+&pcie3x4 {
reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;vpcie3v3-supply = <&vcc3v3_pcie30>;status = "okay";+};
+&pinctrl {
gpio-leds {sys_led_pin: sys-led-pin {rockchip,pins = <2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;};usr_led_pin: usr-led-pin {rockchip,pins = <2 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;};};headphone {hp_det: hp-det {rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;};};hym8563 {hym8563_int: hym8563-int {rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;};};pcie {pcie2_0_rst: pcie2-0-rst {rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;};pcie2_1_rst: pcie2-1-rst {rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;};pcie2_2_rst: pcie2-2-rst {rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;};pcie_m2_0_pwren: pcie-m20-pwren {rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;};pcie_m2_1_pwren: pcie-m21-pwren {rockchip,pins = <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;};};usb {pin_4g_lte_pwren: 4g-lte-pwren {rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;};typec5v_pwren: typec5v-pwren {rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;};usbc0_int: usbc0-int {rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;};};+};
+&pwm1 {
pinctrl-0 = <&pwm1m1_pins>;status = "okay";+};
+&saradc {
vref-supply = <&avcc_1v8_s0>;status = "okay";+};
+&sdhci {
bus-width = <8>;no-sdio;no-sd;non-removable;max-frequency = <200000000>;mmc-hs400-1_8v;mmc-hs400-enhanced-strobe;status = "okay";+};
+&sdmmc {
bus-width = <4>;cap-mmc-highspeed;cap-sd-highspeed;cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;disable-wp;no-mmc;no-sdio;sd-uhs-sdr104;vmmc-supply = <&vcc3v3_sd_s0>;vqmmc-supply = <&vccio_sd_s0>;status = "okay";+};
+&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@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 = <&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 = <&vcc4v0_sys>;vcc13-supply = <&vcc_1v1_nldo_s3>;vcc14-supply = <&vcc_1v1_nldo_s3>;vcca-supply = <&vcc4v0_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-init-microvolt = <750000>;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";+};
+&u2phy2_host {
phy-supply = <&vdd_4g_3v3>;status = "okay";+};
+&u2phy3_host {
status = "okay";+};
+&u2phy2 {
status = "okay";+};
+&u2phy3 {
status = "okay";+};
+&usb_host0_ehci {
status = "okay";+};
+&usb_host0_ohci {
status = "okay";+};
+&usb_host1_ehci {
status = "okay";+};
+&usb_host1_ohci {
status = "okay";+};
2.46.2
On 2024/10/18 04:00, Jonas Karlman wrote:
From: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org
FriendlyELEC introduced a second version of NanoPC-T6 SBC.
Create common include file and make NanoPC-T6 use it. Following patches will add LTS version.
Signed-off-by: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org Link: https://lore.kernel.org/r/20240829-friendlyelec-nanopc-t6-lts-v6-2-edff247e8... Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: d14f3a4f1feabb6bb5935bf3b275a1e6bf2208eb ]
(cherry picked from commit e8b52bdfe5a1444edd1b9bb7cc10b9781d72cc84) Signed-off-by: Jonas Karlman jonas@kwiboo.se
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
.../src/arm64/rockchip/rk3588-nanopc-t6.dts | 932 +---------------- .../src/arm64/rockchip/rk3588-nanopc-t6.dtsi | 945 ++++++++++++++++++ 2 files changed, 947 insertions(+), 930 deletions(-) create mode 100644 dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi
diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts index ad8e36a339dc..3f8fbec65098 100644 --- a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts @@ -2,944 +2,16 @@ /*
- Copyright (c) 2021 Rockchip Electronics Co., Ltd.
- Copyright (c) 2023 Thomas McKahan
- Copyright (c) 2024 Linaro Ltd.
*/
/dts-v1/;
-#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/pinctrl/rockchip.h> -#include <dt-bindings/usb/pd.h> -#include "rk3588.dtsi" +#include "rk3588-nanopc-t6.dtsi"
/ { model = "FriendlyElec NanoPC-T6"; compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588";
- aliases {
mmc0 = &sdhci;mmc1 = &sdmmc;- };
- chosen {
stdout-path = "serial2:1500000n8";- };
- leds {
compatible = "gpio-leds";sys_led: led-0 {gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;label = "system-led";linux,default-trigger = "heartbeat";pinctrl-names = "default";pinctrl-0 = <&sys_led_pin>;};usr_led: led-1 {gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;label = "user-led";pinctrl-names = "default";pinctrl-0 = <&usr_led_pin>;};- };
- sound {
compatible = "simple-audio-card";pinctrl-names = "default";pinctrl-0 = <&hp_det>;simple-audio-card,name = "realtek,rt5616-codec";simple-audio-card,format = "i2s";simple-audio-card,mclk-fs = <256>;simple-audio-card,hp-det-gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_LOW>;simple-audio-card,hp-pin-name = "Headphones";simple-audio-card,widgets ="Headphone", "Headphones","Microphone", "Microphone Jack";simple-audio-card,routing ="Headphones", "HPOL","Headphones", "HPOR","MIC1", "Microphone Jack","Microphone Jack", "micbias1";simple-audio-card,cpu {sound-dai = <&i2s0_8ch>;};simple-audio-card,codec {sound-dai = <&rt5616>;};- };
- vcc12v_dcin: vcc12v-dcin-regulator {
compatible = "regulator-fixed";regulator-name = "vcc12v_dcin";regulator-always-on;regulator-boot-on;regulator-min-microvolt = <12000000>;regulator-max-microvolt = <12000000>;- };
- /* vcc5v0_sys powers peripherals */
- vcc5v0_sys: vcc5v0-sys-regulator {
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>;- };
- /* vcc4v0_sys powers the RK806, RK860's */
- vcc4v0_sys: vcc4v0-sys-regulator {
compatible = "regulator-fixed";regulator-name = "vcc4v0_sys";regulator-always-on;regulator-boot-on;regulator-min-microvolt = <4000000>;regulator-max-microvolt = <4000000>;vin-supply = <&vcc12v_dcin>;- };
- vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
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 = <&vcc4v0_sys>;- };
- vcc_3v3_pcie20: vcc3v3-pcie20-regulator {
compatible = "regulator-fixed";regulator-name = "vcc_3v3_pcie20";regulator-always-on;regulator-boot-on;regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc_3v3_s3>;- };
- vbus5v0_typec: vbus5v0-typec-regulator {
compatible = "regulator-fixed";enable-active-high;gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&typec5v_pwren>;regulator-name = "vbus5v0_typec";regulator-min-microvolt = <5000000>;regulator-max-microvolt = <5000000>;vin-supply = <&vcc5v0_sys>;- };
- vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {
compatible = "regulator-fixed";enable-active-high;gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&pcie_m2_1_pwren>;regulator-name = "vcc3v3_pcie2x1l0";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc5v0_sys>;- };
- vcc3v3_pcie30: vcc3v3-pcie30-regulator {
compatible = "regulator-fixed";enable-active-high;gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&pcie_m2_0_pwren>;regulator-name = "vcc3v3_pcie30";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc5v0_sys>;- };
- vcc3v3_sd_s0: vcc3v3-sd-s0-regulator {
compatible = "regulator-fixed";enable-active-low;gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>;regulator-boot-on;regulator-max-microvolt = <3300000>;regulator-min-microvolt = <3300000>;regulator-name = "vcc3v3_sd_s0";vin-supply = <&vcc_3v3_s3>;- };
- vdd_4g_3v3: vdd-4g-3v3-regulator {
compatible = "regulator-fixed";enable-active-high;gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&pin_4g_lte_pwren>;regulator-name = "vdd_4g_3v3";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc5v0_sys>;- };
-};
-&combphy0_ps {
- status = "okay";
-};
-&combphy1_ps {
- status = "okay";
-};
-&combphy2_psu {
- status = "okay";
-};
-&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>;
-};
-&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>;
-};
-&gpio0 {
- gpio-line-names = /* GPIO0 A0-A7 */
"", "", "", "","", "", "", "",/* GPIO0 B0-B7 */"", "", "", "","", "", "", "",/* GPIO0 C0-C7 */"", "", "", "","HEADER_10", "HEADER_08", "HEADER_32", "",/* GPIO0 D0-D7 */"", "", "", "","", "", "", "";-};
-&gpio1 {
- gpio-line-names = /* GPIO1 A0-A7 */
"HEADER_27", "HEADER_28", "", "","", "", "", "HEADER_15",/* GPIO1 B0-B7 */"HEADER_26", "HEADER_21", "HEADER_19", "HEADER_23","HEADER_24", "HEADER_22", "", "",/* GPIO1 C0-C7 */"", "", "", "","", "", "", "",/* GPIO1 D0-D7 */"", "", "", "","", "", "HEADER_05", "HEADER_03";-};
-&gpio2 {
- gpio-line-names = /* GPIO2 A0-A7 */
"", "", "", "","", "", "", "",/* GPIO2 B0-B7 */"", "", "", "","", "", "", "",/* GPIO2 C0-C7 */"", "CSI1_11", "CSI1_12", "","", "", "", "",/* GPIO2 D0-D7 */"", "", "", "","", "", "", "";-};
-&gpio3 {
- gpio-line-names = /* GPIO3 A0-A7 */
"HEADER_35", "HEADER_38", "HEADER_40", "HEADER_36","HEADER_37", "", "DSI0_12", "",/* GPIO3 B0-B7 */"HEADER_33", "DSI0_10", "HEADER_07", "HEADER_16","HEADER_18", "HEADER_29", "HEADER_31", "HEADER_12",/* GPIO3 C0-C7 */"DSI0_08", "DSI0_14", "HEADER_11", "HEADER_13","", "", "", "",/* GPIO3 D0-D7 */"", "", "", "","", "DSI1_10", "", "";-};
-&gpio4 {
- gpio-line-names = /* GPIO4 A0-A7 */
"DSI1_08", "DSI1_14", "", "DSI1_12","", "", "", "",/* GPIO4 B0-B7 */"", "", "", "","", "", "", "",/* GPIO4 C0-C7 */"", "", "", "","CSI0_11", "CSI0_12", "", "",/* GPIO4 D0-D7 */"", "", "", "","", "", "", "";-};
-&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0m2_xfer>;
- status = "okay";
- vdd_cpu_big0_s0: regulator@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 = <&vcc4v0_sys>;regulator-state-mem {regulator-off-in-suspend;};- };
- vdd_cpu_big1_s0: regulator@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 = <&vcc4v0_sys>;regulator-state-mem {regulator-off-in-suspend;};- };
-};
-&i2c2 {
- status = "okay";
- vdd_npu_s0: regulator@42 {
compatible = "rockchip,rk8602";reg = <0x42>;rockchip,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 {
- clock-frequency = <200000>;
- status = "okay";
- fusb302: typec-portc@22 {
compatible = "fcs,fusb302";reg = <0x22>;interrupt-parent = <&gpio0>;interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>;pinctrl-0 = <&usbc0_int>;pinctrl-names = "default";vbus-supply = <&vbus5v0_typec>;connector {compatible = "usb-c-connector";data-role = "dual";label = "USB-C";power-role = "dual";try-power-role = "sink";source-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)>;sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;op-sink-microwatt = <1000000>;};- };
- hym8563: rtc@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 {
- clock-frequency = <200000>;
- status = "okay";
- rt5616: codec@1b {
compatible = "realtek,rt5616";reg = <0x1b>;clocks = <&cru I2S0_8CH_MCLKOUT>;clock-names = "mclk";#sound-dai-cells = <0>;assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;assigned-clock-rates = <12288000>;port {rt5616_p0_0: endpoint {remote-endpoint = <&i2s0_8ch_p0_0>;};};- };
- /* connected with MIPI-CSI1 */
-};
-&i2c8 {
- pinctrl-0 = <&i2c8m2_xfer>;
-};
-&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 = <&rt5616_p0_0>;};- };
-};
-&pcie2x1l0 {
- reset-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
- vpcie3v3-supply = <&vcc_3v3_pcie20>;
- pinctrl-names = "default";
- pinctrl-0 = <&pcie2_0_rst>;
- status = "okay";
-};
-&pcie2x1l1 {
- reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
- vpcie3v3-supply = <&vcc3v3_pcie2x1l0>;
- pinctrl-names = "default";
- pinctrl-0 = <&pcie2_1_rst>;
- status = "okay";
-};
-&pcie2x1l2 {
- reset-gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>;
- vpcie3v3-supply = <&vcc_3v3_pcie20>;
- pinctrl-names = "default";
- pinctrl-0 = <&pcie2_2_rst>;
- status = "okay";
-};
-&pcie30phy {
- status = "okay";
-};
-&pcie3x4 {
- reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
- vpcie3v3-supply = <&vcc3v3_pcie30>;
- status = "okay";
-};
-&pinctrl {
- gpio-leds {
sys_led_pin: sys-led-pin {rockchip,pins = <2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;};usr_led_pin: usr-led-pin {rockchip,pins = <2 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;};- };
- headphone {
hp_det: hp-det {rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;};- };
- hym8563 {
hym8563_int: hym8563-int {rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;};- };
- pcie {
pcie2_0_rst: pcie2-0-rst {rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;};pcie2_1_rst: pcie2-1-rst {rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;};pcie2_2_rst: pcie2-2-rst {rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;};pcie_m2_0_pwren: pcie-m20-pwren {rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;};pcie_m2_1_pwren: pcie-m21-pwren {rockchip,pins = <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;};- };
- usb {
pin_4g_lte_pwren: 4g-lte-pwren {rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;};typec5v_pwren: typec5v-pwren {rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;};usbc0_int: usbc0-int {rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;};- };
-};
-&pwm1 {
- pinctrl-0 = <&pwm1m1_pins>;
- status = "okay";
-};
-&saradc {
- vref-supply = <&avcc_1v8_s0>;
- status = "okay";
-};
-&sdhci {
- bus-width = <8>;
- no-sdio;
- no-sd;
- non-removable;
- max-frequency = <200000000>;
- mmc-hs400-1_8v;
- mmc-hs400-enhanced-strobe;
- status = "okay";
-};
-&sdmmc {
- bus-width = <4>;
- cap-mmc-highspeed;
- cap-sd-highspeed;
- cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
- disable-wp;
- no-mmc;
- no-sdio;
- sd-uhs-sdr104;
- vmmc-supply = <&vcc3v3_sd_s0>;
- vqmmc-supply = <&vccio_sd_s0>;
- status = "okay";
-};
-&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@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 = <&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 = <&vcc4v0_sys>;vcc13-supply = <&vcc_1v1_nldo_s3>;vcc14-supply = <&vcc_1v1_nldo_s3>;vcca-supply = <&vcc4v0_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-init-microvolt = <750000>;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";
-};
-&u2phy2_host {
- phy-supply = <&vdd_4g_3v3>;
- status = "okay";
-};
-&u2phy3_host {
- status = "okay";
-};
-&u2phy2 {
- status = "okay";
-};
-&u2phy3 {
- status = "okay";
-};
-&usb_host0_ehci {
- status = "okay";
-};
-&usb_host0_ohci {
- status = "okay";
-};
-&usb_host1_ehci {
- status = "okay";
-};
-&usb_host1_ohci {
- status = "okay"; };
diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi new file mode 100644 index 000000000000..ad8e36a339dc --- /dev/null +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi @@ -0,0 +1,945 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/*
- Copyright (c) 2021 Rockchip Electronics Co., Ltd.
- Copyright (c) 2023 Thomas McKahan
- */
+/dts-v1/;
+#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/pinctrl/rockchip.h> +#include <dt-bindings/usb/pd.h> +#include "rk3588.dtsi"
+/ {
- model = "FriendlyElec NanoPC-T6";
- compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588";
- aliases {
mmc0 = &sdhci;mmc1 = &sdmmc;- };
- chosen {
stdout-path = "serial2:1500000n8";- };
- leds {
compatible = "gpio-leds";sys_led: led-0 {gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;label = "system-led";linux,default-trigger = "heartbeat";pinctrl-names = "default";pinctrl-0 = <&sys_led_pin>;};usr_led: led-1 {gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;label = "user-led";pinctrl-names = "default";pinctrl-0 = <&usr_led_pin>;};- };
- sound {
compatible = "simple-audio-card";pinctrl-names = "default";pinctrl-0 = <&hp_det>;simple-audio-card,name = "realtek,rt5616-codec";simple-audio-card,format = "i2s";simple-audio-card,mclk-fs = <256>;simple-audio-card,hp-det-gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_LOW>;simple-audio-card,hp-pin-name = "Headphones";simple-audio-card,widgets ="Headphone", "Headphones","Microphone", "Microphone Jack";simple-audio-card,routing ="Headphones", "HPOL","Headphones", "HPOR","MIC1", "Microphone Jack","Microphone Jack", "micbias1";simple-audio-card,cpu {sound-dai = <&i2s0_8ch>;};simple-audio-card,codec {sound-dai = <&rt5616>;};- };
- vcc12v_dcin: vcc12v-dcin-regulator {
compatible = "regulator-fixed";regulator-name = "vcc12v_dcin";regulator-always-on;regulator-boot-on;regulator-min-microvolt = <12000000>;regulator-max-microvolt = <12000000>;- };
- /* vcc5v0_sys powers peripherals */
- vcc5v0_sys: vcc5v0-sys-regulator {
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>;- };
- /* vcc4v0_sys powers the RK806, RK860's */
- vcc4v0_sys: vcc4v0-sys-regulator {
compatible = "regulator-fixed";regulator-name = "vcc4v0_sys";regulator-always-on;regulator-boot-on;regulator-min-microvolt = <4000000>;regulator-max-microvolt = <4000000>;vin-supply = <&vcc12v_dcin>;- };
- vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
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 = <&vcc4v0_sys>;- };
- vcc_3v3_pcie20: vcc3v3-pcie20-regulator {
compatible = "regulator-fixed";regulator-name = "vcc_3v3_pcie20";regulator-always-on;regulator-boot-on;regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc_3v3_s3>;- };
- vbus5v0_typec: vbus5v0-typec-regulator {
compatible = "regulator-fixed";enable-active-high;gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&typec5v_pwren>;regulator-name = "vbus5v0_typec";regulator-min-microvolt = <5000000>;regulator-max-microvolt = <5000000>;vin-supply = <&vcc5v0_sys>;- };
- vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {
compatible = "regulator-fixed";enable-active-high;gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&pcie_m2_1_pwren>;regulator-name = "vcc3v3_pcie2x1l0";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc5v0_sys>;- };
- vcc3v3_pcie30: vcc3v3-pcie30-regulator {
compatible = "regulator-fixed";enable-active-high;gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&pcie_m2_0_pwren>;regulator-name = "vcc3v3_pcie30";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc5v0_sys>;- };
- vcc3v3_sd_s0: vcc3v3-sd-s0-regulator {
compatible = "regulator-fixed";enable-active-low;gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>;regulator-boot-on;regulator-max-microvolt = <3300000>;regulator-min-microvolt = <3300000>;regulator-name = "vcc3v3_sd_s0";vin-supply = <&vcc_3v3_s3>;- };
- vdd_4g_3v3: vdd-4g-3v3-regulator {
compatible = "regulator-fixed";enable-active-high;gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&pin_4g_lte_pwren>;regulator-name = "vdd_4g_3v3";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc5v0_sys>;- };
+};
+&combphy0_ps {
- status = "okay";
+};
+&combphy1_ps {
- status = "okay";
+};
+&combphy2_psu {
- status = "okay";
+};
+&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>;
+};
+&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>;
+};
+&gpio0 {
- gpio-line-names = /* GPIO0 A0-A7 */
"", "", "", "","", "", "", "",/* GPIO0 B0-B7 */"", "", "", "","", "", "", "",/* GPIO0 C0-C7 */"", "", "", "","HEADER_10", "HEADER_08", "HEADER_32", "",/* GPIO0 D0-D7 */"", "", "", "","", "", "", "";+};
+&gpio1 {
- gpio-line-names = /* GPIO1 A0-A7 */
"HEADER_27", "HEADER_28", "", "","", "", "", "HEADER_15",/* GPIO1 B0-B7 */"HEADER_26", "HEADER_21", "HEADER_19", "HEADER_23","HEADER_24", "HEADER_22", "", "",/* GPIO1 C0-C7 */"", "", "", "","", "", "", "",/* GPIO1 D0-D7 */"", "", "", "","", "", "HEADER_05", "HEADER_03";+};
+&gpio2 {
- gpio-line-names = /* GPIO2 A0-A7 */
"", "", "", "","", "", "", "",/* GPIO2 B0-B7 */"", "", "", "","", "", "", "",/* GPIO2 C0-C7 */"", "CSI1_11", "CSI1_12", "","", "", "", "",/* GPIO2 D0-D7 */"", "", "", "","", "", "", "";+};
+&gpio3 {
- gpio-line-names = /* GPIO3 A0-A7 */
"HEADER_35", "HEADER_38", "HEADER_40", "HEADER_36","HEADER_37", "", "DSI0_12", "",/* GPIO3 B0-B7 */"HEADER_33", "DSI0_10", "HEADER_07", "HEADER_16","HEADER_18", "HEADER_29", "HEADER_31", "HEADER_12",/* GPIO3 C0-C7 */"DSI0_08", "DSI0_14", "HEADER_11", "HEADER_13","", "", "", "",/* GPIO3 D0-D7 */"", "", "", "","", "DSI1_10", "", "";+};
+&gpio4 {
- gpio-line-names = /* GPIO4 A0-A7 */
"DSI1_08", "DSI1_14", "", "DSI1_12","", "", "", "",/* GPIO4 B0-B7 */"", "", "", "","", "", "", "",/* GPIO4 C0-C7 */"", "", "", "","CSI0_11", "CSI0_12", "", "",/* GPIO4 D0-D7 */"", "", "", "","", "", "", "";+};
+&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0m2_xfer>;
- status = "okay";
- vdd_cpu_big0_s0: regulator@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 = <&vcc4v0_sys>;regulator-state-mem {regulator-off-in-suspend;};- };
- vdd_cpu_big1_s0: regulator@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 = <&vcc4v0_sys>;regulator-state-mem {regulator-off-in-suspend;};- };
+};
+&i2c2 {
- status = "okay";
- vdd_npu_s0: regulator@42 {
compatible = "rockchip,rk8602";reg = <0x42>;rockchip,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 {
- clock-frequency = <200000>;
- status = "okay";
- fusb302: typec-portc@22 {
compatible = "fcs,fusb302";reg = <0x22>;interrupt-parent = <&gpio0>;interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>;pinctrl-0 = <&usbc0_int>;pinctrl-names = "default";vbus-supply = <&vbus5v0_typec>;connector {compatible = "usb-c-connector";data-role = "dual";label = "USB-C";power-role = "dual";try-power-role = "sink";source-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)>;sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;op-sink-microwatt = <1000000>;};- };
- hym8563: rtc@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 {
- clock-frequency = <200000>;
- status = "okay";
- rt5616: codec@1b {
compatible = "realtek,rt5616";reg = <0x1b>;clocks = <&cru I2S0_8CH_MCLKOUT>;clock-names = "mclk";#sound-dai-cells = <0>;assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;assigned-clock-rates = <12288000>;port {rt5616_p0_0: endpoint {remote-endpoint = <&i2s0_8ch_p0_0>;};};- };
- /* connected with MIPI-CSI1 */
+};
+&i2c8 {
- pinctrl-0 = <&i2c8m2_xfer>;
+};
+&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 = <&rt5616_p0_0>;};- };
+};
+&pcie2x1l0 {
- reset-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
- vpcie3v3-supply = <&vcc_3v3_pcie20>;
- pinctrl-names = "default";
- pinctrl-0 = <&pcie2_0_rst>;
- status = "okay";
+};
+&pcie2x1l1 {
- reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
- vpcie3v3-supply = <&vcc3v3_pcie2x1l0>;
- pinctrl-names = "default";
- pinctrl-0 = <&pcie2_1_rst>;
- status = "okay";
+};
+&pcie2x1l2 {
- reset-gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>;
- vpcie3v3-supply = <&vcc_3v3_pcie20>;
- pinctrl-names = "default";
- pinctrl-0 = <&pcie2_2_rst>;
- status = "okay";
+};
+&pcie30phy {
- status = "okay";
+};
+&pcie3x4 {
- reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
- vpcie3v3-supply = <&vcc3v3_pcie30>;
- status = "okay";
+};
+&pinctrl {
- gpio-leds {
sys_led_pin: sys-led-pin {rockchip,pins = <2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;};usr_led_pin: usr-led-pin {rockchip,pins = <2 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;};- };
- headphone {
hp_det: hp-det {rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;};- };
- hym8563 {
hym8563_int: hym8563-int {rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;};- };
- pcie {
pcie2_0_rst: pcie2-0-rst {rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;};pcie2_1_rst: pcie2-1-rst {rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;};pcie2_2_rst: pcie2-2-rst {rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;};pcie_m2_0_pwren: pcie-m20-pwren {rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;};pcie_m2_1_pwren: pcie-m21-pwren {rockchip,pins = <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;};- };
- usb {
pin_4g_lte_pwren: 4g-lte-pwren {rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;};typec5v_pwren: typec5v-pwren {rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;};usbc0_int: usbc0-int {rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;};- };
+};
+&pwm1 {
- pinctrl-0 = <&pwm1m1_pins>;
- status = "okay";
+};
+&saradc {
- vref-supply = <&avcc_1v8_s0>;
- status = "okay";
+};
+&sdhci {
- bus-width = <8>;
- no-sdio;
- no-sd;
- non-removable;
- max-frequency = <200000000>;
- mmc-hs400-1_8v;
- mmc-hs400-enhanced-strobe;
- status = "okay";
+};
+&sdmmc {
- bus-width = <4>;
- cap-mmc-highspeed;
- cap-sd-highspeed;
- cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
- disable-wp;
- no-mmc;
- no-sdio;
- sd-uhs-sdr104;
- vmmc-supply = <&vcc3v3_sd_s0>;
- vqmmc-supply = <&vccio_sd_s0>;
- status = "okay";
+};
+&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@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 = <&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 = <&vcc4v0_sys>;vcc13-supply = <&vcc_1v1_nldo_s3>;vcc14-supply = <&vcc_1v1_nldo_s3>;vcca-supply = <&vcc4v0_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-init-microvolt = <750000>;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";
+};
+&u2phy2_host {
- phy-supply = <&vdd_4g_3v3>;
- status = "okay";
+};
+&u2phy3_host {
- status = "okay";
+};
+&u2phy2 {
- status = "okay";
+};
+&u2phy3 {
- status = "okay";
+};
+&usb_host0_ehci {
- status = "okay";
+};
+&usb_host0_ohci {
- status = "okay";
+};
+&usb_host1_ehci {
- status = "okay";
+};
+&usb_host1_ohci {
- status = "okay";
+};
From: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org
MiniPCIe slot is present only in first version of NanoPC-T6 (2301).
Signed-off-by: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org Link: https://lore.kernel.org/r/20240829-friendlyelec-nanopc-t6-lts-v6-3-edff247e8... Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: aea8d84070fe0846961deb23228d9dd3f8caefb3 ]
(cherry picked from commit 697963b1c22336a44ac2e33536c652aae1671b3d) Signed-off-by: Jonas Karlman jonas@kwiboo.se --- .../src/arm64/rockchip/rk3588-nanopc-t6.dts | 23 +++++++++++++++++++ .../src/arm64/rockchip/rk3588-nanopc-t6.dtsi | 17 -------------- 2 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts index 3f8fbec65098..92321c1d3ff1 100644 --- a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts @@ -14,4 +14,27 @@ model = "FriendlyElec NanoPC-T6"; compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588";
+ vdd_4g_3v3: vdd-4g-3v3-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pin_4g_lte_pwren>; + regulator-name = "vdd_4g_3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc5v0_sys>; + }; +}; + +&pinctrl { + usb { + pin_4g_lte_pwren: 4g-lte-pwren { + rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + +&u2phy2_host { + phy-supply = <&vdd_4g_3v3>; }; diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi index ad8e36a339dc..d199f51a220c 100644 --- a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi @@ -170,18 +170,6 @@ regulator-name = "vcc3v3_sd_s0"; vin-supply = <&vcc_3v3_s3>; }; - - vdd_4g_3v3: vdd-4g-3v3-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&pin_4g_lte_pwren>; - regulator-name = "vdd_4g_3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc5v0_sys>; - }; };
&combphy0_ps { @@ -527,10 +515,6 @@ };
usb { - pin_4g_lte_pwren: 4g-lte-pwren { - rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; - }; - typec5v_pwren: typec5v-pwren { rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; }; @@ -912,7 +896,6 @@ };
&u2phy2_host { - phy-supply = <&vdd_4g_3v3>; status = "okay"; };
On 2024/10/18 04:00, Jonas Karlman wrote:
From: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org
MiniPCIe slot is present only in first version of NanoPC-T6 (2301).
Signed-off-by: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org Link: https://lore.kernel.org/r/20240829-friendlyelec-nanopc-t6-lts-v6-3-edff247e8... Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: aea8d84070fe0846961deb23228d9dd3f8caefb3 ]
(cherry picked from commit 697963b1c22336a44ac2e33536c652aae1671b3d) Signed-off-by: Jonas Karlman jonas@kwiboo.se
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
.../src/arm64/rockchip/rk3588-nanopc-t6.dts | 23 +++++++++++++++++++ .../src/arm64/rockchip/rk3588-nanopc-t6.dtsi | 17 -------------- 2 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts index 3f8fbec65098..92321c1d3ff1 100644 --- a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts @@ -14,4 +14,27 @@ model = "FriendlyElec NanoPC-T6"; compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588";
- vdd_4g_3v3: vdd-4g-3v3-regulator {
compatible = "regulator-fixed";enable-active-high;gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&pin_4g_lte_pwren>;regulator-name = "vdd_4g_3v3";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc5v0_sys>;- };
+};
+&pinctrl {
- usb {
pin_4g_lte_pwren: 4g-lte-pwren {rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;};- };
+};
+&u2phy2_host {
- phy-supply = <&vdd_4g_3v3>; };
diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi index ad8e36a339dc..d199f51a220c 100644 --- a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi @@ -170,18 +170,6 @@ regulator-name = "vcc3v3_sd_s0"; vin-supply = <&vcc_3v3_s3>; };
vdd_4g_3v3: vdd-4g-3v3-regulator {
compatible = "regulator-fixed";enable-active-high;gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&pin_4g_lte_pwren>;regulator-name = "vdd_4g_3v3";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;vin-supply = <&vcc5v0_sys>;}; };
&combphy0_ps {
@@ -527,10 +515,6 @@ };
usb {
pin_4g_lte_pwren: 4g-lte-pwren {rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;};- typec5v_pwren: typec5v-pwren { rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; };
@@ -912,7 +896,6 @@ };
&u2phy2_host {
- phy-supply = <&vdd_4g_3v3>; status = "okay"; };
From: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org
In the LTS (2310) version the miniPCIe slot got removed and USB 2.0 setup has changed. There are two external accessible ports and two ports on the internal header.
There is an on-board USB hub which provides: - one external connector (bottom one) - two internal ports on pin header - one port for m.2 E connector
The top USB 2.0 connector comes directly from the SoC.
Signed-off-by: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org Link: https://lore.kernel.org/r/20240829-friendlyelec-nanopc-t6-lts-v6-4-edff247e8... Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: db1dcbe5f752d423421f77d54d246398b196f670 ]
(cherry picked from commit f4a834fbc8cdb40fddd63d083e8d1c6189ba62dc) Signed-off-by: Jonas Karlman jonas@kwiboo.se --- .../arm64/rockchip/rk3588-nanopc-t6-lts.dts | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6-lts.dts
diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6-lts.dts b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6-lts.dts new file mode 100644 index 000000000000..2d92bbb4027d --- /dev/null +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6-lts.dts @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2021 Rockchip Electronics Co., Ltd. + * Copyright (c) 2023 Thomas McKahan + * Copyright (c) 2024 Linaro Ltd. + * + */ + +/dts-v1/; + +#include "rk3588-nanopc-t6.dtsi" + +/ { + model = "FriendlyElec NanoPC-T6 LTS"; + compatible = "friendlyarm,nanopc-t6-lts", "rockchip,rk3588"; + + /* provide power for on-board USB 2.0 hub */ + vcc5v0_usb20_host: vcc5v0-usb20-host-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&usb20_host_pwren>; + pinctrl-names = "default"; + regulator-always-on; + regulator-boot-on; + regulator-max-microvolt = <5000000>; + regulator-min-microvolt = <5000000>; + regulator-name = "vcc5v0_usb20_host"; + vin-supply = <&vcc5v0_sys>; + }; +}; + +&pinctrl { + usb { + usb20_host_pwren: usb20-host-pwren { + rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + +&u2phy1 { + status = "okay"; +}; + +&u2phy1_otg { + status = "okay"; +}; + +&u2phy2_host { + phy-supply = <&vcc5v0_usb20_host>; +}; + +&usbdp_phy1 { + status = "okay"; +}; + +&usb_host1_xhci { + dr_mode = "host"; + status = "okay"; +};
On 2024/10/18 04:00, Jonas Karlman wrote:
From: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org
In the LTS (2310) version the miniPCIe slot got removed and USB 2.0 setup has changed. There are two external accessible ports and two ports on the internal header.
There is an on-board USB hub which provides:
- one external connector (bottom one)
- two internal ports on pin header
- one port for m.2 E connector
The top USB 2.0 connector comes directly from the SoC.
Signed-off-by: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org Link: https://lore.kernel.org/r/20240829-friendlyelec-nanopc-t6-lts-v6-4-edff247e8... Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: db1dcbe5f752d423421f77d54d246398b196f670 ]
(cherry picked from commit f4a834fbc8cdb40fddd63d083e8d1c6189ba62dc) Signed-off-by: Jonas Karlman jonas@kwiboo.se
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
.../arm64/rockchip/rk3588-nanopc-t6-lts.dts | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6-lts.dts
diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6-lts.dts b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6-lts.dts new file mode 100644 index 000000000000..2d92bbb4027d --- /dev/null +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6-lts.dts @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/*
- Copyright (c) 2021 Rockchip Electronics Co., Ltd.
- Copyright (c) 2023 Thomas McKahan
- Copyright (c) 2024 Linaro Ltd.
- */
+/dts-v1/;
+#include "rk3588-nanopc-t6.dtsi"
+/ {
- model = "FriendlyElec NanoPC-T6 LTS";
- compatible = "friendlyarm,nanopc-t6-lts", "rockchip,rk3588";
- /* provide power for on-board USB 2.0 hub */
- vcc5v0_usb20_host: vcc5v0-usb20-host-regulator {
compatible = "regulator-fixed";enable-active-high;gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;pinctrl-0 = <&usb20_host_pwren>;pinctrl-names = "default";regulator-always-on;regulator-boot-on;regulator-max-microvolt = <5000000>;regulator-min-microvolt = <5000000>;regulator-name = "vcc5v0_usb20_host";vin-supply = <&vcc5v0_sys>;- };
+};
+&pinctrl {
- usb {
usb20_host_pwren: usb20-host-pwren {rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;};- };
+};
+&u2phy1 {
- status = "okay";
+};
+&u2phy1_otg {
- status = "okay";
+};
+&u2phy2_host {
- phy-supply = <&vcc5v0_usb20_host>;
+};
+&usbdp_phy1 {
- status = "okay";
+};
+&usb_host1_xhci {
- dr_mode = "host";
- status = "okay";
+};
From: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org
FriendlyELEC NanoPC-T6 has optional SPI flash chip on-board. It is populated with 32MB one on LTS version.
Signed-off-by: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org Reviewed-by: Jonas Karlman jonas@kwiboo.se Link: https://lore.kernel.org/r/20240829-friendlyelec-nanopc-t6-lts-v6-5-edff247e8... Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: a22a629c63b1addcf2d81eaf30383c1deca5b7a9 ]
(cherry picked from commit 7588da65fdf09c7de9f903780c212a8ae96f2866) Signed-off-by: Jonas Karlman jonas@kwiboo.se --- .../src/arm64/rockchip/rk3588-nanopc-t6.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi index d199f51a220c..77580c671b36 100644 --- a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi @@ -560,6 +560,21 @@ status = "okay"; };
+/* optional on non-LTS, populated on LTS version */ +&sfc { + pinctrl-names = "default"; + pinctrl-0 = <&fspim1_pins>; + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <104000000>; + spi-rx-bus-width = <4>; + spi-tx-bus-width = <1>; + }; +}; + &spi2 { status = "okay"; assigned-clocks = <&cru CLK_SPI2>;
On 2024/10/18 04:00, Jonas Karlman wrote:
From: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org
FriendlyELEC NanoPC-T6 has optional SPI flash chip on-board. It is populated with 32MB one on LTS version.
Signed-off-by: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org Reviewed-by: Jonas Karlman jonas@kwiboo.se Link: https://lore.kernel.org/r/20240829-friendlyelec-nanopc-t6-lts-v6-5-edff247e8... Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: a22a629c63b1addcf2d81eaf30383c1deca5b7a9 ]
(cherry picked from commit 7588da65fdf09c7de9f903780c212a8ae96f2866) Signed-off-by: Jonas Karlman jonas@kwiboo.se
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
.../src/arm64/rockchip/rk3588-nanopc-t6.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi index d199f51a220c..77580c671b36 100644 --- a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi @@ -560,6 +560,21 @@ status = "okay"; };
+/* optional on non-LTS, populated on LTS version */ +&sfc {
- pinctrl-names = "default";
- pinctrl-0 = <&fspim1_pins>;
- status = "okay";
- flash@0 {
compatible = "jedec,spi-nor";reg = <0>;spi-max-frequency = <104000000>;spi-rx-bus-width = <4>;spi-tx-bus-width = <1>;- };
+};
- &spi2 { status = "okay"; assigned-clocks = <&cru CLK_SPI2>;
The SPI flash node has been added in upstream DT, drop all props beside bootph-* props from the SPI flash related nodes from u-boot.dtsi.
Signed-off-by: Jonas Karlman jonas@kwiboo.se --- arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi | 11 ----------- 1 file changed, 11 deletions(-)
diff --git a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi index 968385622fa5..3261b2c42b4b 100644 --- a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi +++ b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi @@ -12,19 +12,8 @@ };
&sfc { - pinctrl-names = "default"; - pinctrl-0 = <&fspim1_pins>; - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; bootph-pre-ram; bootph-some-ram; - spi-max-frequency = <24000000>; - spi-rx-bus-width = <4>; - spi-tx-bus-width = <1>; }; };
On 2024/10/18 04:00, Jonas Karlman wrote:
The SPI flash node has been added in upstream DT, drop all props beside bootph-* props from the SPI flash related nodes from u-boot.dtsi.
Signed-off-by: Jonas Karlman jonas@kwiboo.se
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi | 11 ----------- 1 file changed, 11 deletions(-)
diff --git a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi index 968385622fa5..3261b2c42b4b 100644 --- a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi +++ b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi @@ -12,19 +12,8 @@ };
&sfc {
- pinctrl-names = "default";
- pinctrl-0 = <&fspim1_pins>;
- #address-cells = <1>;
- #size-cells = <0>;
- status = "okay";
- flash@0 {
compatible = "jedec,spi-nor";reg = <0>;spi-max-frequency = <24000000>;spi-rx-bus-width = <4>;spi-tx-bus-width = <1>;
When DM_REGULATOR=n is used the device_get_supply_regulator() function always return -ENOSYS.
Change to treat missing support for regulators as a missing optional vdd/vss-supply regulator to reduce error messages being logged.
Signed-off-by: Jonas Karlman jonas@kwiboo.se --- drivers/adc/adc-uclass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c index 16600be821c9..b02430eb7d7f 100644 --- a/drivers/adc/adc-uclass.c +++ b/drivers/adc/adc-uclass.c @@ -382,7 +382,7 @@ static int adc_vdd_plat_set(struct udevice *dev) if (!ret) return adc_vdd_plat_update(dev);
- if (ret != -ENOENT) + if (ret != -ENOSYS && ret != -ENOENT) return ret;
/* No vdd-supply phandle. */ @@ -406,7 +406,7 @@ static int adc_vss_plat_set(struct udevice *dev) if (!ret) return adc_vss_plat_update(dev);
- if (ret != -ENOENT) + if (ret != -ENOSYS && ret != -ENOENT) return ret;
/* No vss-supply phandle. */
On 2024/10/18 04:00, Jonas Karlman wrote:
When DM_REGULATOR=n is used the device_get_supply_regulator() function always return -ENOSYS.
Change to treat missing support for regulators as a missing optional vdd/vss-supply regulator to reduce error messages being logged.
Signed-off-by: Jonas Karlman jonas@kwiboo.se
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
drivers/adc/adc-uclass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c index 16600be821c9..b02430eb7d7f 100644 --- a/drivers/adc/adc-uclass.c +++ b/drivers/adc/adc-uclass.c @@ -382,7 +382,7 @@ static int adc_vdd_plat_set(struct udevice *dev) if (!ret) return adc_vdd_plat_update(dev);
- if (ret != -ENOENT)
if (ret != -ENOSYS && ret != -ENOENT) return ret;
/* No vdd-supply phandle. */
@@ -406,7 +406,7 @@ static int adc_vss_plat_set(struct udevice *dev) if (!ret) return adc_vss_plat_update(dev);
- if (ret != -ENOENT)
if (ret != -ENOSYS && ret != -ENOENT) return ret;
/* No vss-supply phandle. */
Change to use vdd-microvolts prop value as voltage reference when the supply regulator is missing or when DM_REGULATOR=n is used.
Signed-off-by: Jonas Karlman jonas@kwiboo.se --- drivers/adc/rockchip-saradc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/adc/rockchip-saradc.c b/drivers/adc/rockchip-saradc.c index f6832ab30731..7cf9735f60d0 100644 --- a/drivers/adc/rockchip-saradc.c +++ b/drivers/adc/rockchip-saradc.c @@ -241,7 +241,7 @@ int rockchip_saradc_probe(struct udevice *dev) { struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); struct rockchip_saradc_priv *priv = dev_get_priv(dev); - struct udevice *vref; + struct udevice *vref = NULL; struct clk clk; int vref_uv; int ret; @@ -259,7 +259,7 @@ int rockchip_saradc_probe(struct udevice *dev) priv->active_channel = -1;
ret = device_get_supply_regulator(dev, "vref-supply", &vref); - if (ret) { + if (ret && uc_pdata->vdd_microvolts <= 0) { printf("can't get vref-supply: %d\n", ret); return ret; } @@ -267,7 +267,10 @@ int rockchip_saradc_probe(struct udevice *dev) if (priv->reset) rockchip_saradc_reset_controller(priv->reset);
- vref_uv = regulator_get_value(vref); + if (vref) + vref_uv = regulator_get_value(vref); + else + vref_uv = uc_pdata->vdd_microvolts; if (vref_uv < 0) { printf("can't get vref-supply value: %d\n", vref_uv); return vref_uv;
On 2024/10/18 04:00, Jonas Karlman wrote:
Change to use vdd-microvolts prop value as voltage reference when the supply regulator is missing or when DM_REGULATOR=n is used.
Signed-off-by: Jonas Karlman jonas@kwiboo.se
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
drivers/adc/rockchip-saradc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/adc/rockchip-saradc.c b/drivers/adc/rockchip-saradc.c index f6832ab30731..7cf9735f60d0 100644 --- a/drivers/adc/rockchip-saradc.c +++ b/drivers/adc/rockchip-saradc.c @@ -241,7 +241,7 @@ int rockchip_saradc_probe(struct udevice *dev) { struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); struct rockchip_saradc_priv *priv = dev_get_priv(dev);
- struct udevice *vref;
- struct udevice *vref = NULL; struct clk clk; int vref_uv; int ret;
@@ -259,7 +259,7 @@ int rockchip_saradc_probe(struct udevice *dev) priv->active_channel = -1;
ret = device_get_supply_regulator(dev, "vref-supply", &vref);
- if (ret) {
- if (ret && uc_pdata->vdd_microvolts <= 0) { printf("can't get vref-supply: %d\n", ret); return ret; }
@@ -267,7 +267,10 @@ int rockchip_saradc_probe(struct udevice *dev) if (priv->reset) rockchip_saradc_reset_controller(priv->reset);
- vref_uv = regulator_get_value(vref);
- if (vref)
vref_uv = regulator_get_value(vref);- else
vref_uv = uc_pdata->vdd_microvolts;
On 2024/10/18 04:00, Jonas Karlman wrote:
Change to use vdd-microvolts prop value as voltage reference when the supply regulator is missing or when DM_REGULATOR=n is used.
Signed-off-by: Jonas Karlman jonas@kwiboo.se
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
drivers/adc/rockchip-saradc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/adc/rockchip-saradc.c b/drivers/adc/rockchip-saradc.c index f6832ab30731..7cf9735f60d0 100644 --- a/drivers/adc/rockchip-saradc.c +++ b/drivers/adc/rockchip-saradc.c @@ -241,7 +241,7 @@ int rockchip_saradc_probe(struct udevice *dev) { struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); struct rockchip_saradc_priv *priv = dev_get_priv(dev);
- struct udevice *vref;
- struct udevice *vref = NULL; struct clk clk; int vref_uv; int ret;
@@ -259,7 +259,7 @@ int rockchip_saradc_probe(struct udevice *dev) priv->active_channel = -1;
ret = device_get_supply_regulator(dev, "vref-supply", &vref);
- if (ret) {
- if (ret && uc_pdata->vdd_microvolts <= 0) { printf("can't get vref-supply: %d\n", ret); return ret; }
@@ -267,7 +267,10 @@ int rockchip_saradc_probe(struct udevice *dev) if (priv->reset) rockchip_saradc_reset_controller(priv->reset);
- vref_uv = regulator_get_value(vref);
- if (vref)
vref_uv = regulator_get_value(vref);- else
vref_uv = uc_pdata->vdd_microvolts;
Update defconfig to enable features included in pending upstream DT and implement board_fit_config_name_match() to load correct DT for LTS and non-LTS version of the NanoPC-T6.
Signed-off-by: Jonas Karlman jonas@kwiboo.se --- arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi | 5 ++ board/friendlyelec/nanopc-t6-rk3588/Makefile | 3 + .../nanopc-t6-rk3588/nanopc-t6-rk3588.c | 59 +++++++++++++++++++ configs/nanopc-t6-rk3588_defconfig | 12 ++++ 4 files changed, 79 insertions(+) create mode 100644 board/friendlyelec/nanopc-t6-rk3588/Makefile create mode 100644 board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-rk3588.c
diff --git a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi index 3261b2c42b4b..8465dcd4c9cd 100644 --- a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi +++ b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi @@ -11,6 +11,11 @@ bootph-some-ram; };
+&saradc { + bootph-pre-ram; + vdd-microvolts = <1800000>; +}; + &sfc { flash@0 { bootph-pre-ram; diff --git a/board/friendlyelec/nanopc-t6-rk3588/Makefile b/board/friendlyelec/nanopc-t6-rk3588/Makefile new file mode 100644 index 000000000000..2858e0d7c26f --- /dev/null +++ b/board/friendlyelec/nanopc-t6-rk3588/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0+ + +obj-y += nanopc-t6-rk3588.o diff --git a/board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-rk3588.c b/board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-rk3588.c new file mode 100644 index 000000000000..05cf55e4291d --- /dev/null +++ b/board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-rk3588.c @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include <adc.h> +#include <env.h> +#include <linux/errno.h> +#include <linux/kernel.h> + +#define HW_ID_CHANNEL 5 + +struct board_model { + unsigned int low; + unsigned int high; + const char *fdtfile; +}; + +static const struct board_model board_models[] = { + { 348, 528, "rockchip/rk3588-nanopc-t6.dtb" }, + { 1957, 2137, "rockchip/rk3588-nanopc-t6-lts.dtb" }, +}; + +static const struct board_model *get_board_model(void) +{ + unsigned int val; + int i, ret; + + ret = adc_channel_single_shot("adc@fec10000", HW_ID_CHANNEL, &val); + if (ret) + return NULL; + + for (i = 0; i < ARRAY_SIZE(board_models); i++) { + unsigned int min = board_models[i].low; + unsigned int max = board_models[i].high; + + if (min <= val && val <= max) + return &board_models[i]; + } + + return NULL; +} + +int rk_board_late_init(void) +{ + const struct board_model *model = get_board_model(); + + if (model) + env_set("fdtfile", model->fdtfile); + + return 0; +} + +int board_fit_config_name_match(const char *name) +{ + const struct board_model *model = get_board_model(); + + if (model && !strcmp(name, model->fdtfile)) + return 0; + + return -EINVAL; +} diff --git a/configs/nanopc-t6-rk3588_defconfig b/configs/nanopc-t6-rk3588_defconfig index d62c8168a8d6..772b7df15557 100644 --- a/configs/nanopc-t6-rk3588_defconfig +++ b/configs/nanopc-t6-rk3588_defconfig @@ -32,6 +32,7 @@ CONFIG_SPL_PAD_TO=0x7f8000 CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000 CONFIG_SPL_ATF=y +CONFIG_CMD_ADC=y CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y @@ -43,13 +44,20 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIVE=y +CONFIG_OF_LIST="rockchip/rk3588-nanopc-t6 rockchip/rk3588-nanopc-t6-lts" CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_REGMAP=y CONFIG_SPL_SYSCON=y +CONFIG_SPL_ADC=y +CONFIG_BUTTON=y +CONFIG_BUTTON_ADC=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y CONFIG_MISC=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_MMC_DW=y @@ -69,12 +77,16 @@ CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y CONFIG_PHY_ROCKCHIP_USBDP=y CONFIG_SPL_PINCTRL=y +CONFIG_DM_PMIC=y +CONFIG_PMIC_RK8XX=y +CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_SPL_RAM=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550_MEM32=y CONFIG_ROCKCHIP_SFC=y +CONFIG_ROCKCHIP_SPI=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y
On 2024/10/18 04:00, Jonas Karlman wrote:
Update defconfig to enable features included in pending upstream DT and implement board_fit_config_name_match() to load correct DT for LTS and non-LTS version of the NanoPC-T6.
Signed-off-by: Jonas Karlman jonas@kwiboo.se
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi | 5 ++ board/friendlyelec/nanopc-t6-rk3588/Makefile | 3 + .../nanopc-t6-rk3588/nanopc-t6-rk3588.c | 59 +++++++++++++++++++ configs/nanopc-t6-rk3588_defconfig | 12 ++++ 4 files changed, 79 insertions(+) create mode 100644 board/friendlyelec/nanopc-t6-rk3588/Makefile create mode 100644 board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-rk3588.c
diff --git a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi index 3261b2c42b4b..8465dcd4c9cd 100644 --- a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi +++ b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi @@ -11,6 +11,11 @@ bootph-some-ram; };
+&saradc {
- bootph-pre-ram;
- vdd-microvolts = <1800000>;
+};
- &sfc { flash@0 { bootph-pre-ram;
diff --git a/board/friendlyelec/nanopc-t6-rk3588/Makefile b/board/friendlyelec/nanopc-t6-rk3588/Makefile new file mode 100644 index 000000000000..2858e0d7c26f --- /dev/null +++ b/board/friendlyelec/nanopc-t6-rk3588/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0+
+obj-y += nanopc-t6-rk3588.o diff --git a/board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-rk3588.c b/board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-rk3588.c new file mode 100644 index 000000000000..05cf55e4291d --- /dev/null +++ b/board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-rk3588.c @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: GPL-2.0+
+#include <adc.h> +#include <env.h> +#include <linux/errno.h> +#include <linux/kernel.h>
+#define HW_ID_CHANNEL 5
+struct board_model {
- unsigned int low;
- unsigned int high;
- const char *fdtfile;
+};
+static const struct board_model board_models[] = {
- { 348, 528, "rockchip/rk3588-nanopc-t6.dtb" },
- { 1957, 2137, "rockchip/rk3588-nanopc-t6-lts.dtb" },
+};
+static const struct board_model *get_board_model(void) +{
- unsigned int val;
- int i, ret;
- ret = adc_channel_single_shot("adc@fec10000", HW_ID_CHANNEL, &val);
- if (ret)
return NULL;- for (i = 0; i < ARRAY_SIZE(board_models); i++) {
unsigned int min = board_models[i].low;unsigned int max = board_models[i].high;if (min <= val && val <= max)return &board_models[i];- }
- return NULL;
+}
+int rk_board_late_init(void) +{
- const struct board_model *model = get_board_model();
- if (model)
env_set("fdtfile", model->fdtfile);- return 0;
+}
+int board_fit_config_name_match(const char *name) +{
- const struct board_model *model = get_board_model();
- if (model && !strcmp(name, model->fdtfile))
return 0;- return -EINVAL;
+} diff --git a/configs/nanopc-t6-rk3588_defconfig b/configs/nanopc-t6-rk3588_defconfig index d62c8168a8d6..772b7df15557 100644 --- a/configs/nanopc-t6-rk3588_defconfig +++ b/configs/nanopc-t6-rk3588_defconfig @@ -32,6 +32,7 @@ CONFIG_SPL_PAD_TO=0x7f8000 CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000 CONFIG_SPL_ATF=y +CONFIG_CMD_ADC=y CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y @@ -43,13 +44,20 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIVE=y +CONFIG_OF_LIST="rockchip/rk3588-nanopc-t6 rockchip/rk3588-nanopc-t6-lts" CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_REGMAP=y CONFIG_SPL_SYSCON=y +CONFIG_SPL_ADC=y +CONFIG_BUTTON=y +CONFIG_BUTTON_ADC=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y CONFIG_MISC=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_MMC_DW=y @@ -69,12 +77,16 @@ CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y CONFIG_PHY_ROCKCHIP_USBDP=y CONFIG_SPL_PINCTRL=y +CONFIG_DM_PMIC=y +CONFIG_PMIC_RK8XX=y +CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_SPL_RAM=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550_MEM32=y CONFIG_ROCKCHIP_SFC=y +CONFIG_ROCKCHIP_SPI=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y
Hello Jonas and Marcin,
On 2024-10-17 22:00, Jonas Karlman wrote:
This series picks minimum required commits from v6.12-rc1-dts to add initial support for the FriendlyElec NanoPC-T6 LTS variant.
The adc-uclass and rockchip-saradc drivers are adopted to support cases when DM_REGULATOR is disabled and using a fallback voltage reference from the vdd-microvolts prop in DT.
Finally board specific code is added to help detect non-LTS vs LTS variant at runtime and nanopc-t6-rk3588_defconfig is extended to enable Kconfig options for updated DTs.
Please note that this has only been runtime tested on a non-LTS variant of a NanoPC-T6 board.
Could you, please, have a look at my patch that I recently submitted to the linux-rockchip mailing list? [1]
To sum it up, my patch does some of the same work you did in this series, by resolving the troublesome inclusion of all Rockchip board dts files in one fell swoop, and I'd appreciate if you could review those changes.
[1] https://lore.kernel.org/linux-rockchip/f3d789c14fe34a53327cac03cd3837e530e21...
Jonas Karlman (4): rockchip: rk3588-nanopc-t6: Drop upstream props from u-boot.dtsi adc: Allow use of adc with DM_REGULATOR disabled adc: rockchip-saradc: Use vdd-microvolts prop as fallback rockchip: rk3588-nanopc-t6: Add support for NanoPC-T6 LTS
Marcin Juszkiewicz (4): arm64: dts: rockchip: prepare NanoPC-T6 for LTS board arm64: dts: rockchip: move NanoPC-T6 parts to DTS arm64: dts: rockchip: add NanoPC-T6 LTS arm64: dts: rockchip: add SPI flash on NanoPC-T6
arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi | 16 +- board/friendlyelec/nanopc-t6-rk3588/Makefile | 3 + .../nanopc-t6-rk3588/nanopc-t6-rk3588.c | 59 ++ configs/nanopc-t6-rk3588_defconfig | 12 + drivers/adc/adc-uclass.c | 4 +- drivers/adc/rockchip-saradc.c | 9 +- .../arm64/rockchip/rk3588-nanopc-t6-lts.dts | 60 ++ .../src/arm64/rockchip/rk3588-nanopc-t6.dts | 909 +---------------- .../src/arm64/rockchip/rk3588-nanopc-t6.dtsi | 943 ++++++++++++++++++ 9 files changed, 1092 insertions(+), 923 deletions(-) create mode 100644 board/friendlyelec/nanopc-t6-rk3588/Makefile create mode 100644 board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-rk3588.c create mode 100644 dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6-lts.dts create mode 100644 dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi
W dniu 17.10.2024 o 22:00, Jonas Karlman pisze:
Finally board specific code is added to help detect non-LTS vs LTS variant at runtime and nanopc-t6-rk3588_defconfig is extended to enable Kconfig options for updated DTs.
Please note that this has only been runtime tested on a non-LTS variant of a NanoPC-T6 board.
As owner of NanoPC-T6 LTS variant I report that it detects it properly:
U-Boot 2024.10-01079-g096e83da0bc7 (Oct 18 2024 - 07:31:07 +0200)
Model: FriendlyElec NanoPC-T6 LTS DRAM: 16 GiB PMIC: RK806 (on=0x10, off=0x00) Core: 375 devices, 33 uclasses, devicetree: separate MMC: mmc@fe2c0000: 1, mmc@fe2e0000: 0 Loading Environment from nowhere... OK In: serial@feb50000 Out: serial@feb50000 Err: serial@feb50000 Model: FriendlyElec NanoPC-T6 LTS Net: No ethernet found. Hit any key to stop autoboot: 0 =>
Tested-off-by: Marcin Juszkiewicz marcin.juszkiewicz@linaro.org
participants (5)
-
Dragan Simic -
Jonas Karlman -
Kever Yang -
Marcin Juszkiewicz -
Sumit Garg