diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts index fad6a3fe8..ff93acacd 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts @@ -25,8 +25,8 @@ led-boot = &red_led; led-failsafe = &red_led; - led-running = &red_led; - led-upgrade = &red_led; + led-running = &green_led; + led-upgrade = &green_led; }; chosen { @@ -45,6 +45,7 @@ red_led: red-led { label = "red:status"; gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "default-on"; }; }; @@ -109,6 +110,8 @@ vcc_3v3_pcie: regulator-vcc-3v3-pcie { compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pcie_pwr_en>; regulator-name = "vcc_3v3_pcie"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; @@ -158,6 +161,30 @@ vin-supply = <&vcc_12v0_dcin>; }; + vcc_5v0_typec0: regulator-vcc-5v0-typec0 { + compatible = "regulator-fixed"; + enable-active-high; + gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usb_otg0_pwren>; + regulator-name = "vcc_5v0_typec0"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vcc_5v0_device>; + }; + + vcc_5v0_usbhost: regulator-vcc-5v0-usbhost { + compatible = "regulator-fixed"; + enable-active-high; + gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usb_host_pwren>; + regulator-name = "vcc_5v0_usbhost"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vcc_5v0_device>; + }; + vcc_3v3_ufs_s0: regulator-vcc-ufs-s0 { compatible = "regulator-fixed"; regulator-name = "vcc_3v3_ufs_s0"; @@ -167,49 +194,80 @@ regulator-max-microvolt = <3300000>; vin-supply = <&vcc_5v0_sys>; }; + + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + clocks = <&hym8563>; + clock-names = "ext_clock"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_reg_on>; + reset-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>; + }; +}; + +&combphy0_ps { + status = "okay"; +}; + +&combphy1_psu { + status = "okay"; +}; + +&cpu_b0 { + cpu-supply = <&vdd_cpu_big_s0>; +}; + +&cpu_b1 { + cpu-supply = <&vdd_cpu_big_s0>; +}; + +&cpu_b2 { + cpu-supply = <&vdd_cpu_big_s0>; +}; + +&cpu_b3 { + cpu-supply = <&vdd_cpu_big_s0>; }; &cpu_l0 { cpu-supply = <&vdd_cpu_lit_s0>; }; +&cpu_l1 { + cpu-supply = <&vdd_cpu_lit_s0>; +}; + +&cpu_l2 { + cpu-supply = <&vdd_cpu_lit_s0>; +}; + +&cpu_l3 { + cpu-supply = <&vdd_cpu_lit_s0>; +}; + &gmac0 { phy-mode = "rgmii-id"; clock_in_out = "output"; - - snps,reset-gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - snps,reset-delays-us = <0 20000 100000>; - + phy-handle = <&rgmii_phy0>; pinctrl-names = "default"; pinctrl-0 = <ð0m0_miim ð0m0_tx_bus2 ð0m0_rx_bus2 ð0m0_rgmii_clk - ð0m0_rgmii_bus - ðm0_clk0_25m_out>; - - phy-handle = <&rgmii_phy0>; + ð0m0_rgmii_bus>; status = "okay"; }; &gmac1 { phy-mode = "rgmii-id"; clock_in_out = "output"; - - snps,reset-gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - snps,reset-delays-us = <0 20000 100000>; - + phy-handle = <&rgmii_phy1>; pinctrl-names = "default"; pinctrl-0 = <ð1m0_miim ð1m0_tx_bus2 ð1m0_rx_bus2 ð1m0_rgmii_clk - ð1m0_rgmii_bus - ðm0_clk1_25m_out>; - - phy-handle = <&rgmii_phy1>; + ð1m0_rgmii_bus>; status = "okay"; }; @@ -578,12 +636,22 @@ &i2c2 { status = "okay"; + usbc0: typec-portc@22 { + compatible = "fcs,fusb302"; + reg = <0x22>; + interrupt-parent = <&gpio0>; + interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&usbc0_interrupt>; + vbus-supply = <&vcc_5v0_typec0>; + }; + hym8563: rtc@51 { compatible = "haoyu,hym8563"; reg = <0x51>; clock-output-names = "hym8563"; interrupt-parent = <&gpio0>; - interrupts = ; + interrupts = ; pinctrl-names = "default"; pinctrl-0 = <&hym8563_int>; wakeup-source; @@ -591,12 +659,19 @@ }; }; +&i2c3 { + status = "okay"; +}; + &mdio0 { rgmii_phy0: phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <0x1>; - clocks = <&cru REFCLKO25M_GMAC0_OUT>; - realtek,led-data = <0x6d60>; + pinctrl-names = "default"; + pinctrl-0 = <&gmac0_rst>; + reset-assert-us = <20000>; + reset-deassert-us = <100000>; + reset-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; }; }; @@ -604,12 +679,32 @@ rgmii_phy1: phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <0x1>; - clocks = <&cru REFCLKO25M_GMAC1_OUT>; - realtek,led-data = <0x6d60>; + pinctrl-names = "default"; + pinctrl-0 = <&gmac1_rst>; + reset-assert-us = <20000>; + reset-deassert-us = <100000>; + reset-gpios = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>; }; }; +&pcie0 { + pinctrl-names = "default"; + pinctrl-0 = <&pcie_reset>; + reset-gpios = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; + vpcie3v3-supply = <&vcc_3v3_pcie>; + status = "okay"; +}; + &pinctrl { + gmac { + gmac0_rst: gmac0-rst { + rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; + }; + gmac1_rst: gmac1-rst { + rockchip,pins = <3 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + headphone { hp_det: hp-det { rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>; @@ -630,6 +725,57 @@ rockchip,pins = <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; }; }; + + pcie { + pcie_pwr_en: pcie-pwr-en { + rockchip,pins = <3 RK_PD6 RK_FUNC_GPIO &pcfg_pull_down>; + }; + pcie_reset: pcie-reset { + rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + usb { + usb_host_pwren: usb-host-pwren { + rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + usb_otg0_pwren: usb-otg0-pwren { + rockchip,pins = <4 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + usbc0_interrupt: usbc0-interrupt { + rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>; + }; + usbc0_sbu1: usbc0-sbu1 { + rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_down>; + }; + usbc0_sbu2: usbc0-sbu2 { + rockchip,pins = <2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_down>; + }; + }; + + wireless-bluetooth { + bt_reg_on: bt-reg-on { + rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + host_wake_bt: host-wake-bt { + rockchip,pins = <1 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + bt_wake_host: bt-wake-host { + rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_down>; + }; + }; + + wireless-wlan { + wifi_wake_host: wifi-wake-host { + rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + wifi_reg_on: wifi-reg-on { + rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; }; &sdhci { @@ -644,6 +790,21 @@ status = "okay"; }; +&sdio { + bus-width = <4>; + cap-sdio-irq; + keep-power-in-suspend; + mmc-pwrseq = <&sdio_pwrseq>; + no-sd; + no-mmc; + non-removable; + sd-uhs-sdr104; + vmmc-supply = <&vcc_3v3_s3>; + vqmmc-supply = <&vcc_1v8_s3>; + wakeup-source; + status = "okay"; +}; + &sdmmc { bus-width = <4>; cap-mmc-highspeed; @@ -652,13 +813,58 @@ max-frequency = <200000000>; no-sdio; no-mmc; - sd-uhs-sdr50; + sd-uhs-sdr104; vmmc-supply = <&vcc_3v3_s3>; vqmmc-supply = <&vccio_sd_s0>; status = "okay"; }; +&u2phy0 { + status = "okay"; +}; + +&u2phy0_otg { + status = "okay"; +}; + +&u2phy1 { + status = "okay"; +}; + +&u2phy1_otg { + phy-supply = <&vcc_5v0_usbhost>; + status = "okay"; +}; + &uart0 { pinctrl-0 = <&uart0m0_xfer>; status = "okay"; }; + +&uart4 { + pinctrl-0 = <&uart4m1_xfer &uart4m1_ctsn &uart4m1_rtsn>; + pinctrl-names = "default"; + uart-has-rtscts; + status = "okay"; +}; + +&usb_drd0_dwc3 { + usb-role-switch; + dr_mode = "otg"; + status = "okay"; +}; + +&usb_drd1_dwc3 { + dr_mode = "host"; + status = "okay"; +}; + +&usbdp_phy { + mode-switch; + orientation-switch; + pinctrl-names = "default"; + pinctrl-0 = <&usbc0_sbu1 &usbc0_sbu2>; + sbu1-dc-gpios = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>; + sbu2-dc-gpios = <&gpio2 RK_PA7 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts index 515bdc564..0b98f9e87 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts @@ -23,11 +23,11 @@ ethernet0 = &gmac0; ethernet1 = &gmac1; mmc0 = &sdmmc; - - led-boot = &sys_led; - led-failsafe = &sys_led; - led-running = &sys_led; - led-upgrade = &sys_led; + + led-boot = &power_led; + led-failsafe = &power_led; + led-running = &power_led; + led-upgrade = &power_led; }; chosen { @@ -46,10 +46,10 @@ }; }; - gpio_keys: gpio-keys { + keys { compatible = "gpio-keys"; - button@1 { + key-1 { debounce-interval = <50>; gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_LOW>; label = "reset"; @@ -63,7 +63,7 @@ leds { compatible = "gpio-leds"; - sys_led: led-sys { + power_led: led-0 { color = ; function = LED_FUNCTION_HEARTBEAT; gpios = <&gpio2 RK_PB3 GPIO_ACTIVE_HIGH>; @@ -73,7 +73,7 @@ pinctrl-0 = <&led_sys_h>; }; - wan_led: led-wan { + led1: led-1 { color = ; function = LED_FUNCTION_LAN; gpios = <&gpio4 RK_PC5 GPIO_ACTIVE_HIGH>; @@ -83,7 +83,7 @@ pinctrl-0 = <&led1_h>; }; - lan_led: led-lan { + led2: led-2 { color = ; function = LED_FUNCTION_LAN; gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts index 9a50b6f09..b21651773 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts @@ -1,12 +1,18 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright (c) 2025 FriendlyElec Computer Tech. Co., Ltd. + * (http://www.friendlyelec.com) + * + * Copyright (c) 2025 Tianling Shen + */ /dts-v1/; - #include #include #include #include #include + #include "rk3576.dtsi" / { @@ -16,34 +22,60 @@ aliases { mmc0 = &sdhci; mmc1 = &sdmmc; + mmc2 = &sdio; - led-boot = &sys_led; - led-failsafe = &sys_led; - led-running = &sys_led; - led-upgrade = &sys_led; + led-boot = &power_led; + led-failsafe = &power_led; + led-running = &power_led; + led-upgrade = &power_led; }; - chosen: chosen { + chosen { stdout-path = "serial0:1500000n8"; }; - gpio_keys: gpio-keys { + gpio-keys { compatible = "gpio-keys"; pinctrl-names = "default"; - pinctrl-0 = <&reset_button_pin>; + pinctrl-0 = <&user_but_pin>; - button@1 { - debounce-interval = <50>; - gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_LOW>; + button-reset { label = "reset"; + gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_LOW>; + debounce-interval = <50>; linux,code = ; wakeup-source; }; }; + gpio-leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&led1_h>, <&led_sys_h>, <&led2_h>; + + led-0 { + color = ; + function = LED_FUNCTION_LAN; + gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; + }; + + power_led: led-1 { + color = ; + function = LED_FUNCTION_POWER; + gpios = <&gpio2 RK_PB3 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + }; + + led-2 { + color = ; + function = LED_FUNCTION_WAN; + gpios = <&gpio4 RK_PC5 GPIO_ACTIVE_HIGH>; + }; + }; + hdmi-con { compatible = "hdmi-connector"; - hdmi-pwr-supply = <&vcc_5v0_hdmi>; + hdmi-pwr-supply = <&vcc5v_hdmi_tx>; type = "a"; port { @@ -53,226 +85,126 @@ }; }; - gpio-leds { - compatible = "gpio-leds"; - - sys_led: led-sys { - gpios = <&gpio2 RK_PB3 GPIO_ACTIVE_HIGH>; - label = "red:power"; - linux,default-trigger = "heartbeat"; - pinctrl-names = "default"; - pinctrl-0 = <&sys_led_pin>; - }; - - wan_led: led-wan { - gpios = <&gpio4 RK_PC5 GPIO_ACTIVE_HIGH>; - label = "green:wan"; - pinctrl-names = "default"; - pinctrl-0 = <&wan_led_pin>; - }; - - lan_led: led-lan { - gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; - label = "green:lan"; - pinctrl-names = "default"; - pinctrl-0 = <&lan_led_pin>; - }; - }; - - usbc_vin0 { - compatible = "iio-hwmon"; - io-channels = <&saradc 2>; - }; - - vcc5v0_usb_otg0: regulator-vcc5v0-usb-otg0 { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_usb_otg0"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - gpio = <&gpio0 RK_PD1 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&usb_otg0_pwren_h>; - vin-supply = <&vcc5v0_device>; - }; - - vcc12v_dcin: regulator-vcc12v-dcin { - compatible = "regulator-fixed"; - regulator-name = "vcc12v_dcin"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <12000000>; - regulator-max-microvolt = <12000000>; - }; - - vcc1v2_ufs_vccq_s0: regulator-vcc1v2-ufs-vccq-s0 { - compatible = "regulator-fixed"; - regulator-name = "vcc1v2_ufs_vccq_s0"; - regulator-boot-on; - regulator-always-on; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - vin-supply = <&vcc_sys>; - }; - - vcc1v8_ufs_vccq2_s0: regulator-vcc1v8-ufs-vccq2-s0 { - compatible = "regulator-fixed"; - regulator-name = "vcc1v8_ufs_vccq2_s0"; - regulator-boot-on; - regulator-always-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - vin-supply = <&vcc_1v8_s3>; - }; - - vcc3v3_pcie20: vcc3v3-pcie20 { - compatible = "regulator-fixed"; - regulator-name = "vcc3v3_pcie20"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc_3v3_s3>; - }; - sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&hym8563>; clock-names = "ext_clock"; pinctrl-names = "default"; - pinctrl-0 = <&wifi_reg_on>; + pinctrl-0 = <&wifi_reg_on_h>; post-power-on-delay-ms = <200>; reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; }; vcc3v3_rtc_s5: regulator-vcc3v3-rtc-s5 { compatible = "regulator-fixed"; - regulator-name = "vcc3v3_rtc_s5"; - regulator-boot-on; regulator-always-on; + regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - vin-supply = <&vcc_sys>; + regulator-name = "vcc3v3_rtc_s5"; + vin-supply = <&vcc5v0_sys_s5>; }; - vcc_3v3_sd_s0: regulator-vcc-3v3-sd-s0 { + vcc5v_dcin: regulator-vcc5v-dcin { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-name = "vcc5v_dcin"; + }; + + vcc5v_hdmi_tx: regulator-vcc5v-hdmi-tx { compatible = "regulator-fixed"; enable-active-high; - gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>; + gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; - pinctrl-0 = <&sd_s0_pwren>; - regulator-boot-on; - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - regulator-name = "vcc_3v3_sd_s0"; - vin-supply = <&vcc_3v3_s3>; - - regulator-state-mem { - regulator-on-in-suspend; - }; + pinctrl-0 = <&hdmi_tx_on_h>; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-name = "vcc5v_hdmi_tx"; + vin-supply = <&vcc5v0_sys_s5>; }; - vcc5v0_device: regulator-vcc5v0-device { + vcc5v0_device_s0: regulator-vcc5v0-device-s0 { compatible = "regulator-fixed"; - regulator-name = "vcc5v0_device"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - vin-supply = <&vcc12v_dcin>; + regulator-name = "vcc5v0_device_s0"; + vin-supply = <&vcc5v_dcin>; }; - vcc_sys: regulator-vcc5v0-sys { + vcc5v0_sys_s5: regulator-vcc5v0-sys-s5 { compatible = "regulator-fixed"; - regulator-name = "vcc_sys"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - vin-supply = <&vcc12v_dcin>; + regulator-name = "vcc5v0_sys_s5"; + vin-supply = <&vcc5v_dcin>; + }; + + vcc5v0_usb_otg0: regulator-vcc5v0-usb-otg0 { + compatible = "regulator-fixed"; + enable-active-high; + gpios = <&gpio0 RK_PD1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usb_otg0_pwren_h>; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-name = "vcc5v0_usb_otg0"; + vin-supply = <&vcc5v0_sys_s5>; }; vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 { compatible = "regulator-fixed"; - regulator-name = "vcc_1v1_nldo_s3"; - regulator-boot-on; regulator-always-on; + regulator-boot-on; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; - vin-supply = <&vcc_sys>; + regulator-name = "vcc_1v1_nldo_s3"; + vin-supply = <&vcc5v0_sys_s5>; }; vcc_1v8_s0: regulator-vcc-1v8-s0 { compatible = "regulator-fixed"; - regulator-name = "vcc_1v8_s0"; - regulator-boot-on; regulator-always-on; + regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; + regulator-name = "vcc_1v8_s0"; vin-supply = <&vcc_1v8_s3>; }; vcc_2v0_pldo_s3: regulator-vcc-2v0-pldo-s3 { compatible = "regulator-fixed"; - regulator-name = "vcc_2v0_pldo_s3"; - regulator-boot-on; regulator-always-on; + regulator-boot-on; regulator-min-microvolt = <2000000>; regulator-max-microvolt = <2000000>; - vin-supply = <&vcc_sys>; + regulator-name = "vcc_2v0_pldo_s3"; + vin-supply = <&vcc5v0_sys_s5>; }; vcc_3v3_s0: regulator-vcc-3v3-s0 { compatible = "regulator-fixed"; - regulator-name = "vcc_3v3_s0"; - regulator-boot-on; regulator-always-on; + regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + regulator-name = "vcc_3v3_s0"; vin-supply = <&vcc_3v3_s3>; }; - - vcc_5v0_hdmi: regulator-vcc-5v0-hdmi { - compatible = "regulator-fixed"; - enable-active-high; - gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&hdmi_con_en>; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-name = "vcc_5v0_hdmi"; - vin-supply = <&vcc_sys>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vcc_ufs_s0: regulator-vcc-ufs-s0 { - compatible = "regulator-fixed"; - regulator-name = "vcc_ufs_s0"; - regulator-boot-on; - regulator-always-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc_sys>; - }; }; -&cpu_l0 { - cpu-supply = <&vdd_cpu_lit_s0>; +&combphy0_ps { + status = "okay"; }; -&cpu_l1 { - cpu-supply = <&vdd_cpu_lit_s0>; -}; - -&cpu_l2 { - cpu-supply = <&vdd_cpu_lit_s0>; -}; - -&cpu_l3 { - cpu-supply = <&vdd_cpu_lit_s0>; +&combphy1_psu { + status = "okay"; }; &cpu_b0 { @@ -291,11 +223,24 @@ cpu-supply = <&vdd_cpu_big_s0>; }; -&combphy0_ps { - status = "okay"; +&cpu_l0 { + cpu-supply = <&vdd_cpu_lit_s0>; }; -&combphy1_psu { +&cpu_l1 { + cpu-supply = <&vdd_cpu_lit_s0>; +}; + +&cpu_l2 { + cpu-supply = <&vdd_cpu_lit_s0>; +}; + +&cpu_l3 { + cpu-supply = <&vdd_cpu_lit_s0>; +}; + +&gpu { + mali-supply = <&vdd_gpu_s0>; status = "okay"; }; @@ -323,66 +268,42 @@ status = "okay"; }; -&sai6 { - status = "okay"; -}; - -&gpu { - mali-supply = <&vdd_gpu_s0>; - status = "okay"; -}; - &i2c1 { status = "okay"; - rk806: pmic@23 { + pmic@23 { compatible = "rockchip,rk806"; reg = <0x23>; + #gpio-cells = <2>; + gpio-controller; interrupt-parent = <&gpio0>; interrupts = <6 IRQ_TYPE_LEVEL_LOW>; - gpio-controller; - #gpio-cells = <2>; pinctrl-names = "default"; pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>, <&rk806_dvs2_null>, <&rk806_dvs3_null>; system-power-controller; - vcc1-supply = <&vcc_sys>; - vcc2-supply = <&vcc_sys>; - vcc3-supply = <&vcc_sys>; - vcc4-supply = <&vcc_sys>; - vcc5-supply = <&vcc_sys>; - vcc6-supply = <&vcc_sys>; - vcc7-supply = <&vcc_sys>; - vcc8-supply = <&vcc_sys>; - vcc9-supply = <&vcc_sys>; - vcc10-supply = <&vcc_sys>; + vcc1-supply = <&vcc5v0_sys_s5>; + vcc2-supply = <&vcc5v0_sys_s5>; + vcc3-supply = <&vcc5v0_sys_s5>; + vcc4-supply = <&vcc5v0_sys_s5>; + vcc5-supply = <&vcc5v0_sys_s5>; + vcc6-supply = <&vcc5v0_sys_s5>; + vcc7-supply = <&vcc5v0_sys_s5>; + vcc8-supply = <&vcc5v0_sys_s5>; + vcc9-supply = <&vcc5v0_sys_s5>; + vcc10-supply = <&vcc5v0_sys_s5>; vcc11-supply = <&vcc_2v0_pldo_s3>; - vcc12-supply = <&vcc_sys>; + vcc12-supply = <&vcc5v0_sys_s5>; vcc13-supply = <&vcc_1v1_nldo_s3>; vcc14-supply = <&vcc_1v1_nldo_s3>; - vcca-supply = <&vcc_sys>; + vcca-supply = <&vcc5v0_sys_s5>; 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"; - }; - - rk806_dvs1_slp: dvs1-slp-pins { - pins = "gpio_pwrctrl1"; - function = "pin_fun1"; - }; - rk806_dvs1_pwrdn: dvs1-pwrdn-pins { pins = "gpio_pwrctrl1"; function = "pin_fun2"; @@ -393,21 +314,11 @@ function = "pin_fun3"; }; - rk806_dvs2_slp: dvs2-slp-pins { - pins = "gpio_pwrctrl2"; + rk806_dvs1_slp: dvs1-slp-pins { + pins = "gpio_pwrctrl1"; function = "pin_fun1"; }; - rk806_dvs2_pwrdn: dvs2-pwrdn-pins { - pins = "gpio_pwrctrl2"; - function = "pin_fun2"; - }; - - rk806_dvs2_rst: dvs2-rst-pins { - pins = "gpio_pwrctrl2"; - function = "pin_fun3"; - }; - rk806_dvs2_dvs: dvs2-dvs-pins { pins = "gpio_pwrctrl2"; function = "pin_fun4"; @@ -418,21 +329,26 @@ function = "pin_fun5"; }; - rk806_dvs3_slp: dvs3-slp-pins { - pins = "gpio_pwrctrl3"; - function = "pin_fun1"; + rk806_dvs2_null: dvs2-null-pins { + pins = "gpio_pwrctrl2"; + function = "pin_fun0"; }; - rk806_dvs3_pwrdn: dvs3-pwrdn-pins { - pins = "gpio_pwrctrl3"; + rk806_dvs2_pwrdn: dvs2-pwrdn-pins { + pins = "gpio_pwrctrl2"; function = "pin_fun2"; }; - rk806_dvs3_rst: dvs3-rst-pins { - pins = "gpio_pwrctrl3"; + rk806_dvs2_rst: dvs2-rst-pins { + pins = "gpio_pwrctrl2"; function = "pin_fun3"; }; + rk806_dvs2_slp: dvs2-slp-pins { + pins = "gpio_pwrctrl2"; + function = "pin_fun1"; + }; + rk806_dvs3_dvs: dvs3-dvs-pins { pins = "gpio_pwrctrl3"; function = "pin_fun4"; @@ -443,15 +359,35 @@ function = "pin_fun5"; }; + rk806_dvs3_null: dvs3-null-pins { + pins = "gpio_pwrctrl3"; + function = "pin_fun0"; + }; + + rk806_dvs3_pwrdn: dvs3-pwrdn-pins { + pins = "gpio_pwrctrl3"; + function = "pin_fun2"; + }; + + rk806_dvs3_rst: dvs3-rst-pins { + pins = "gpio_pwrctrl3"; + function = "pin_fun3"; + }; + + rk806_dvs3_slp: dvs3-slp-pins { + pins = "gpio_pwrctrl3"; + function = "pin_fun1"; + }; + regulators { vdd_cpu_big_s0: dcdc-reg1 { regulator-always-on; regulator-boot-on; + regulator-enable-ramp-delay = <400>; regulator-min-microvolt = <550000>; regulator-max-microvolt = <950000>; - regulator-ramp-delay = <12500>; regulator-name = "vdd_cpu_big_s0"; - regulator-enable-ramp-delay = <400>; + regulator-ramp-delay = <12500>; regulator-state-mem { regulator-off-in-suspend; @@ -460,11 +396,11 @@ vdd_npu_s0: dcdc-reg2 { regulator-boot-on; + regulator-enable-ramp-delay = <400>; regulator-min-microvolt = <550000>; regulator-max-microvolt = <950000>; - regulator-ramp-delay = <12500>; regulator-name = "vdd_npu_s0"; - regulator-enable-ramp-delay = <400>; + regulator-ramp-delay = <12500>; regulator-state-mem { regulator-off-in-suspend; @@ -476,8 +412,8 @@ regulator-boot-on; regulator-min-microvolt = <550000>; regulator-max-microvolt = <950000>; - regulator-ramp-delay = <12500>; regulator-name = "vdd_cpu_lit_s0"; + regulator-ramp-delay = <12500>; regulator-state-mem { regulator-off-in-suspend; @@ -500,11 +436,11 @@ vdd_gpu_s0: dcdc-reg5 { regulator-boot-on; + regulator-enable-ramp-delay = <400>; regulator-min-microvolt = <550000>; regulator-max-microvolt = <900000>; - regulator-ramp-delay = <12500>; regulator-name = "vdd_gpu_s0"; - regulator-enable-ramp-delay = <400>; + regulator-ramp-delay = <12500>; regulator-state-mem { regulator-off-in-suspend; @@ -645,7 +581,7 @@ vdd_0v75_s3: nldo-reg1 { regulator-always-on; regulator-boot-on; - regulator-min-microvolt = <550000>; + regulator-min-microvolt = <750000>; regulator-max-microvolt = <750000>; regulator-name = "vdd_0v75_s3"; @@ -668,6 +604,7 @@ }; vdda0v75_hdmi_s0: nldo-reg3 { + regulator-always-on; regulator-boot-on; regulator-min-microvolt = <837500>; regulator-max-microvolt = <837500>; @@ -713,96 +650,68 @@ reg = <0x51>; #clock-cells = <0>; clock-output-names = "hym8563"; - pinctrl-names = "default"; - pinctrl-0 = <&rtc_int_l>; interrupt-parent = <&gpio0>; interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&rtc_int_l>; wakeup-source; }; }; &pcie0 { pinctrl-names = "default"; - pinctrl-0 = <&pcie0_reset>; + pinctrl-0 = <&pcie0_perstn>; reset-gpios = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_pcie20>; + vpcie3v3-supply = <&vcc_3v3_s3>; status = "okay"; - - pcie@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - - rtl8125_1: pcie@1,0 { - compatible = "pci10ec,8125"; - reg = <0x000000 0 0 0 0>; - - realtek,led-data = <0x0 0x0 0x2b 0x200>; - label = "eth0"; - }; - }; }; &pcie1 { pinctrl-names = "default"; - pinctrl-0 = <&pcie1_reset>; + pinctrl-0 = <&pcie1_perstn>; reset-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_pcie20>; + vpcie3v3-supply = <&vcc_3v3_s3>; status = "okay"; - - pcie@0,0 { - reg = <0x00100000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - - rtl8125_2: pcie@10,0 { - compatible = "pci10ec,8125"; - reg = <0x000000 0 0 0 0>; - - realtek,led-data = <0x0 0x0 0x2b 0x200>; - label = "eth1"; - }; - }; }; &pinctrl { - gpio-key { - reset_button_pin: reset-button-pin { + bt { + bt_reg_on_h: bt-reg-on-h { + rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + bt_wake_host_h: bt-wake-host-h { + rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + host_wake_bt_h: host-wake-bt-h { + rockchip,pins = <3 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + gpio-keys { + user_but_pin: user-but-pin { rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>; }; }; gpio-leds { - sys_led_pin: sys-led-pin { + led_sys_h: led-sys-h { rockchip,pins = <2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; }; - wan_led_pin: wan-led-pin { - rockchip,pins = <4 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - lan_led_pin: lan-led-pin { + led1_h: led1-h { rockchip,pins = <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; - }; - usb { - usb3_host_pwren_h: usb3-host-pwren-h { - rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - usb_otg0_pwren_h: usb-otg0-pwren-h { - rockchip,pins = <0 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>; + led2_h: led2-h { + rockchip,pins = <4 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; }; }; - pcie { - pcie0_reset: pcie0-reset { - rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>; - }; - - pcie1_reset: pcie1-reset { - rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>; + hdmi { + hdmi_tx_on_h: hdmi-tx-on-h { + rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; }; }; @@ -812,86 +721,80 @@ }; }; - sdmmc { - sd_s0_pwren: sd-s0-pwren { - rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>; + pcie { + pcie0_perstn: pcie0-perstn { + rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + pcie1_perstn: pcie1-perstn { + rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>; }; }; - hdmi { - hdmi_con_en: hdmi-con-en { - rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; + usb { + usb_otg0_pwren_h: usb-otg0-pwren-h { + rockchip,pins = <0 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>; }; }; - wireless-wlan { - wifi_wake_host: wifi-wake-host { + wifi { + wifi_wake_host_h: wifi-wake-host-h { rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>; }; - wifi_reg_on: wifi-reg-on { + wifi_reg_on_h: wifi-reg-on-h { rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; }; }; - - wireless-bluetooth { - bt_reg_on: bt-reg-on { - rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>; - }; - - host_wake_bt: host-wake-bt { - rockchip,pins = <3 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>; - }; - - bt_wake_host: bt-wake-host { - rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_down>; - }; - }; +}; + +&sai6 { + status = "okay"; }; &sdmmc { - max-frequency = <200000000>; - no-sdio; - no-mmc; bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; disable-wp; sd-uhs-sdr104; - vmmc-supply = <&vcc_3v3_sd_s0>; + vmmc-supply = <&vcc_3v3_s3>; vqmmc-supply = <&vccio_sd_s0>; - pinctrl-names = "default"; - pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_det &sdmmc0_bus4>; status = "okay"; }; &sdio { - max-frequency = <200000000>; - no-sd; - no-mmc; + #address-cells = <1>; + #size-cells = <0>; bus-width = <4>; - disable-wp; cap-sd-highspeed; cap-sdio-irq; keep-power-in-suspend; mmc-pwrseq = <&sdio_pwrseq>; non-removable; - pinctrl-names = "default"; - pinctrl-0 = <&sdmmc1m0_bus4 &sdmmc1m0_clk &sdmmc1m0_cmd>; sd-uhs-sdr104; + vmmc-supply = <&vcc_3v3_s3>; + vqmmc-supply = <&vcc_1v8_s3>; wakeup-source; status = "okay"; + + wifi@1 { + reg = <1>; + interrupt-parent = <&gpio0>; + interrupts = ; + interrupt-names = "host-wake"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_wake_host_h>; + }; }; &sdhci { bus-width = <8>; - no-sdio; - no-sd; - non-removable; - max-frequency = <200000000>; + cap-mmc-highspeed; + full-pwr-cycle-in-suspend; mmc-hs400-1_8v; mmc-hs400-enhanced-strobe; - full-pwr-cycle-in-suspend; + non-removable; status = "okay"; }; @@ -916,23 +819,26 @@ &uart5 { pinctrl-names = "default"; pinctrl-0 = <&uart5m0_xfer &uart5m0_ctsn &uart5m0_rtsn>; + uart-has-rtscts; status = "okay"; bluetooth { compatible = "realtek,rtl8822cs-bt"; enable-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_HIGH>; - host-wake-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; device-wake-gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>; + host-wake-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&bt_wake_host_h &host_wake_bt_h &bt_reg_on_h>; }; }; &usbdp_phy { - rockchip,dp-lane-mux = <2 3>; status = "okay"; }; &usb_drd0_dwc3 { dr_mode = "host"; + extcon = <&u2phy0>; status = "okay"; }; @@ -950,7 +856,3 @@ remote-endpoint = <&hdmi_in_vp0>; }; }; - -&wdt { - status= "okay"; -}; diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index cfd1f064b..b8a9d543d 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -27,7 +27,7 @@ define Device/ariaboard_photonicat2 DEVICE_MODEL := Photonicat 2 SOC := rk3576 DEVICE_DTS := rockchip/rk3576-photonicat2 - UBOOT_DEVICE_NAME := evb-rk3576 + UBOOT_DEVICE_NAME := generic-rk3576 IMAGE/sysupgrade.img.gz := boot-common | boot-script rk3576 | pine64-img | gzip | append-metadata DEVICE_PACKAGES := kmod-aic8800u wpad-openssl endef @@ -59,7 +59,7 @@ define Device/armsom_sige5 DEVICE_MODEL := Sige5 SOC := rk3576 DEVICE_DTS := rockchip/rk3576-armsom-sige5 - UBOOT_DEVICE_NAME := evb-rk3576 + UBOOT_DEVICE_NAME := sige5-rk3576 IMAGE/sysupgrade.img.gz := boot-common | boot-script rk3576 | pine64-img | gzip | append-metadata endef TARGET_DEVICES += armsom_sige5 @@ -161,7 +161,7 @@ define Device/friendlyarm_nanopi-m5 DEVICE_MODEL := NanoPi M5 SOC := rk3576 DEVICE_DTS := rockchip/rk3576-nanopi-m5 - UBOOT_DEVICE_NAME := evb-rk3576 + UBOOT_DEVICE_NAME := generic-rk3576 DEVICE_PACKAGES := kmod-gpio-button-hotplug IMAGE/sysupgrade.img.gz := boot-common | boot-script rk3576 | pine64-img | gzip | append-metadata endef @@ -291,7 +291,7 @@ define Device/friendlyarm_nanopi-r76s DEVICE_MODEL := NanoPi R76S SOC := rk3576 DEVICE_DTS := rockchip/rk3576-nanopi-r76s - UBOOT_DEVICE_NAME := evb-rk3576 + UBOOT_DEVICE_NAME := generic-rk3576 DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8125 IMAGE/sysupgrade.img.gz := boot-common | boot-script rk3576 | pine64-img | gzip | append-metadata endef