2019-03-08 18:13:20

by Jagan Teki

Subject: [PATCH] arm64: dts: rockchip: Add Nanopi NEO4 initial support

FriendlyElec NanoPi NEO4 is known to be a revision 4 based
NanoPi4 series of boards.

Most of know peripherals are shared between Nanopi M4 vs NEO4, except
- 1GB DDR3
- USB Host ports
- Missing DSI port
- USB 2.0 Host with USB2PHY0 (no USB2PH1)

Add support for it, by reusing existing rk3399-nanopi4.dtsi

Signed-off-by: Jagan Teki <[email protected]>
Signed-off-by: Akash Gajjar <[email protected]>
---
.../devicetree/bindings/arm/rockchip.yaml | 1 +
arch/arm64/boot/dts/rockchip/Makefile | 1 +
.../boot/dts/rockchip/rk3399-nanopi-neo4.dts | 50 +++++++++++++++++++
3 files changed, 52 insertions(+)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts

diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index 061a03edf9c8..543237b7b297 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -97,6 +97,7 @@ properties:
- enum:
- friendlyarm,nanopc-t4
- friendlyarm,nanopi-m4
+ - friendlyarm,nanopi-neo4
- const: rockchip,rk3399

- description: GeekBuying GeekBox
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 1b28fa72ea0b..186281fb70dd 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -18,6 +18,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts
new file mode 100644
index 000000000000..195410b089b9
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2019 Amarula Solutions B.V.
+ * Author: Jagan Teki <[email protected]>
+ */
+
+/dts-v1/;
+
+#include "rk3399-nanopi4.dtsi"
+
+/ {
+ model = "FriendlyARM NanoPi NEO4";
+ compatible = "friendlyarm,nanopi-neo4", "rockchip,rk3399";
+
+ vdd_5v: vdd-5v {
+ compatible = "regulator-fixed";
+ regulator-name = "vdd_5v";
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ vcc5v0_core: vcc5v0-core {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc5v0_core";
+ regulator-always-on;
+ regulator-boot-on;
+ vin-supply = <&vdd_5v>;
+ };
+
+ vcc5v0_usb1: vcc5v0-usb1 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc5v0_usb1";
+ regulator-always-on;
+ regulator-boot-on;
+ vin-supply = <&vcc5v0_sys>;
+ };
+};
+
+&vcc3v3_sys {
+ vin-supply = <&vcc5v0_core>;
+};
+
+&u2phy0_host {
+ phy-supply = <&vcc5v0_usb1>;
+};
+
+&vbus_typec {
+ regulator-always-on;
+ vin-supply = <&vdd_5v>;
+};
--
2.18.0.321.gffc6fa0e3

2019-03-08 20:13:59

by Rob Herring

Subject: Re: [PATCH] arm64: dts: rockchip: Add Nanopi NEO4 initial support

On Fri, Mar 8, 2019 at 12:12 PM Jagan Teki <[email protected]> wrote:
>
> FriendlyElec NanoPi NEO4 is known to be a revision 4 based
> NanoPi4 series of boards.
>
> Most of know peripherals are shared between Nanopi M4 vs NEO4, except
> - 1GB DDR3
> - USB Host ports
> - Missing DSI port
> - USB 2.0 Host with USB2PHY0 (no USB2PH1)
>
> Add support for it, by reusing existing rk3399-nanopi4.dtsi
>
> Signed-off-by: Jagan Teki <[email protected]>
> Signed-off-by: Akash Gajjar <[email protected]>
> ---
> .../devicetree/bindings/arm/rockchip.yaml | 1 +
> arch/arm64/boot/dts/rockchip/Makefile | 1 +
> .../boot/dts/rockchip/rk3399-nanopi-neo4.dts | 50 +++++++++++++++++++
> 3 files changed, 52 insertions(+)
> create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts

Reviewed-by: Rob Herring <[email protected]>

2019-03-12 10:52:09

by Heiko Stuebner

Subject: Re: [PATCH] arm64: dts: rockchip: Add Nanopi NEO4 initial support

Am Freitag, 8. M?rz 2019, 19:12:02 CET schrieb Jagan Teki:
> FriendlyElec NanoPi NEO4 is known to be a revision 4 based
> NanoPi4 series of boards.
>
> Most of know peripherals are shared between Nanopi M4 vs NEO4, except
> - 1GB DDR3
> - USB Host ports
> - Missing DSI port
> - USB 2.0 Host with USB2PHY0 (no USB2PH1)
>
> Add support for it, by reusing existing rk3399-nanopi4.dtsi
>
> Signed-off-by: Jagan Teki <[email protected]>
> Signed-off-by: Akash Gajjar <[email protected]>

applied for 5.2

Thanks
Heiko