2021-03-19 05:18:17

by Tianling Shen

[permalink] [raw]
Subject: [PATCH v6 1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S

Add devicetree binding documentation for the FriendlyARM NanoPi R4S.

Changes in v6:
- Fixed format of LED nodes

Changes in v5:
- Dropped the empty PCIe node
- Dropped useless `/delete-property/`
- Renamed LED nodes

Changes in v4:
- Correctly dropped `display-subsystem` node
- Dropped meaningless `pwm-fan` node
- Dropped wrong `sdmmc` node
- Disabled `i2c4` and `uart0` as they don't exist in the design
- Format fixes

Changes in v3:
- Dropped non-existent node `display_subsystem`

Changes in v2:
- Disable display for NanoPi R4S (reference commit: 74532de460ec)
- Light "sys" LED on NanoPi R4S (reference commit: 833821eeab91)

Signed-off-by: Tianling Shen <[email protected]>
---
Documentation/devicetree/bindings/arm/rockchip.yaml | 1 +
1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index c3036f95c7bc..4a6f772c1043 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -134,6 +134,7 @@ properties:
- friendlyarm,nanopi-m4
- friendlyarm,nanopi-m4b
- friendlyarm,nanopi-neo4
+ - friendlyarm,nanopi-r4s
- const: rockchip,rk3399

- description: GeekBuying GeekBox
--
2.17.1


2021-03-19 05:19:29

by Tianling Shen

[permalink] [raw]
Subject: [PATCH v6 2/2] rockchip: rk3399: Add support for FriendlyARM NanoPi R4S

This adds support for the NanoPi R4S from FriendlyArm.

Rockchip RK3399 SoC
1GB DDR3 or 4GB LPDDR4 RAM
Gigabit Ethernet (WAN)
Gigabit Ethernet (PCIe) (LAN)
USB 3.0 Port x 2
MicroSD slot
Reset button
WAN - LAN - SYS LED

[initial DTS file]
Co-developed-by: Jensen Huang <[email protected]>
Signed-off-by: Jensen Huang <[email protected]>
[minor adjustments]
Co-developed-by: Marty Jones <[email protected]>
Signed-off-by: Marty Jones <[email protected]>
[further adjustments, fixed format issues]
Signed-off-by: Tianling Shen <[email protected]>
---
arch/arm64/boot/dts/rockchip/Makefile | 1 +
.../boot/dts/rockchip/rk3399-nanopi-r4s.dts | 133 ++++++++++++++++++
2 files changed, 134 insertions(+)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts

diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 62d3abc17a24..c3e00c0e2db7 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -36,6 +36,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4b.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4s.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
new file mode 100644
index 000000000000..fa5809887643
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
@@ -0,0 +1,133 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * FriendlyElec NanoPC-T4 board device tree source
+ *
+ * Copyright (c) 2020 FriendlyElec Computer Tech. Co., Ltd.
+ * (http://www.friendlyarm.com)
+ *
+ * Copyright (c) 2018 Collabora Ltd.
+ *
+ * Copyright (c) 2020 Jensen Huang <[email protected]>
+ * Copyright (c) 2020 Marty Jones <[email protected]>
+ * Copyright (c) 2021 Tianling Shen <[email protected]>
+ */
+
+/dts-v1/;
+#include "rk3399-nanopi4.dtsi"
+
+/ {
+ model = "FriendlyElec NanoPi R4S";
+ compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399";
+
+ /delete-node/ display-subsystem;
+
+ gpio-leds {
+ pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>;
+
+ /delete-node/ led-0;
+
+ lan_led: led-lan {
+ gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
+ label = "green:lan";
+ };
+
+ sys_led: led-sys {
+ gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
+ label = "red:sys";
+ default-state = "on";
+ };
+
+ wan_led: led-wan {
+ gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
+ label = "green:wan";
+ };
+ };
+
+ gpio-keys {
+ pinctrl-0 = <&reset_button_pin>;
+
+ /delete-node/ power;
+
+ reset {
+ debounce-interval = <50>;
+ gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>;
+ label = "reset";
+ linux,code = <KEY_RESTART>;
+ };
+ };
+
+ vdd_5v: vdd-5v {
+ compatible = "regulator-fixed";
+ regulator-name = "vdd_5v";
+ regulator-always-on;
+ regulator-boot-on;
+ };
+};
+
+&emmc_phy {
+ status = "disabled";
+};
+
+&i2c4 {
+ status = "disabled";
+};
+
+&pcie0 {
+ max-link-speed = <1>;
+ num-lanes = <1>;
+ vpcie3v3-supply = <&vcc3v3_sys>;
+};
+
+&pinctrl {
+ gpio-leds {
+ /delete-node/ status-led-pin;
+
+ lan_led_pin: lan-led-pin {
+ rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ sys_led_pin: sys-led-pin {
+ rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ wan_led_pin: wan-led-pin {
+ rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
+ rockchip-key {
+ /delete-node/ power-key;
+
+ reset_button_pin: reset-button-pin {
+ rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+ };
+};
+
+&sdhci {
+ status = "disabled";
+};
+
+&sdio0 {
+ status = "disabled";
+};
+
+&u2phy0_host {
+ phy-supply = <&vdd_5v>;
+};
+
+&u2phy1_host {
+ status = "disabled";
+};
+
+&uart0 {
+ status = "disabled";
+};
+
+&usbdrd_dwc3_0 {
+ dr_mode = "host";
+};
+
+&vcc3v3_sys {
+ vin-supply = <&vcc5v0_sys>;
+};
--
2.17.1

2021-03-21 19:03:57

by Heiko Stuebner

[permalink] [raw]
Subject: Re: [PATCH v6 1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S

Hi,

Am Freitag, 19. M?rz 2021, 06:16:26 CET schrieb Tianling Shen:
> Add devicetree binding documentation for the FriendlyARM NanoPi R4S.
>
> Changes in v6:
> - Fixed format of LED nodes
>
> Changes in v5:
> - Dropped the empty PCIe node
> - Dropped useless `/delete-property/`
> - Renamed LED nodes
>
> Changes in v4:
> - Correctly dropped `display-subsystem` node
> - Dropped meaningless `pwm-fan` node
> - Dropped wrong `sdmmc` node
> - Disabled `i2c4` and `uart0` as they don't exist in the design
> - Format fixes
>
> Changes in v3:
> - Dropped non-existent node `display_subsystem`
>
> Changes in v2:
> - Disable display for NanoPi R4S (reference commit: 74532de460ec)
> - Light "sys" LED on NanoPi R4S (reference commit: 833821eeab91)
>
> Signed-off-by: Tianling Shen <[email protected]>

In v4 you received a
Acked-by: Rob Herring <[email protected]>

Please pick these up and carry them over into new versions
of your patchset. Otherwise Rob would needlessly review
things multiple times.


Heiko

> ---
> Documentation/devicetree/bindings/arm/rockchip.yaml | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
> index c3036f95c7bc..4a6f772c1043 100644
> --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
> +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
> @@ -134,6 +134,7 @@ properties:
> - friendlyarm,nanopi-m4
> - friendlyarm,nanopi-m4b
> - friendlyarm,nanopi-neo4
> + - friendlyarm,nanopi-r4s
> - const: rockchip,rk3399
>
> - description: GeekBuying GeekBox
>




2021-03-22 10:06:09

by Heiko Stuebner

[permalink] [raw]
Subject: Re: [PATCH v6 1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S

On Fri, 19 Mar 2021 13:16:26 +0800, Tianling Shen wrote:
> Add devicetree binding documentation for the FriendlyARM NanoPi R4S.
>
> Changes in v6:
> - Fixed format of LED nodes
>
> Changes in v5:
> - Dropped the empty PCIe node
> - Dropped useless `/delete-property/`
> - Renamed LED nodes
>
> [...]

Applied, thanks!

[1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S
commit: 1003888415e83e15ddb63d1d96189b4f2c5f1d48
[2/2] rockchip: rk3399: Add support for FriendlyARM NanoPi R4S
commit: db792e9adbf85ffc9d6b0b060ac3c8e3148c8992

Best regards,
--
Heiko Stuebner <[email protected]>

2021-04-25 21:34:24

by Pavel Machek

[permalink] [raw]
Subject: Re: [PATCH v6 1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S

Hi!

> > Changes in v6:
> > - Fixed format of LED nodes
> >
> > Changes in v5:
> > - Dropped the empty PCIe node
> > - Dropped useless `/delete-property/`
> > - Renamed LED nodes
> >
> > [...]
>
> Applied, thanks!
>
> [1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S
> commit: 1003888415e83e15ddb63d1d96189b4f2c5f1d48
> [2/2] rockchip: rk3399: Add support for FriendlyARM NanoPi R4S
> commit: db792e9adbf85ffc9d6b0b060ac3c8e3148c8992

Sorry for late review, but:


+ label = "red:sys";

This should be red:power based on the discussion in earlier threads.

Thanks,
Pavel
--
http://www.livejournal.com/~pavelmachek


Attachments:
(No filename) (697.00 B)
signature.asc (188.00 B)
Digital signature
Download all attachments

2021-04-26 10:40:41

by Tianling Shen

[permalink] [raw]
Subject: Re: [PATCH v6 1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S

Hi Pavel,

On Mon, Apr 26, 2021 at 5:33 AM Pavel Machek <[email protected]> wrote:
>
> Hi!
>
> > > Changes in v6:
> > > - Fixed format of LED nodes
> > >
> > > Changes in v5:
> > > - Dropped the empty PCIe node
> > > - Dropped useless `/delete-property/`
> > > - Renamed LED nodes
> > >
> > > [...]
> >
> > Applied, thanks!
> >
> > [1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S
> > commit: 1003888415e83e15ddb63d1d96189b4f2c5f1d48
> > [2/2] rockchip: rk3399: Add support for FriendlyARM NanoPi R4S
> > commit: db792e9adbf85ffc9d6b0b060ac3c8e3148c8992
>
> Sorry for late review, but:
>
>
> + label = "red:sys";
>
> This should be red:power based on the discussion in earlier threads.

However based on the introduction from FriendlyELEC[1], this is not
the "power" lamp...
"LEDs: 1 x power LED and 3 x GPIO Controlled LED (SYS, LAN, WAN)"

1. https://wiki.friendlyarm.com/wiki/index.php/NanoPi_R4S#Hardware_Spec

Thanks,
Tianling.

>
> Thanks,
> Pavel
> --
> http://www.livejournal.com/~pavelmachek

2021-04-26 11:04:19

by Pavel Machek

[permalink] [raw]
Subject: Re: [PATCH v6 1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S

Hi!
> > > > - Fixed format of LED nodes
> > > >
> > > > Changes in v5:
> > > > - Dropped the empty PCIe node
> > > > - Dropped useless `/delete-property/`
> > > > - Renamed LED nodes
> > > >
> > > > [...]
> > >
> > > Applied, thanks!
> > >
> > > [1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S
> > > commit: 1003888415e83e15ddb63d1d96189b4f2c5f1d48
> > > [2/2] rockchip: rk3399: Add support for FriendlyARM NanoPi R4S
> > > commit: db792e9adbf85ffc9d6b0b060ac3c8e3148c8992
> >
> > Sorry for late review, but:
> >
> >
> > + label = "red:sys";
> >
> > This should be red:power based on the discussion in earlier threads.
>
> However based on the introduction from FriendlyELEC[1], this is not
> the "power" lamp...
> "LEDs: 1 x power LED and 3 x GPIO Controlled LED (SYS, LAN, WAN)"

It is always on, and "sys" is not a valid function.

I'd suggest labeling it as "red:power". Feel free to make other
suggestion but lets keep existing functions.
Pavel
--
http://www.livejournal.com/~pavelmachek


Attachments:
(No filename) (1.05 kB)
signature.asc (201.00 B)
Download all attachments

2021-04-26 11:15:47

by Tianling Shen

[permalink] [raw]
Subject: Re: [PATCH v6 1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S

Hi,

On Mon, Apr 26, 2021 at 7:03 PM Pavel Machek <[email protected]> wrote:
>
> Hi!
> > > > > - Fixed format of LED nodes
> > > > >
> > > > > Changes in v5:
> > > > > - Dropped the empty PCIe node
> > > > > - Dropped useless `/delete-property/`
> > > > > - Renamed LED nodes
> > > > >
> > > > > [...]
> > > >
> > > > Applied, thanks!
> > > >
> > > > [1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S
> > > > commit: 1003888415e83e15ddb63d1d96189b4f2c5f1d48
> > > > [2/2] rockchip: rk3399: Add support for FriendlyARM NanoPi R4S
> > > > commit: db792e9adbf85ffc9d6b0b060ac3c8e3148c8992
> > >
> > > Sorry for late review, but:
> > >
> > >
> > > + label = "red:sys";
> > >
> > > This should be red:power based on the discussion in earlier threads.
> >
> > However based on the introduction from FriendlyELEC[1], this is not
> > the "power" lamp...
> > "LEDs: 1 x power LED and 3 x GPIO Controlled LED (SYS, LAN, WAN)"
>
> It is always on, and "sys" is not a valid function.
>
> I'd suggest labeling it as "red:power". Feel free to make other
> suggestion but lets keep existing functions.

I see, thank you very much!
I'll submit a patch later.

Thanks,
Tianling.

> Pavel
> --
> http://www.livejournal.com/~pavelmachek