* [PATCH v6 2/2] rockchip: rk3399: Add support for FriendlyARM NanoPi R4S
2021-03-19 5:16 [PATCH v6 1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S Tianling Shen
@ 2021-03-19 5:16 ` Tianling Shen
2021-03-21 19:02 ` [PATCH v6 1/2] dt-bindings: Add doc " Heiko Stuebner
2021-03-22 10:03 ` Heiko Stuebner
2 siblings, 0 replies; 8+ messages in thread
From: Tianling Shen @ 2021-03-19 5:16 UTC (permalink / raw)
To: Rob Herring, Heiko Stuebner, Jagan Teki, Chen-Yu Tsai,
Uwe Kleine-König, Geert Uytterhoeven, Johan Jonker,
Pavel Machek, Jacek Anaszewski, David Bauer, Jensen Huang,
Marty Jones, Tianling Shen
Cc: devicetree, linux-arm-kernel, linux-rockchip, linux-kernel
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 <jensenhuang@friendlyarm.com>
Signed-off-by: Jensen Huang <jensenhuang@friendlyarm.com>
[minor adjustments]
Co-developed-by: Marty Jones <mj8263788@gmail.com>
Signed-off-by: Marty Jones <mj8263788@gmail.com>
[further adjustments, fixed format issues]
Signed-off-by: Tianling Shen <cnsztl@gmail.com>
---
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 <jensenhuang@friendlyarm.com>
+ * Copyright (c) 2020 Marty Jones <mj8263788@gmail.com>
+ * Copyright (c) 2021 Tianling Shen <cnsztl@gmail.com>
+ */
+
+/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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v6 1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S
2021-03-19 5:16 [PATCH v6 1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S Tianling Shen
2021-03-19 5:16 ` [PATCH v6 2/2] rockchip: rk3399: Add support " Tianling Shen
@ 2021-03-21 19:02 ` Heiko Stuebner
2021-03-22 10:03 ` Heiko Stuebner
2 siblings, 0 replies; 8+ messages in thread
From: Heiko Stuebner @ 2021-03-21 19:02 UTC (permalink / raw)
To: Rob Herring, Jagan Teki, Chen-Yu Tsai, Uwe Kleine-König,
Geert Uytterhoeven, Johan Jonker, Pavel Machek, Jacek Anaszewski,
David Bauer, Jensen Huang, Marty Jones, Tianling Shen,
Tianling Shen
Cc: devicetree, linux-arm-kernel, linux-rockchip, linux-kernel
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 <cnsztl@gmail.com>
In v4 you received a
Acked-by: Rob Herring <robh@kernel.org>
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
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v6 1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S
2021-03-19 5:16 [PATCH v6 1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S Tianling Shen
2021-03-19 5:16 ` [PATCH v6 2/2] rockchip: rk3399: Add support " Tianling Shen
2021-03-21 19:02 ` [PATCH v6 1/2] dt-bindings: Add doc " Heiko Stuebner
@ 2021-03-22 10:03 ` Heiko Stuebner
2021-04-25 21:33 ` Pavel Machek
2 siblings, 1 reply; 8+ messages in thread
From: Heiko Stuebner @ 2021-03-22 10:03 UTC (permalink / raw)
To: Marty Jones, Pavel Machek, Rob Herring, Uwe Kleine-König,
Jensen Huang, Jacek Anaszewski, Geert Uytterhoeven, David Bauer,
Johan Jonker, Jagan Teki, Chen-Yu Tsai, Tianling Shen
Cc: Heiko Stuebner, linux-kernel, devicetree, linux-rockchip,
linux-arm-kernel
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 <heiko@sntech.de>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v6 1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S
2021-03-22 10:03 ` Heiko Stuebner
@ 2021-04-25 21:33 ` Pavel Machek
2021-04-26 10:39 ` Tianling Shen
0 siblings, 1 reply; 8+ messages in thread
From: Pavel Machek @ 2021-04-25 21:33 UTC (permalink / raw)
To: Heiko Stuebner
Cc: Marty Jones, Rob Herring, Uwe Kleine-König, Jensen Huang,
Jacek Anaszewski, Geert Uytterhoeven, David Bauer, Johan Jonker,
Jagan Teki, Chen-Yu Tsai, Tianling Shen, linux-kernel, devicetree,
linux-rockchip, linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 697 bytes --]
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
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v6 1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S
2021-04-25 21:33 ` Pavel Machek
@ 2021-04-26 10:39 ` Tianling Shen
2021-04-26 11:03 ` Pavel Machek
0 siblings, 1 reply; 8+ messages in thread
From: Tianling Shen @ 2021-04-26 10:39 UTC (permalink / raw)
To: Pavel Machek
Cc: Heiko Stuebner, Marty Jones, Rob Herring, Uwe Kleine-König,
Jensen Huang, Jacek Anaszewski, Geert Uytterhoeven, David Bauer,
Johan Jonker, Jagan Teki, Chen-Yu Tsai, Linux Kernel Mailing List,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list:ARM/Rockchip SoC..., Linux ARM
Hi Pavel,
On Mon, Apr 26, 2021 at 5:33 AM Pavel Machek <pavel@ucw.cz> 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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v6 1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S
2021-04-26 10:39 ` Tianling Shen
@ 2021-04-26 11:03 ` Pavel Machek
2021-04-26 11:14 ` Tianling Shen
0 siblings, 1 reply; 8+ messages in thread
From: Pavel Machek @ 2021-04-26 11:03 UTC (permalink / raw)
To: Tianling Shen
Cc: Heiko Stuebner, Marty Jones, Rob Herring, Uwe Kleine-König,
Jensen Huang, Jacek Anaszewski, Geert Uytterhoeven, David Bauer,
Johan Jonker, Jagan Teki, Chen-Yu Tsai, Linux Kernel Mailing List,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list:ARM/Rockchip SoC..., Linux ARM
[-- Attachment #1.1: Type: text/plain, Size: 1078 bytes --]
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
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v6 1/2] dt-bindings: Add doc for FriendlyARM NanoPi R4S
2021-04-26 11:03 ` Pavel Machek
@ 2021-04-26 11:14 ` Tianling Shen
0 siblings, 0 replies; 8+ messages in thread
From: Tianling Shen @ 2021-04-26 11:14 UTC (permalink / raw)
To: Pavel Machek
Cc: Heiko Stuebner, Marty Jones, Rob Herring, Uwe Kleine-König,
Jensen Huang, Jacek Anaszewski, Geert Uytterhoeven, David Bauer,
Johan Jonker, Jagan Teki, Chen-Yu Tsai, Linux Kernel Mailing List,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list:ARM/Rockchip SoC..., Linux ARM
Hi,
On Mon, Apr 26, 2021 at 7:03 PM Pavel Machek <pavel@ucw.cz> 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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread