dt-bindings: arm: rockchip: Add FriendlyARM NanoPi R3S
Subsystems (2)
PATCH 1/2 dt-bindings: arm: rockchip: Add FriendlyARM NanoPi R3S
Add devicetree binding for FriendlyARM NanoPi R3S.
--- Documentation/devicetree/bindings/arm/rockchip.yaml | 5 +++++ 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/arm/rockchip.yaml +5 -0
@@ -244,6 +244,11 @@ properties: - friendlyarm,nanopi-r2s-plus - const: rockchip,rk3328 + - description: FriendlyElec NanoPi R3S + items: + - const: friendlyarm,nanopi-r3s + - const: rockchip,rk3566 + - description: FriendlyElec NanoPi4 series boards items: - enum:
Signature · 1 line
2.47.0
PATCH 2/2 arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board
The NanoPi R3S(as "R3S") is an open source platform with dual-Gbps Ethernet ports designed and developed by FriendlyElec for IoT applications.
Specification:
- Rockchip RK3566
- 2GB LPDDR4X RAM
- optional 32GB eMMC module
- SD card slot
- 2x 1000 Base-T
- 3x LEDs (POWER, LAN, WAN)
- 2x Buttons (Reset, MaskROM)
- 1x USB 3.0 Port
- Type-C 5V 2A Power
--- arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3566-nanopi-r3s.dts | 554 ++++++++++++++++++ 2 files changed, 555 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
arch/arm64/boot/dts/rockchip/Makefile +1 -0
@@ -109,6 +109,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-model-a.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-box-demo.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lckfb-tspi.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lubancat-1.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-nanopi-r3s.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-fastrhino-r66s.dtb
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +554 -0
554 lines not on this page · raw message
Signature · 1 line
2.47.0
Re: [PATCH 2/2] arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board
Hi Tianling,
Quoted 50 lines · Tianling Shen
The NanoPi
R3S(as "R3S")is an open source platform with dual-Gbps Ethernet ports designed and developed by FriendlyElec for IoT applications.Specification:
- Rockchip RK3566
- 2GB LPDDR4X RAM
- optional 32GB eMMC module
- SD card slot
- 2x 1000 Base-T
- 3x LEDs (POWER, LAN, WAN)
- 2x Buttons (Reset, MaskROM)
- 1x USB 3.0 Port
- Type-C 5V 2A PowerSigned-off-by Tianling Shen <[email protected]>--- arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3566-nanopi-r3s.dts | 554 ++++++++++++++++++ 2 files changed, 555 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dtsarch/arm64/boot/dts/rockchip/Makefile +1
-0@@ -109,6 +109,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-model-a.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-box-demo.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lckfb-tspi.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lubancat-1.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-nanopi-r3s.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-fastrhino-r66s.dtbarch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +10
-0@@ -0,0 +1,554 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright (c) 2020 Rockchip Electronics Co., Ltd. + * + * Copyright (c) 2024 FriendlyElec Computer Tech. Co., Ltd. + * (http://www.friendlyarm.com/ + * + * Copyright (c) 2024 Tianling Shen <[email protected]> + */ +
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts line 20
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +10
-0+/dts-v1/; +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> +#include <dt-bindings/pinctrl/rockchip.h> +#include <dt-bindings/soc/rockchip,vop2.h> +#include "rk3566.dtsi" + +/ { + model = "FriendlyARM NanoPi R3S";
Please use the marketing name, and the name added in binding:
FriendlyElec NanoPi R3S
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts line 26
Quoted 6 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +6
-0+ compatible = "friendlyarm,nanopi-r3s", "rockchip,rk3566"; + + aliases { + ethernet0 = &gmac1; + mmc0 = &sdmmc0; + mmc1 = &sdhci;
This board comes with on-board eMMC this please use mmc0 as alias for &sdhci; and mmc1 for sd-card.
Quoted 44 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +44
-0+ }; + + chosen: chosen { + stdout-path = "serial2:1500000n8"; + }; + + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&reset_button_pin>; + + button-reset { + label = "reset"; + gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_LOW>; + linux,code = <KEY_RESTART>; + debounce-interval = <50>; + }; + }; + + gpio-leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&power_led_pin>, <&lan_led_pin>, <&wan_led_pin>; + + power_led: led-0 { + color = <LED_COLOR_ID_RED>; + function = LED_FUNCTION_POWER; + gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; + default-state = "on"; + }; + + lan_led: led-1 { + color = <LED_COLOR_ID_GREEN>; + function = LED_FUNCTION_LAN; + gpios = <&gpio3 RK_PC2 GPIO_ACTIVE_HIGH>; + }; + + wan_led: led-2 { + color = <LED_COLOR_ID_GREEN>; + function = LED_FUNCTION_WAN; + gpios = <&gpio3 RK_PC3 GPIO_ACTIVE_HIGH>; + }; + }; +
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts line 80
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +10
-0+ vdd_usbc: vdd-usbc-regulator { + compatible = "regulator-fixed"; + regulator-name = "vdd_usbc"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + + vcc5v0_sys: vcc5v0-sys-regulator {
This and other fixed regulators does not match the recommended naming
pattern: ^regulator-(.*)$, please rename fixed regulator nodes.
Quoted 65 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +65
-0+ compatible = "regulator-fixed"; + regulator-name = "vcc5v0_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vdd_usbc>; + }; + + vcc3v3_sys: vcc3v3-sys-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc5v0_sys>; + }; + + vcc5v0_usb: vcc5v0_usb-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&vcc5v0_usb_host_en>; + regulator-name = "vcc5v0_usb"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vcc5v0_sys>; + }; +}; + +&combphy1 { + status = "okay"; +}; + +&combphy2 { + status = "okay"; +}; + +&cpu0 { + cpu-supply = <&vdd_cpu>; +}; + +&cpu1 { + cpu-supply = <&vdd_cpu>; +}; + +&cpu2 { + cpu-supply = <&vdd_cpu>; +}; + +&cpu3 { + cpu-supply = <&vdd_cpu>; +}; + +&gmac1 { + assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1>; + assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru CLK_MAC1_2TOP>; + assigned-clock-rates = <0>, <125000000>; + clock_in_out = "output"; + phy-mode = "rgmii-id"; + phy-handle = <&rgmii_phy1>;
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts line 155
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +10
-0+ pinctrl-names = "default"; + pinctrl-0 = <&gmac1m0_miim + &gmac1m0_tx_bus2_level3 + &gmac1m0_rx_bus2 + &gmac1m0_rgmii_clk_level2 + &gmac1m0_rgmii_bus_level3>; + snps,reset-gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>; + snps,reset-active-low; + /* Reset time is 20ms, 100ms for rtl8211f */ + snps,reset-delays-us = <0 20000 100000>;
These snps,reset props is deprecated, please add reset props to the Ethernet PHY node.
Quoted 251 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +251
-0+ status = "okay"; +}; + +&gpu { + mali-supply = <&vdd_gpu>; + status = "okay"; +}; + +&i2c0 { + status = "okay"; + + vdd_cpu: regulator@1c { + compatible = "tcs,tcs4525"; + reg = <0x1c>; + fcs,suspend-voltage-selector = <1>; + regulator-name = "vdd_cpu"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1150000>; + regulator-ramp-delay = <2300>; + vin-supply = <&vcc5v0_sys>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + rk809: pmic@20 { + compatible = "rockchip,rk809"; + reg = <0x20>; + interrupt-parent = <&gpio0>; + interrupts = <RK_PA3 IRQ_TYPE_LEVEL_LOW>; + #clock-cells = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&pmic_int>; + system-power-controller; + vcc1-supply = <&vcc3v3_sys>; + vcc2-supply = <&vcc3v3_sys>; + vcc3-supply = <&vcc3v3_sys>; + vcc4-supply = <&vcc3v3_sys>; + vcc5-supply = <&vcc3v3_sys>; + vcc6-supply = <&vcc3v3_sys>; + vcc7-supply = <&vcc3v3_sys>; + vcc8-supply = <&vcc3v3_sys>; + vcc9-supply = <&vcc3v3_sys>; + wakeup-source; + + regulators { + vdd_logic: DCDC_REG1 { + regulator-name = "vdd_logic"; + regulator-always-on; + regulator-boot-on; + regulator-initial-mode = <0x2>; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1350000>; + regulator-ramp-delay = <6001>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vdd_gpu: DCDC_REG2 { + regulator-name = "vdd_gpu"; + regulator-always-on; + regulator-initial-mode = <0x2>; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1350000>; + regulator-ramp-delay = <6001>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc_ddr: DCDC_REG3 { + regulator-name = "vcc_ddr"; + regulator-always-on; + regulator-boot-on; + regulator-initial-mode = <0x2>; + + regulator-state-mem { + regulator-on-in-suspend; + }; + }; + + vdd_npu: DCDC_REG4 { + regulator-name = "vdd_npu"; + regulator-initial-mode = <0x2>; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1350000>; + regulator-ramp-delay = <6001>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc_1v8: DCDC_REG5 { + regulator-name = "vcc_1v8"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vdda0v9_image: LDO_REG1 { + regulator-name = "vdda0v9_image"; + regulator-min-microvolt = <950000>; + regulator-max-microvolt = <950000>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vdda_0v9: LDO_REG2 { + regulator-name = "vdda_0v9"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <900000>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vdda0v9_pmu: LDO_REG3 { + regulator-name = "vdda0v9_pmu"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <900000>; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <900000>; + }; + }; + + vccio_acodec: LDO_REG4 { + regulator-name = "vccio_acodec"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vccio_sd: LDO_REG5 { + regulator-name = "vccio_sd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc3v3_pmu: LDO_REG6 { + regulator-name = "vcc3v3_pmu"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <3300000>; + }; + }; + + vcca_1v8: LDO_REG7 { + regulator-name = "vcca_1v8"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcca1v8_pmu: LDO_REG8 { + regulator-name = "vcca1v8_pmu"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; + }; + }; + + vcca1v8_image: LDO_REG9 { + regulator-name = "vcca1v8_image"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc_3v3: SWITCH_REG1 { + regulator-name = "vcc_3v3"; + regulator-always-on; + regulator-boot-on; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc3v3_sd: SWITCH_REG2 { + regulator-name = "vcc3v3_sd"; + regulator-always-on; + regulator-boot-on; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + }; + }; +}; + +&i2c1 { + status = "okay"; + + 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_PD3 IRQ_TYPE_LEVEL_LOW>; + wakeup-source; + };
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts line 416
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +10
-0+}; + +&mdio1 { + rgmii_phy1: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + interrupt-parent = <&gpio4>; + interrupts = <RK_PC3 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <ð_phy_reset_pin>;
Please add the reset props here.
Quoted 54 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +54
-0+ }; +}; + +&pcie2x1 { + pinctrl-names = "default"; + pinctrl-0 = <&pcie_reset_h>; + reset-gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&pinctrl { + gpio-leds { + lan_led_pin: lan-led-pin { + rockchip,pins = <3 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + power_led_pin: power-led-pin { + rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + wan_led_pin: wan-led-pin { + rockchip,pins = <3 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + gmac { + eth_phy_reset_pin: eth-phy-reset-pin { + rockchip,pins = <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + pcie { + pcie_reset_h: pcie-reset-h { + rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_down>; + }; + }; + + pmic { + pmic_int: pmic-int { + rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + rockchip-key { + reset_button_pin: reset-button-pin { + rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + rtc { + hym8563_int: hym8563-int { + rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>; + }; + };
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts line 480
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +10
-0+ + usb { + vcc5v0_usb_host_en: vcc5v0-usb-host-en { + rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + +&pmu_io_domains { + status = "okay";
The status prop is typically the last prop.
Quoted 5 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +5
-0+ pmuio1-supply = <&vcc3v3_pmu>; + pmuio2-supply = <&vcc3v3_pmu>; + vccio1-supply = <&vccio_acodec>; + vccio2-supply = <&vcc_1v8>; + vccio3-supply = <&vccio_sd>;
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts line 495
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +10
-0+ vccio4-supply = <&vcc_3v3>; + vccio5-supply = <&vcc_1v8>; + vccio6-supply = <&vcc_3v3>; + vccio7-supply = <&vcc_3v3>; +}; + +&sdhci { + bus-width = <8>; + max-frequency = <200000000>; + non-removable;
Please add the hs200 prop here, or we will need to add is in U-Boot to be able to boot from eMMC.
Regards,
Jonas
Quoted 59 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +59
-0+ pinctrl-names = "default"; + pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>; + status = "okay"; +}; + +&sdmmc0 { + bus-width = <4>; + cap-mmc-highspeed; + cap-sd-highspeed; + disable-wp; + no-sdio; + no-mmc; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>; + sd-uhs-sdr50; + vmmc-supply = <&vcc3v3_sd>; + vqmmc-supply = <&vccio_sd>; + status = "okay"; +}; + +&tsadc { + status = "okay"; +}; + +&uart2 { + status = "okay"; +}; + +&usb2phy0 { + status = "okay"; +}; + +&usb2phy0_host { + phy-supply = <&vcc5v0_usb>; + status = "okay"; +}; + +&usb2phy0_otg { + status = "okay"; +}; + +&usb_host0_xhci { + extcon = <&usb2phy0>; + status = "okay"; +}; + +&usb_host1_xhci { + status = "okay"; +}; + +&vop { + assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>; + assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>; + status = "okay"; +}; + +&vop_mmu { + status = "okay"; +};
Re: [PATCH 2/2] arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board
Hi Jonas,
Quoted 67 lines · On Wed, Oct 23, 2024 at 12:49 AM Jonas Karlman <[email protected]> wrote:
Hi Tianling,
Quoted 50 lines · Tianling Shen
The NanoPi
R3S(as "R3S")is an open source platform with dual-Gbps Ethernet ports designed and developed by FriendlyElec for IoT applications.Specification:
- Rockchip RK3566
- 2GB LPDDR4X RAM
- optional 32GB eMMC module
- SD card slot
- 2x 1000 Base-T
- 3x LEDs (POWER, LAN, WAN)
- 2x Buttons (Reset, MaskROM)
- 1x USB 3.0 Port
- Type-C 5V 2A PowerSigned-off-by Tianling Shen <[email protected]>---
 arch/arm64/boot/dts/rockchip/Makefile     |  1 +  .../boot/dts/rockchip/rk3566-nanopi-r3s.dts  | 554 ++++++++++++++++++  2 files changed, 555 insertions(+)
 create mode 100644arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dtsarch/arm64/boot/dts/rockchip/Makefile +0
-0@@ -109,6 +109,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-model-a.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-box-demo.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lckfb-tspi.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lubancat-1.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-nanopi-r3s.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-fastrhino-r66s.dtb
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +10
-0@@ -0,0 +1,554 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright (c) 2020 Rockchip Electronics Co., Ltd. + * + * Copyright (c) 2024 FriendlyElec Computer Tech. Co., Ltd. + * (http://www.friendlyarm.com/ + * + * Copyright (c) 2024 Tianling Shen <[email protected]> + */ +arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts line 20
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +10
-0+/dts-v1/; +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> +#include <dt-bindings/pinctrl/rockchip.h> +#include <dt-bindings/soc/rockchip,vop2.h> +#include "rk3566.dtsi" + +/ { + Â Â model = "FriendlyARM NanoPi R3S";Please use the marketing name, and the name added in binding:
Quoted 1 line
  FriendlyElec NanoPi R3S
Sorry for the copy & paste error, will fix it in new patch.
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts line 26
Quoted 7 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +6
-0+ Â Â compatible = "friendlyarm,nanopi-r3s", "rockchip,rk3566"; + + Â Â aliases { + Â Â Â Â Â Â ethernet0 = &gmac1; + Â Â Â Â Â Â mmc0 = &sdmmc0; + Â Â Â Â Â Â mmc1 = &sdhci;This board comes with on-board eMMC this please use mmc0 as alias for &sdhci; and mmc1 for sd-card.
Is using mmc0 for sdhci a common practice for eMMC boards? The eMMC module on R3S is optional and users may get boards without it.
Quoted 50 lines
Quoted 50 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +49
-0+ Â Â }; + + Â Â chosen: chosen { + Â Â Â Â Â Â stdout-path = "serial2:1500000n8"; + Â Â }; + + Â Â gpio-keys { + Â Â Â Â Â Â compatible = "gpio-keys"; + Â Â Â Â Â Â pinctrl-names = "default"; + Â Â Â Â Â Â pinctrl-0 = <&reset_button_pin>; + + Â Â Â Â Â Â button-reset { + Â Â Â Â Â Â Â Â Â Â label = "reset"; + Â Â Â Â Â Â Â Â Â Â gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_LOW>; + Â Â Â Â Â Â Â Â Â Â linux,code = <KEY_RESTART>; + Â Â Â Â Â Â Â Â Â Â debounce-interval = <50>; + Â Â Â Â Â Â }; + Â Â }; + + Â Â gpio-leds { + Â Â Â Â Â Â compatible = "gpio-leds"; + Â Â Â Â Â Â pinctrl-names = "default"; + Â Â Â Â Â Â pinctrl-0 = <&power_led_pin>, <&lan_led_pin>, <&wan_led_pin>; + + Â Â Â Â Â Â power_led: led-0 { + Â Â Â Â Â Â Â Â Â Â color = <LED_COLOR_ID_RED>; + Â Â Â Â Â Â Â Â Â Â function = LED_FUNCTION_POWER; + Â Â Â Â Â Â Â Â Â Â gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; + Â Â Â Â Â Â Â Â Â Â default-state = "on"; + Â Â Â Â Â Â }; + + Â Â Â Â Â Â lan_led: led-1 { + Â Â Â Â Â Â Â Â Â Â color = <LED_COLOR_ID_GREEN>; + Â Â Â Â Â Â Â Â Â Â function = LED_FUNCTION_LAN; + Â Â Â Â Â Â Â Â Â Â gpios = <&gpio3 RK_PC2 GPIO_ACTIVE_HIGH>; + Â Â Â Â Â Â }; + + Â Â Â Â Â Â wan_led: led-2 { + Â Â Â Â Â Â Â Â Â Â color = <LED_COLOR_ID_GREEN>; + Â Â Â Â Â Â Â Â Â Â function = LED_FUNCTION_WAN; + Â Â Â Â Â Â Â Â Â Â gpios = <&gpio3 RK_PC3 GPIO_ACTIVE_HIGH>; + Â Â Â Â Â Â }; + Â Â }; + + Â Â vdd_usbc: vdd-usbc-regulator { + Â Â Â Â Â Â compatible = "regulator-fixed"; + Â Â Â Â Â Â regulator-name = "vdd_usbc"; + Â Â Â Â Â Â regulator-always-on; + Â Â Â Â Â Â regulator-boot-on;
Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts line 80
Quoted 5 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +5
-0+ Â Â Â Â Â Â regulator-min-microvolt = <5000000>; + Â Â Â Â Â Â regulator-max-microvolt = <5000000>; + Â Â }; + + Â Â vcc5v0_sys: vcc5v0-sys-regulator {This and other fixed regulators does not match the recommended naming
pattern: ^regulator-(.*)$, please rename fixed regulator nodes.
Soory I missed the dt-binding update, also thanks Heiko for renaming the regulator nodes.
Quoted 71 lines
Quoted 71 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +70
-0+ Â Â Â Â Â Â compatible = "regulator-fixed"; + Â Â Â Â Â Â regulator-name = "vcc5v0_sys"; + Â Â Â Â Â Â regulator-always-on; + Â Â Â Â Â Â regulator-boot-on; + Â Â Â Â Â Â regulator-min-microvolt = <5000000>; + Â Â Â Â Â Â regulator-max-microvolt = <5000000>; + Â Â Â Â Â Â vin-supply = <&vdd_usbc>; + Â Â }; + + Â Â vcc3v3_sys: vcc3v3-sys-regulator { + Â Â Â Â Â Â compatible = "regulator-fixed"; + Â Â Â Â Â Â regulator-name = "vcc3v3_sys"; + Â Â Â Â Â Â regulator-always-on; + Â Â Â Â Â Â regulator-boot-on; + Â Â Â Â Â Â regulator-min-microvolt = <3300000>; + Â Â Â Â Â Â regulator-max-microvolt = <3300000>; + Â Â Â Â Â Â vin-supply = <&vcc5v0_sys>; + Â Â }; + + Â Â vcc5v0_usb: vcc5v0_usb-regulator { + Â Â Â Â Â Â compatible = "regulator-fixed"; + Â Â Â Â Â Â enable-active-high; + Â Â Â Â Â Â gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>; + Â Â Â Â Â Â pinctrl-names = "default"; + Â Â Â Â Â Â pinctrl-0 = <&vcc5v0_usb_host_en>; + Â Â Â Â Â Â regulator-name = "vcc5v0_usb"; + Â Â Â Â Â Â regulator-always-on; + Â Â Â Â Â Â regulator-boot-on; + Â Â Â Â Â Â regulator-min-microvolt = <5000000>; + Â Â Â Â Â Â regulator-max-microvolt = <5000000>; + Â Â Â Â Â Â vin-supply = <&vcc5v0_sys>; + Â Â }; +}; + +&combphy1 { + Â Â status = "okay"; +}; + +&combphy2 { + Â Â status = "okay"; +}; + +&cpu0 { + Â Â cpu-supply = <&vdd_cpu>; +}; + +&cpu1 { + Â Â cpu-supply = <&vdd_cpu>; +}; + +&cpu2 { + Â Â cpu-supply = <&vdd_cpu>; +}; + +&cpu3 { + Â Â cpu-supply = <&vdd_cpu>; +}; + +&gmac1 { + Â Â assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1>; + Â Â assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru CLK_MAC1_2TOP>; + Â Â assigned-clock-rates = <0>, <125000000>; + Â Â clock_in_out = "output"; + Â Â phy-mode = "rgmii-id"; + Â Â phy-handle = <&rgmii_phy1>; + Â Â pinctrl-names = "default"; + Â Â pinctrl-0 = <&gmac1m0_miim + Â Â Â Â Â Â Â Â Â &gmac1m0_tx_bus2_level3 + Â Â Â Â Â Â Â Â Â &gmac1m0_rx_bus2 + Â Â Â Â Â Â Â Â Â &gmac1m0_rgmii_clk_level2
Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts line 155
Quoted 5 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +5
-0+ Â Â Â Â Â Â Â Â Â &gmac1m0_rgmii_bus_level3>; + Â Â snps,reset-gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>; + Â Â snps,reset-active-low; + Â Â /* Reset time is 20ms, 100ms for rtl8211f */ + Â Â snps,reset-delays-us = <0 20000 100000>;These snps,reset props is deprecated, please add reset props to the Ethernet PHY node.
Will fix it in new patch.
Quoted 323 lines
Quoted 252 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +251
-0+ Â Â status = "okay"; +}; + +&gpu { + Â Â mali-supply = <&vdd_gpu>; + Â Â status = "okay"; +}; + +&i2c0 { + Â Â status = "okay"; + + Â Â vdd_cpu: regulator@1c { + Â Â Â Â Â Â compatible = "tcs,tcs4525"; + Â Â Â Â Â Â reg = <0x1c>; + Â Â Â Â Â Â fcs,suspend-voltage-selector = <1>; + Â Â Â Â Â Â regulator-name = "vdd_cpu"; + Â Â Â Â Â Â regulator-always-on; + Â Â Â Â Â Â regulator-boot-on; + Â Â Â Â Â Â regulator-min-microvolt = <800000>; + Â Â Â Â Â Â regulator-max-microvolt = <1150000>; + Â Â Â Â Â Â regulator-ramp-delay = <2300>; + Â Â Â Â Â Â vin-supply = <&vcc5v0_sys>; + + Â Â Â Â Â Â regulator-state-mem { + Â Â Â Â Â Â Â Â Â Â regulator-off-in-suspend; + Â Â Â Â Â Â }; + Â Â }; + + Â Â rk809: pmic@20 { + Â Â Â Â Â Â compatible = "rockchip,rk809"; + Â Â Â Â Â Â reg = <0x20>; + Â Â Â Â Â Â interrupt-parent = <&gpio0>; + Â Â Â Â Â Â interrupts = <RK_PA3 IRQ_TYPE_LEVEL_LOW>; + Â Â Â Â Â Â #clock-cells = <1>; + Â Â Â Â Â Â pinctrl-names = "default"; + Â Â Â Â Â Â pinctrl-0 = <&pmic_int>; + Â Â Â Â Â Â system-power-controller; + Â Â Â Â Â Â vcc1-supply = <&vcc3v3_sys>; + Â Â Â Â Â Â vcc2-supply = <&vcc3v3_sys>; + Â Â Â Â Â Â vcc3-supply = <&vcc3v3_sys>; + Â Â Â Â Â Â vcc4-supply = <&vcc3v3_sys>; + Â Â Â Â Â Â vcc5-supply = <&vcc3v3_sys>; + Â Â Â Â Â Â vcc6-supply = <&vcc3v3_sys>; + Â Â Â Â Â Â vcc7-supply = <&vcc3v3_sys>; + Â Â Â Â Â Â vcc8-supply = <&vcc3v3_sys>; + Â Â Â Â Â Â vcc9-supply = <&vcc3v3_sys>; + Â Â Â Â Â Â wakeup-source; + + Â Â Â Â Â Â regulators { + Â Â Â Â Â Â Â Â Â Â vdd_logic: DCDC_REG1 { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-name = "vdd_logic"; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-always-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-boot-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-initial-mode = <0x2>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-min-microvolt = <500000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-max-microvolt = <1350000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-ramp-delay = <6001>; + + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-state-mem { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-off-in-suspend; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â }; + Â Â Â Â Â Â Â Â Â Â }; + + Â Â Â Â Â Â Â Â Â Â vdd_gpu: DCDC_REG2 { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-name = "vdd_gpu"; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-always-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-initial-mode = <0x2>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-min-microvolt = <500000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-max-microvolt = <1350000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-ramp-delay = <6001>; + + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-state-mem { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-off-in-suspend; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â }; + Â Â Â Â Â Â Â Â Â Â }; + + Â Â Â Â Â Â Â Â Â Â vcc_ddr: DCDC_REG3 { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-name = "vcc_ddr"; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-always-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-boot-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-initial-mode = <0x2>; + + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-state-mem { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-on-in-suspend; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â }; + Â Â Â Â Â Â Â Â Â Â }; + + Â Â Â Â Â Â Â Â Â Â vdd_npu: DCDC_REG4 { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-name = "vdd_npu"; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-initial-mode = <0x2>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-min-microvolt = <500000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-max-microvolt = <1350000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-ramp-delay = <6001>; + + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-state-mem { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-off-in-suspend; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â }; + Â Â Â Â Â Â Â Â Â Â }; + + Â Â Â Â Â Â Â Â Â Â vcc_1v8: DCDC_REG5 { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-name = "vcc_1v8"; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-always-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-boot-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-min-microvolt = <1800000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-max-microvolt = <1800000>; + + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-state-mem { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-off-in-suspend; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â }; + Â Â Â Â Â Â Â Â Â Â }; + + Â Â Â Â Â Â Â Â Â Â vdda0v9_image: LDO_REG1 { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-name = "vdda0v9_image"; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-min-microvolt = <950000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-max-microvolt = <950000>; + + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-state-mem { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-off-in-suspend; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â }; + Â Â Â Â Â Â Â Â Â Â }; + + Â Â Â Â Â Â Â Â Â Â vdda_0v9: LDO_REG2 { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-name = "vdda_0v9"; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-always-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-boot-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-min-microvolt = <900000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-max-microvolt = <900000>; + + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-state-mem { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-off-in-suspend; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â }; + Â Â Â Â Â Â Â Â Â Â }; + + Â Â Â Â Â Â Â Â Â Â vdda0v9_pmu: LDO_REG3 { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-name = "vdda0v9_pmu"; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-always-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-boot-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-min-microvolt = <900000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-max-microvolt = <900000>; + + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-state-mem { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-on-in-suspend; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-suspend-microvolt = <900000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â }; + Â Â Â Â Â Â Â Â Â Â }; + + Â Â Â Â Â Â Â Â Â Â vccio_acodec: LDO_REG4 { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-name = "vccio_acodec"; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-min-microvolt = <3300000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-max-microvolt = <3300000>; + + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-state-mem { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-off-in-suspend; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â }; + Â Â Â Â Â Â Â Â Â Â }; + + Â Â Â Â Â Â Â Â Â Â vccio_sd: LDO_REG5 { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-name = "vccio_sd"; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-min-microvolt = <1800000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-max-microvolt = <3300000>; + + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-state-mem { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-off-in-suspend; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â }; + Â Â Â Â Â Â Â Â Â Â }; + + Â Â Â Â Â Â Â Â Â Â vcc3v3_pmu: LDO_REG6 { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-name = "vcc3v3_pmu"; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-always-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-boot-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-min-microvolt = <3300000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-max-microvolt = <3300000>; + + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-state-mem { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-on-in-suspend; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-suspend-microvolt = <3300000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â }; + Â Â Â Â Â Â Â Â Â Â }; + + Â Â Â Â Â Â Â Â Â Â vcca_1v8: LDO_REG7 { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-name = "vcca_1v8"; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-always-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-boot-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-min-microvolt = <1800000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-max-microvolt = <1800000>; + + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-state-mem { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-off-in-suspend; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â }; + Â Â Â Â Â Â Â Â Â Â }; + + Â Â Â Â Â Â Â Â Â Â vcca1v8_pmu: LDO_REG8 { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-name = "vcca1v8_pmu"; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-always-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-boot-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-min-microvolt = <1800000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-max-microvolt = <1800000>; + + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-state-mem { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-on-in-suspend; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-suspend-microvolt = <1800000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â }; + Â Â Â Â Â Â Â Â Â Â }; + + Â Â Â Â Â Â Â Â Â Â vcca1v8_image: LDO_REG9 { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-name = "vcca1v8_image"; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-min-microvolt = <1800000>; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-max-microvolt = <1800000>; + + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-state-mem { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-off-in-suspend; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â }; + Â Â Â Â Â Â Â Â Â Â }; + + Â Â Â Â Â Â Â Â Â Â vcc_3v3: SWITCH_REG1 { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-name = "vcc_3v3"; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-always-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-boot-on; + + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-state-mem { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-off-in-suspend; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â }; + Â Â Â Â Â Â Â Â Â Â }; + + Â Â Â Â Â Â Â Â Â Â vcc3v3_sd: SWITCH_REG2 { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-name = "vcc3v3_sd"; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-always-on; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-boot-on; + + Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-state-mem { + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â regulator-off-in-suspend; + Â Â Â Â Â Â Â Â Â Â Â Â Â Â }; + Â Â Â Â Â Â Â Â Â Â }; + Â Â Â Â Â Â }; + Â Â }; +}; + +&i2c1 { + Â Â status = "okay"; + + Â Â 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_PD3 IRQ_TYPE_LEVEL_LOW>; + Â Â Â Â Â Â wakeup-source; + Â Â };arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts line 416
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +10
-0+}; + +&mdio1 { + Â Â rgmii_phy1: ethernet-phy@1 { + Â Â Â Â Â Â compatible = "ethernet-phy-ieee802.3-c22"; + Â Â Â Â Â Â reg = <1>; + Â Â Â Â Â Â interrupt-parent = <&gpio4>; + Â Â Â Â Â Â interrupts = <RK_PC3 IRQ_TYPE_LEVEL_LOW>; + Â Â Â Â Â Â pinctrl-names = "default"; + Â Â Â Â Â Â pinctrl-0 = <ð_phy_reset_pin>;Please add the reset props here.
Quoted 58 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +58
-0+ Â Â }; +}; + +&pcie2x1 { + Â Â pinctrl-names = "default"; + Â Â pinctrl-0 = <&pcie_reset_h>; + Â Â reset-gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; + Â Â status = "okay"; +}; + +&pinctrl { + Â Â gpio-leds { + Â Â Â Â Â Â lan_led_pin: lan-led-pin { + Â Â Â Â Â Â Â Â Â Â rockchip,pins = <3 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; + Â Â Â Â Â Â }; + + Â Â Â Â Â Â power_led_pin: power-led-pin { + Â Â Â Â Â Â Â Â Â Â rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; + Â Â Â Â Â Â }; + + Â Â Â Â Â Â wan_led_pin: wan-led-pin { + Â Â Â Â Â Â Â Â Â Â rockchip,pins = <3 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>; + Â Â Â Â Â Â }; + Â Â }; + + Â Â gmac { + Â Â Â Â Â Â eth_phy_reset_pin: eth-phy-reset-pin { + Â Â Â Â Â Â Â Â Â Â rockchip,pins = <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>; + Â Â Â Â Â Â }; + Â Â }; + + Â Â pcie { + Â Â Â Â Â Â pcie_reset_h: pcie-reset-h { + Â Â Â Â Â Â Â Â Â Â rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_down>; + Â Â Â Â Â Â }; + Â Â }; + + Â Â pmic { + Â Â Â Â Â Â pmic_int: pmic-int { + Â Â Â Â Â Â Â Â Â Â rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>; + Â Â Â Â Â Â }; + Â Â }; + + Â Â rockchip-key { + Â Â Â Â Â Â reset_button_pin: reset-button-pin { + Â Â Â Â Â Â Â Â Â Â rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>; + Â Â Â Â Â Â }; + Â Â }; + + Â Â rtc { + Â Â Â Â Â Â hym8563_int: hym8563-int { + Â Â Â Â Â Â Â Â Â Â rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>; + Â Â Â Â Â Â }; + Â Â }; + + Â Â usb { + Â Â Â Â Â Â vcc5v0_usb_host_en: vcc5v0-usb-host-en { + Â Â Â Â Â Â Â Â Â Â rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
Quoted 6 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +6
-0+ Â Â Â Â Â Â }; + Â Â }; +}; + +&pmu_io_domains { + Â Â status = "okay";The status prop is typically the last prop.
Will fix it in new patch.
Quoted 11 lines
Quoted 11 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +10
-0+ Â Â pmuio1-supply = <&vcc3v3_pmu>; + Â Â pmuio2-supply = <&vcc3v3_pmu>; + Â Â vccio1-supply = <&vccio_acodec>; + Â Â vccio2-supply = <&vcc_1v8>; + Â Â vccio3-supply = <&vccio_sd>; + Â Â vccio4-supply = <&vcc_3v3>; + Â Â vccio5-supply = <&vcc_1v8>; + Â Â vccio6-supply = <&vcc_3v3>; + Â Â vccio7-supply = <&vcc_3v3>; +};
Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts line 495
Quoted 5 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +5
-0+ +&sdhci { + Â Â bus-width = <8>; + Â Â max-frequency = <200000000>; + Â Â non-removable;Please add the hs200 prop here, or we will need to add is in U-Boot to be able to boot from eMMC.
Thanks for the hint, will fix it in new patch.
Thanks,
Tianling.
Quoted 64 lines
Regards,
JonasQuoted 59 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +59
-0+ Â Â pinctrl-names = "default"; + Â Â pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>; + Â Â status = "okay"; +}; + +&sdmmc0 { + Â Â bus-width = <4>; + Â Â cap-mmc-highspeed; + Â Â cap-sd-highspeed; + Â Â disable-wp; + Â Â no-sdio; + Â Â no-mmc; + Â Â pinctrl-names = "default"; + Â Â pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>; + Â Â sd-uhs-sdr50; + Â Â vmmc-supply = <&vcc3v3_sd>; + Â Â vqmmc-supply = <&vccio_sd>; + Â Â status = "okay"; +}; + +&tsadc { + Â Â status = "okay"; +}; + +&uart2 { + Â Â status = "okay"; +}; + +&usb2phy0 { + Â Â status = "okay"; +}; + +&usb2phy0_host { + Â Â phy-supply = <&vcc5v0_usb>; + Â Â status = "okay"; +}; + +&usb2phy0_otg { + Â Â status = "okay"; +}; + +&usb_host0_xhci { + Â Â extcon = <&usb2phy0>; + Â Â status = "okay"; +}; + +&usb_host1_xhci { + Â Â status = "okay"; +}; + +&vop { + Â Â assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>; + Â Â assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>; + Â Â status = "okay"; +}; + +&vop_mmu { + Â Â status = "okay"; +};
Re: [PATCH 2/2] arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board
Hi Tianling,
Quoted 45 lines · Tianling Shen
Hi Jonas,
Quoted 42 lines · On Wed, Oct 23, 2024 at 12:49 AM Jonas Karlman <[email protected]> wrote:
Hi Tianling,
Quoted 38 lines · Tianling Shen
The NanoPi
R3S(as "R3S")is an open source platform with dual-Gbps Ethernet ports designed and developed by FriendlyElec for IoT applications.Specification:
- Rockchip RK3566
- 2GB LPDDR4X RAM
- optional 32GB eMMC module
- SD card slot
- 2x 1000 Base-T
- 3x LEDs (POWER, LAN, WAN)
- 2x Buttons (Reset, MaskROM)
- 1x USB 3.0 Port
- Type-C 5V 2A PowerSigned-off-by Tianling Shen <[email protected]>---
 arch/arm64/boot/dts/rockchip/Makefile     |  1 +  .../boot/dts/rockchip/rk3566-nanopi-r3s.dts  | 554 ++++++++++++++++++  2 files changed, 555 insertions(+)
 create mode 100644arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dtsarch/arm64/boot/dts/rockchip/Makefile +0
-0@@ -109,6 +109,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-model-a.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-box-demo.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lckfb-tspi.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lubancat-1.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-nanopi-r3s.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-fastrhino-r66s.dtb
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +0
-1--- /dev/null
Quoted 8 lines
Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts line 6
Quoted 8 lines
+++
b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dtsarch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +6
-0@@ -0,0 +1,554 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright (c) 2020 Rockchip Electronics Co., Ltd. + * + * Copyright (c) 2024 FriendlyElec Computer Tech. Co., Ltd. + * (http://www.friendlyarm.com/
This could probably be updated to use https://www.friendlyelec.com/
Quoted 17 lines
Quoted 17 lines
Quoted 4 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +4
-0+ * + * Copyright (c) 2024 Tianling Shen <[email protected]> + */ +arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +10
-0+/dts-v1/; +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> +#include <dt-bindings/pinctrl/rockchip.h> +#include <dt-bindings/soc/rockchip,vop2.h> +#include "rk3566.dtsi" + +/ { + Â Â model = "FriendlyARM NanoPi R3S";Please use the marketing name, and the name added in binding:
Quoted 3 lines
Quoted 1 line
  FriendlyElec NanoPi R3S
Sorry for the copy & paste error, will fix it in new patch.
The commit subject could probably also be updated :-)
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +6
-0+ Â Â compatible = "friendlyarm,nanopi-r3s", "rockchip,rk3566"; + + Â Â aliases { + Â Â Â Â Â Â ethernet0 = &gmac1; + Â Â Â Â Â Â mmc0 = &sdmmc0; + Â Â Â Â Â Â mmc1 = &sdhci;
Quoted 5 lines
Quoted 2 lines
This board comes with on-board eMMC this please use mmc0 as alias for &sdhci; and mmc1 for sd-card.
Is using mmc0 for sdhci a common practice for eMMC boards? The eMMC module on R3S is optional and users may get boards without it.
Typically any non-removable storage (emmc) is listed before removable storage (sd-card) options. Also U-Boot will try to override and use mmc0=sdhci and mmc1=sdmmc0 for all rk356x boards, so for EFI booing using control FDT the alias may be different.
Regards,
Jonas
[snip]
Re: [PATCH 2/2] arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board
Hi Jonas,
Quoted 51 lines · Jonas Karlman
Hi Tianling,
Quoted 47 lines · Tianling Shen
Hi Jonas,
Quoted 44 lines · On Wed, Oct 23, 2024 at 12:49 AM Jonas Karlman <[email protected]> wrote:
Hi Tianling,
Quoted 40 lines · Tianling Shen
The NanoPi
R3S(as "R3S")is an open source platform with dual-Gbps Ethernet ports designed and developed by FriendlyElec for IoT applications.Specification:
- Rockchip RK3566
- 2GB LPDDR4X RAM
- optional 32GB eMMC module
- SD card slot
- 2x 1000 Base-T
- 3x LEDs (POWER, LAN, WAN)
- 2x Buttons (Reset, MaskROM)
- 1x USB 3.0 Port
- Type-C 5V 2A PowerSigned-off-by Tianling Shen <[email protected]>---
Âarch/arm64/boot/dts/rockchip/Makefile    |  1 + Â.../boot/dts/rockchip/rk3566-nanopi-r3s.dts | 554 ++++++++++++++++++  2 files changed, 555 insertions(+)
 create mode 100644arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dtsarch/arm64/boot/dts/rockchip/Makefile +0
-0@@ -109,6 +109,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-model-a.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-box-demo.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lckfb-tspi.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lubancat-1.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-nanopi-r3s.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-fastrhino-r66s.dtb
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +0
-0@@ -0,0 +1,554 @@
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
Quoted 6 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +6
-0+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright (c) 2020 Rockchip Electronics Co., Ltd. + * + * Copyright (c) 2024 FriendlyElec Computer Tech. Co., Ltd. + * (http://www.friendlyarm.com/This could probably be updated to use https://www.friendlyelec.com/
Yes!
Quoted 36 lines
Quoted 18 lines
Quoted 18 lines
Quoted 5 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +4
-0+ * + * Copyright (c) 2024 Tianling Shen <[email protected]> + */ +arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +10
-0+/dts-v1/; +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> +#include <dt-bindings/pinctrl/rockchip.h> +#include <dt-bindings/soc/rockchip,vop2.h> +#include "rk3566.dtsi" + +/ { + Â Â model = "FriendlyARM NanoPi R3S";Please use the marketing name, and the name added in binding:
Quoted 3 lines
Quoted 1 line
  FriendlyElec NanoPi R3S
Sorry for the copy & paste error, will fix it in new patch.
The commit subject could probably also be updated :-)
Quoted 12 lines
Quoted 11 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts line 26
Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +6
-0+ Â Â compatible = "friendlyarm,nanopi-r3s", "rockchip,rk3566"; + + Â Â aliases { + Â Â Â Â Â Â ethernet0 = &gmac1; + Â Â Â Â Â Â mmc0 = &sdmmc0; + Â Â Â Â Â Â mmc1 = &sdhci;This board comes with on-board eMMC this please use mmc0 as alias for &sdhci; and mmc1 for sd-card.
Quoted 8 lines
Quoted 2 lines
Is using mmc0 for sdhci a common practice for eMMC boards? The eMMC module on R3S is optional and users may get boards without it.
Typically any non-removable storage (emmc) is listed before removable storage (sd-card) options. Also U-Boot will try to override and use mmc0=sdhci and mmc1=sdmmc0 for all rk356x boards, so for EFI booing using control FDT the alias may be different.
Thank you for the details! May I have your Suggested-by tag for all of these fixes?
Thanks,
Tianling.
Quoted 4 lines
Regards,
Jonas[snip]
Re: [PATCH 2/2] arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board
Hi Tianling,
Quoted 104 lines · Tianling Shen
Hi Jonas,
Quoted 51 lines · Jonas Karlman
Hi Tianling,
Quoted 47 lines · Tianling Shen
Hi Jonas,
Quoted 44 lines · On Wed, Oct 23, 2024 at 12:49 AM Jonas Karlman <[email protected]> wrote:
Hi Tianling,
Quoted 40 lines · Tianling Shen
The NanoPi
R3S(as "R3S")is an open source platform with dual-Gbps Ethernet ports designed and developed by FriendlyElec for IoT applications.Specification:
- Rockchip RK3566
- 2GB LPDDR4X RAM
- optional 32GB eMMC module
- SD card slot
- 2x 1000 Base-T
- 3x LEDs (POWER, LAN, WAN)
- 2x Buttons (Reset, MaskROM)
- 1x USB 3.0 Port
- Type-C 5V 2A PowerSigned-off-by Tianling Shen <[email protected]>---
Âarch/arm64/boot/dts/rockchip/Makefile    |  1 + Â.../boot/dts/rockchip/rk3566-nanopi-r3s.dts | 554 ++++++++++++++++++  2 files changed, 555 insertions(+)
 create mode 100644arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dtsarch/arm64/boot/dts/rockchip/Makefile +0
-0@@ -109,6 +109,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-model-a.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-box-demo.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lckfb-tspi.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lubancat-1.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-nanopi-r3s.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-fastrhino-r66s.dtb
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +0
-0@@ -0,0 +1,554 @@Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
Quoted 6 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +6
-0+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright (c) 2020 Rockchip Electronics Co., Ltd. + * + * Copyright (c) 2024 FriendlyElec Computer Tech. Co., Ltd. + * (http://www.friendlyarm.com/This could probably be updated to use https://www.friendlyelec.com/
Yes!
Quoted 39 lines
Quoted 18 lines
Quoted 18 lines
Quoted 5 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +4
-0+ * + * Copyright (c) 2024 Tianling Shen <[email protected]> + */ +arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +10
-0+/dts-v1/; +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> +#include <dt-bindings/pinctrl/rockchip.h> +#include <dt-bindings/soc/rockchip,vop2.h> +#include "rk3566.dtsi" + +/ { + Â Â model = "FriendlyARM NanoPi R3S";Please use the marketing name, and the name added in binding:
Quoted 3 lines
Quoted 1 line
  FriendlyElec NanoPi R3S
Sorry for the copy & paste error, will fix it in new patch.
The commit subject could probably also be updated :-)
Quoted 14 lines
Quoted 11 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts line 26
Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts new file +6
-0+ Â Â compatible = "friendlyarm,nanopi-r3s", "rockchip,rk3566"; + + Â Â aliases { + Â Â Â Â Â Â ethernet0 = &gmac1; + Â Â Â Â Â Â mmc0 = &sdmmc0; + Â Â Â Â Â Â mmc1 = &sdhci;This board comes with on-board eMMC this please use mmc0 as alias for &sdhci; and mmc1 for sd-card.
Is using mmc0 for sdhci a common practice for eMMC boards? The eMMC module on R3S is optional and users may get boards without it.
Quoted 8 lines
Quoted 5 lines
Typically any non-removable storage (emmc) is listed before removable storage (sd-card) options. Also U-Boot will try to override and use mmc0=sdhci and mmc1=sdmmc0 for all rk356x boards, so for EFI booing using control FDT the alias may be different.
Thank you for the details! May I have your Suggested-by tag for all of these fixes?
Sure,
Regards,
Jonas
Quoted 8 lines
Thanks,
Tianling.Quoted 4 lines
Regards,
Jonas[snip]
Quoted 3 lines · Tianling Shen
Add devicetree binding for FriendlyARM NanoPi R3S.
Signed-off-by Tianling Shen <[email protected]>
Quoted 3 lines · Tianling Shen
Add devicetree binding for FriendlyARM NanoPi R3S.
Applied, thanks!
[1/2] dt-bindings: arm: rockchip: Add FriendlyARM NanoPi R3S
commit: 1e94bfea52bee081c42ab922c19156dd3d2bade8
[2/2] arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board
commit: 50decd493c8394c52d04561fe4ede34df27a46baBest regards,
Signature · 1 line
Heiko Stuebner <[email protected]>
Hi Heiko,
Quoted 11 lines · Heiko Stuebner
Quoted 3 lines · Tianling Shen
Add devicetree binding for FriendlyARM NanoPi R3S.
Applied, thanks!
[1/2] dt-bindings: arm: rockchip: Add FriendlyARM NanoPi R3S
commit: 1e94bfea52bee081c42ab922c19156dd3d2bade8 [2/2] arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board commit: 50decd493c8394c52d04561fe4ede34df27a46ba
I just sent out a review on this patch [1], please leave more then a day or two to finish up a review ;-)
[1] https://lore.kernel.org/r/[email protected]/
Regards,
Jonas
Quoted 2 lines
Best regards,
Heiko Stübner
maintainerAm Dienstag, 22. Oktober 2024, 19:07:43 CEST schrieb Jonas Karlman:
Quoted 10 lines
Hi Heiko,
Quoted 7 lines · Heiko Stuebner
Quoted 3 lines · Tianling Shen
Add devicetree binding for FriendlyARM NanoPi R3S.
Applied, thanks!
Quoted 7 lines
Quoted 4 lines
[1/2] dt-bindings: arm: rockchip: Add FriendlyARM NanoPi R3S
commit: 1e94bfea52bee081c42ab922c19156dd3d2bade8 [2/2] arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board commit: 50decd493c8394c52d04561fe4ede34df27a46baI just sent out a review on this patch [1], please leave more then a day or two to finish up a review ;-)
Hehe, yeah might be better ... somehow that small board dts looked so innocent though - aka what could go wrong ;-) ... obviously something.
Quoted 9 lines
[1] https://lore.kernel.org/r/[email protected]/
Regards,
JonasQuoted 2 lines
Best regards,