dt-bindings: Add doc for FriendlyARM NanoPi R2S
Subsystems (2)
PATCH v2 1/2 dt-bindings: Add doc for FriendlyARM NanoPi R2S
Add devicetree binding documentation for the FriendlyARM NanoPi R2S.
---
Changes in v2:
- Change model name to FriendlyElec
Documentation/devicetree/bindings/arm/rockchip.yaml | 5 +++++ 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/arm/rockchip.yaml +5 -0
@@ -104,6 +104,11 @@ properties: - firefly,roc-rk3399-pc-mezzanine - const: rockchip,rk3399 + - description: FriendlyElec NanoPi R2S + items: + - const: friendlyarm,nanopi-r2s + - const: rockchip,rk3328 + - description: FriendlyElec NanoPi4 series boards items: - enum:
Signature · 1 line
2.28.0
PATCH v2 2/2 rockchip: rk3328: Add support for FriendlyARM NanoPi R2S
This adds support for the NanoPi R2S from FriendlyARM.
Rockchip RK3328 SoC
1GB DDR4 RAM
Gigabit Ethernet (WAN)
Gigabit Ethernet (USB3) (LAN)
USB 2.0 Host Port
MicroSD slot
Reset button
WAN - LAN - SYS LED
---
Changes in v2:
- Change model name to FriendlyElec
- Enable SD UHS modes
- Add startup delay to SDIO regulator to improve
issues reported with some cards
- Fix PMIC interrupt pin
- Add pinctrl node for ethernet-PHY
- Fix various formatting issues
arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3328-nanopi-r2s.dts | 367 ++++++++++++++++++ 2 files changed, 368 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
arch/arm64/boot/dts/rockchip/Makefile +1 -0
@@ -5,6 +5,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-roc-cc.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +367 -0
367 lines not on this page · raw message
Signature · 1 line
2.28.0
Re: [PATCH v2 2/2] rockchip: rk3328: Add support for FriendlyARM NanoPi R2S
Hi David,
Increase version number for each new serie.
Quoted 56 lines · David Bauer
This adds support for the NanoPi R2S from FriendlyARM.
Rockchip RK3328 SoC
1GB DDR4 RAM
Gigabit Ethernet (WAN)
Gigabit Ethernet (USB3) (LAN)
USB 2.0 Host Port
MicroSD slot
Reset button
WAN - LAN - SYS LEDSigned-off-by David Bauer <[email protected]>---
Changes in v2:
- Change model name to FriendlyElec
- Enable SD UHS modes
- Add startup delay to SDIO regulator to improve
issues reported with some cards
- Fix PMIC interrupt pin
- Add pinctrl node for ethernet-PHY
- Fix various formatting issuesarch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3328-nanopi-r2s.dts | 367 ++++++++++++++++++ 2 files changed, 368 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dtsarch/arm64/boot/dts/rockchip/Makefile +1
-0@@ -5,6 +5,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-roc-cc.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtbarch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +11
-0@@ -0,0 +1,367 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2020 David Bauer <[email protected]> + */ + +/dts-v1/; + +#include <dt-bindings/input/input.h> +#include <dt-bindings/gpio/gpio.h> +#include "rk3328.dtsi" +
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts line 20
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +9
-0+/ { + model = "FriendlyElec NanoPi R2S"; + compatible = "friendlyarm,nanopi-r2s", "rockchip,rk3328"; + + chosen { + stdout-path = "serial2:1500000n8"; + }; + + gmac_clkin: external-gmac-clock {
Maybe something more consistant nodename/label combination?
Quoted 4 lines
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +4
-0+ compatible = "fixed-clock"; + clock-frequency = <125000000>; + clock-output-names = "gmac_clkin"; + #clock-cells = <0>;
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts line 33
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +9
-0+ }; + + keys { + compatible = "gpio-keys"; + pinctrl-0 = <&reset_button_pin>; + pinctrl-names = "default"; + + reset { + label = "Reset Button";
This label shows up in the kernel tree.
User space scripts don't like a space in a dir name for example. Users don't like typing mixed SHIFT-capitals.
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts line 42
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +9
-0+ gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>; + linux,code = <KEY_RESTART>; + debounce-interval = <50>; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-0 = <&wan_led_pin &sys_led_pin &wan_led_pin>;
&lan_led_pin ^
Quote by robh:
While bracketing doesn't matter for a DTB, the DT schema checks rely on bracketing around each distinct entry.
Quoted 22 lines
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +22
-0+ pinctrl-names = "default"; + + lan_led: led-0 { + gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + label = "nanopi-r2s:green:lan"; + }; + + sys_led: led-1 { + gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; + label = "nanopi-r2s:red:sys"; + }; + + wan_led: led-2 { + gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>; + label = "nanopi-r2s:green:wan"; + }; + }; + + vcc_sd: sdmmc-regulator { + compatible = "regulator-fixed"; + gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>; + pinctrl-0 = <&sdmmc0m1_gpio>;
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts line 73
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +9
-0+ pinctrl-names = "default"; + regulator-name = "vcc_sd"; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc_io_33>; + }; + + vcc_io_sdio: sdmmcio-regulator {
sort nodenames
Quoted 54 lines
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +54
-0+ compatible = "regulator-gpio"; + enable-active-high; + gpios = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&sdio_vcc_pin>; + pinctrl-names = "default"; + regulator-name = "vcc_io_sdio"; + regulator-always-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-settling-time-us = <5000>; + regulator-type = "voltage"; + startup-delay-us = <2000>; + states = <1800000 0x1 + 3300000 0x0>; + vin-supply = <&vcc_io_33>; + }; + + vdd_5v: vdd-5v { + compatible = "regulator-fixed"; + regulator-name = "vdd_5v"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; +}; + +&cpu0 { + cpu-supply = <&vdd_arm>; +}; + +&cpu1 { + cpu-supply = <&vdd_arm>; +}; + +&cpu2 { + cpu-supply = <&vdd_arm>; +}; + +&cpu3 { + cpu-supply = <&vdd_arm>; +}; + +&gmac2io { + assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; + assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>; + clock_in_out = "input"; + phy-handle = <&rtl8211e>; + phy-mode = "rgmii"; + phy-supply = <&vcc_io_33>; + pinctrl-0 = <&rgmiim1_pins>; + pinctrl-names = "default"; + rx_delay = <0x18>; + snps,aal;
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts line 136
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +9
-0+ tx_delay = <0x24>; + status = "okay"; + + mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + + rtl8211e: ethernet-phy@0 {
if reg == <1> then use @1
rtl8211e: ethernet-phy@1 {
reg = <1>;arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts line 139
Quoted 4 lines
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +3
-0+ pinctrl-0 = <ð_phy_reset_pin>; + pinctrl-names = "default"; + reg = <1>;
move reg below nodename
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts line 151
Quoted 12 lines
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +12
-0+ reset-assert-us = <10000>; + reset-deassert-us = <50000>; + reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&i2c1 { + status = "okay"; + + rk805: pmic@18 { + compatible = "rockchip,rk805";
reg = <0x18>;
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts line 160
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +9
-0+ #clock-cells = <1>; + clock-output-names = "xin32k", "rk805-clkout2"; + gpio-controller; + #gpio-cells = <2>; + interrupt-parent = <&gpio1>; + interrupts = <24 IRQ_TYPE_LEVEL_LOW>; + pinctrl-0 = <&pmic_int_l>; + pinctrl-names = "default"; + reg = <0x18>;
move reg below compatible
Quote by Heiko:
But yes, since the early Chromebook project in 2014 we agreed on doing in Rockchip dts files:
----
compatible
reg
interrupts
[alphabetical]
status [if needed]
----
Quoted 115 lines
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +115
-0+ rockchip,system-power-controller; + wakeup-source; + + vcc1-supply = <&vdd_5v>; + vcc2-supply = <&vdd_5v>; + vcc3-supply = <&vdd_5v>; + vcc4-supply = <&vdd_5v>; + vcc5-supply = <&vcc_io_33>; + vcc6-supply = <&vdd_5v>; + + regulators { + vdd_log: DCDC_REG1 { + regulator-name = "vdd_log"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <712500>; + regulator-max-microvolt = <1450000>; + regulator-ramp-delay = <12500>; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1000000>; + }; + }; + + vdd_arm: DCDC_REG2 { + regulator-name = "vdd_arm"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <712500>; + regulator-max-microvolt = <1450000>; + regulator-ramp-delay = <12500>; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <950000>; + }; + }; + + vcc_ddr: DCDC_REG3 { + regulator-name = "vcc_ddr"; + regulator-always-on; + regulator-boot-on; + + regulator-state-mem { + regulator-on-in-suspend; + }; + }; + + vcc_io_33: DCDC_REG4 { + regulator-name = "vcc_io_33"; + 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>; + }; + }; + + vcc_18: LDO_REG1 { + regulator-name = "vcc_18"; + 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>; + }; + }; + + vcc18_emmc: LDO_REG2 { + regulator-name = "vcc18_emmc"; + 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>; + }; + }; + + vdd_10: LDO_REG3 { + regulator-name = "vdd_10"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1000000>; + }; + }; + }; + }; +}; + +&io_domains { + pmuio-supply = <&vcc_io_33>; + vccio1-supply = <&vcc_io_33>; + vccio2-supply = <&vcc18_emmc>; + vccio3-supply = <&vcc_io_sdio>; + vccio4-supply = <&vcc_18>; + vccio5-supply = <&vcc_io_33>; + vccio6-supply = <&vcc_io_33>; + status = "okay"; +}; +
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts line 284
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +9
-0+&pinctrl { + button { + reset_button_pin: reset-button-pin { + rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + ethernet-phy { + eth_phy_reset_pin: reset-pin {
make something more consistant label/nodename
Quoted 63 lines
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +63
-0+ rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>; + }; + }; + + leds { + lan_led_pin: lan-led-pin { + rockchip,pins = <2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + sys_led_pin: sys-led-pin { + rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + wan_led_pin: wan-led-pin { + rockchip,pins = <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + pmic { + pmic_int_l: pmic-int-l { + rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + sd { + sdio_vcc_pin: sdio-vcc-pin { + rockchip,pins = <1 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; +}; + +&pwm2 { + status = "okay"; +}; + +&sdmmc { + bus-width = <4>; + cap-sd-highspeed; + disable-wp; + pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>; + pinctrl-names = "default"; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr50; + sd-uhs-sdr104; + vmmc-supply = <&vcc_sd>; + vqmmc-supply = <&vcc_io_sdio>; + status = "okay"; +}; + +&tsadc { + rockchip,hw-tshut-mode = <0>; + rockchip,hw-tshut-polarity = <0>; + status = "okay"; +}; + +&u2phy { + status = "okay"; +}; + +&u2phy_host { + status = "okay"; +};
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts line 357
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +10
-0+ +&u2phy_otg { + status = "okay"; +}; + +&uart2 { + status = "okay"; +}; + +&usb20_otg {
Question for Robin Murphy:
Do we need this here?
Does it work without, because on my rk3318 without it is not reliable?
dr_mode = "host"; ??
Quoted 11 lines
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file +10
-0+ status = "okay"; +}; + +&usb_host0_ehci { + status = "okay"; +}; + +&usb_host0_ohci { + status = "okay"; +};
Quoted 10 lines · David Bauer
Add devicetree binding documentation for the FriendlyARM NanoPi R2S.
Signed-off-by David Bauer <[email protected]>---
Changes in v2:
- Change model name to FriendlyElecDocumentation/devicetree/bindings/arm/rockchip.yaml | 5 +++++ 1 file changed, 5 insertions(+)