Re: [LEDE-DEV] [PATCH hauke/kernel-4.14-sunxi 0/4] add LEDE support for NanoPi NEO Plus2 board
Hi Hauke, On Sun, Mar 04, 2018 at 02:43:33PM +0100, Hauke Mehrtens wrote: > Your patch is already integrated in the OpenWrt master branch. Can you > please send a patch which adds the additional settings to the device > tree on top of the current OpenWrt master branch. I glad to see the patches made to the OpenWrt master branch. Yes I will follow up there soon. thank you, -antony ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH hauke/kernel-4.14-sunxi 0/4] add LEDE support for NanoPi NEO Plus2 board
Hi Hauke, I am glad to see you are testig "NanoPi Neo Plus2" support in OpenWRT. Here is a patch instead of b7a1aa4df2a983, with Gigabit Ethernet support. https://git.openwrt.org/?p=openwrt/staging/hauke.git;a=blob;f=target/linux/sunxi/patches-4.14/061-arm-dts-sun50i-support-for-nanopi-neo-plus2-board.patch;h=535c8b6d1f816480eb2938f54e520f7b4311b970;hb=b7a1aa4df2a9834bb7339712670abbe1a05dc01c do not have emac node. regards, -antony On Fri, Dec 29, 2017 at 01:53:46PM +0100, Hauke Mehrtens wrote: > Hi antony, > > On 12/28/2017 06:21 PM, Antony Antony wrote: > > Hi Hauke, > > > > This will add initial LEDE support for a new board, NanoPi NEO Plus2 board. > > > > LEDE menu options, u-boot, and kernel DT files. The patches are against > > hauke/kernel-4.14-sunxi branch. > > Ok this is my development branch, now I send the patches to the list. > > > The patches are in upstream. > > Kernel DT initial support is in 4.15 and Gigabit support is queued for 4.16. > > u-boot support is #master, it will be in 2018.01 > > You split the patches in a strange way. > I would suggest to have only two patches, one adding the changes needed > for U-Boot and one for the kernel and image build. Your current split > will have problems with git bisect when only your first patch is applied. > > Otherwise these patches are looking good. > > > regards, > > -antony > > > > Antony Antony (4): > > sunxi: add support for NanoPi NEO Plus2 board > > sunxi: add u-boot DT for NanoPi NEO Plus2 board > > sunxi: add DT node, dwmac ethernet for Nano Pi Neo Plus2 > > sunxi: add kernel DT for NanoPi NEO Plus2 board > > > > package/boot/uboot-sunxi/Makefile | 9 + > > .../210-add-sunxi50i-nanopi-neo-plus2.patch| 176 > > target/linux/sunxi/image/cortex-a53.mk | 10 + > > ...sun50i-support-for-nanopi-neo-plus2-board.patch | 229 > > + > > ...-dts-sun50i-nanopi-neo-plus2-add-ethernet.patch | 46 + > > 5 files changed, 470 insertions(+) > > create mode 100644 > > package/boot/uboot-sunxi/patches/210-add-sunxi50i-nanopi-neo-plus2.patch > > create mode 100644 > > target/linux/sunxi/patches-4.14/061-arm-dts-sun50i-support-for-nanopi-neo-plus2-board.patch > > create mode 100644 > > target/linux/sunxi/patches-4.14/062-arm-dts-sun50i-nanopi-neo-plus2-add-ethernet.patch > > >From 1edbee6871ac4858265ebce7160f6d24a7ec1b81 Mon Sep 17 00:00:00 2001 From: Antony Antony Date: Fri, 2 Mar 2018 11:05:52 +0100 Subject: [PATCH] sunxi: add kernel DT for NanoPi NEO Plus2 board Linux Kernel upstream commits d73413058, 27d7f9297 Signed-off-by: Antony Antony diff --git a/target/linux/sunxi/patches-4.14/061-arm-dts-sun50i-support-for-nanopi-neo-plus2-board.patch b/target/linux/sunxi/patches-4.14/061-arm-dts-sun50i-support-for-nanopi-neo-plus2-board.patch new file mode 100644 index 00..69b6955338 --- /dev/null +++ b/target/linux/sunxi/patches-4.14/061-arm-dts-sun50i-support-for-nanopi-neo-plus2-board.patch @@ -0,0 +1,247 @@ +From 54cc3330c2334a0cea8cafc105a29c5d67f9fd32 Mon Sep 17 00:00:00 2001 +From: Antony Antony +Date: Fri, 2 Mar 2018 10:50:48 +0100 +Subject: [PATCH] arm64: allwinner: h5: add NanoPi NEO Plus2 DT support + +Add initial DT for NanoPi NEO Plus2 by FriendlyARM +- Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU +- 1 GB DDR3 RAM +- 8GB eMMC flash (Samsung KLM8G1WEPD-B031) +- micro SD card slot +- Gigabit Ethernet (external RTL8211E-VB-CG chip) +- 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module) +- 2x USB 2.0 host ports & 2x USB via headers + +Kernel 4.15 commit d7341305863b +Kernel 4.16 commit 27d7f9297027 + +Signed-off-by: Antony Antony + +diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile +index ff35e18..16fa7b9 100644 +--- a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile +@@ -9,6 +9,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb ++dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo-plus2.dtb + + always:= $(dtb-y) + subdir-y := $(dts-dirs) +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts +new file mode 100644 +index 000..01dace4 +--- /dev/null b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts +@@ -0,0 +1,210 @@ ++/* ++ * Copyright (C) 2017 Antony Antony ++ * Copyright (C) 2016 ARM Ltd. ++ * ++ * This file is dual-licensed: you can use it either under the terms ++
[LEDE-DEV] [PATCH v2 hauke/kernel-4.14-sunxi 1/2] sunxi: add support for NanoPi NEO Plus2 board
arm64: allwinner: h5: NanoPi NEO Plus2 DT support Add initial DT for NanoPi NEO Plus2 by FriendlyARM - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU - 1 GB DDR3 RAM - 8GB eMMC flash (Samsung KLM8G1WEPD-B031) - micro SD card slot - Gigabit Ethernet (external RTL8211E-VB-CG chip) - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module) - 2x USB 2.0 host ports & 2x USB via headers Signed-off-by: Antony Antony --- v1->v2 refactor patches, merge the kernel dts patchers --- package/boot/uboot-sunxi/Makefile | 9 + target/linux/sunxi/image/cortex-a53.mk | 10 + ...sun50i-support-for-nanopi-neo-plus2-board.patch | 248 + 3 files changed, 267 insertions(+) create mode 100644 target/linux/sunxi/patches-4.14/061-arm-dts-sun50i-support-for-nanopi-neo-plus2-board.patch diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile index 056300e..9ec8e24 100644 --- a/package/boot/uboot-sunxi/Makefile +++ b/package/boot/uboot-sunxi/Makefile @@ -168,6 +168,14 @@ define U-Boot/pangolin UENV:=pangolin endef +define U-Boot/nanopi_neo_plus2 + BUILD_SUBTARGET:=cortexa53 + NAME:=NanoPi NEO Plus2 (H5) + BUILD_DEVICES:=sun50i-h5-nanopi-neo-plus2 + DEPENDS:=+PACKAGE_u-boot-nanopi-neo-plus2:arm-trusted-firmware-sunxi + UENV:=a64 +endef + define U-Boot/pine64_plus BUILD_SUBTARGET:=cortexa53 NAME:=Pine64 Plus A64 @@ -197,6 +205,7 @@ UBOOT_TARGETS := \ Lamobo_R1 \ nanopi_m1_plus \ nanopi_neo \ + nanopi_neo_plus2 \ orangepi_r1 \ orangepi_plus \ orangepi_2 \ diff --git a/target/linux/sunxi/image/cortex-a53.mk b/target/linux/sunxi/image/cortex-a53.mk index bbb253f..eb31aa8 100644 --- a/target/linux/sunxi/image/cortex-a53.mk +++ b/target/linux/sunxi/image/cortex-a53.mk @@ -7,6 +7,16 @@ # ifeq ($(SUBTARGET),cortexa53) +define Device/sun50i-h5-nanopi-neo-plus2 + DEVICE_TITLE:=Nanopi NEO Plus2 (H5) + SUPPORTED_DEVICES:=nanopi-neo-plus2 + SUNXI_DTS:=allwinner/sun50i-h5-nanopi-neo-plus2 + KERNEL_NAME := Image + KERNEL := kernel-bin +endef + +TARGET_DEVICES += sun50i-h5-nanopi-neo-plus2 + define Device/sun50i-a64-pine64-plus DEVICE_TITLE:=Pine64 Plus A64 SUPPORTED_DEVICES:=pine64,pine64-plus diff --git a/target/linux/sunxi/patches-4.14/061-arm-dts-sun50i-support-for-nanopi-neo-plus2-board.patch b/target/linux/sunxi/patches-4.14/061-arm-dts-sun50i-support-for-nanopi-neo-plus2-board.patch new file mode 100644 index 000..50c7608 --- /dev/null +++ b/target/linux/sunxi/patches-4.14/061-arm-dts-sun50i-support-for-nanopi-neo-plus2-board.patch @@ -0,0 +1,248 @@ +From d7341305863bcc054ee168bd77864100e0c3b144 Mon Sep 17 00:00:00 2001 +From: Antony Antony +Date: Thu, 7 Sep 2017 18:42:22 +0200 +Subject: [PATCH] arm64: allwinner: h5: add NanoPi NEO Plus2 DT support + +Add initial DT for NanoPi NEO Plus2 by FriendlyARM +- Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU +- 1 GB DDR3 RAM +- 8GB eMMC flash (Samsung KLM8G1WEPD-B031) +- micro SD card slot +- Gigabit Ethernet (external RTL8211E-VB-CG chip) +- 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module) +- 2x USB 2.0 host ports & 2x USB via headers + +Kernel 4.15 commit "arm64: allwinner: h5: add NanoPi NEO Plus2 DT support" +sunxi/dt64-for-4.16 "arm64: dts: allwinner: H5: remove redundant MMC0 card detect pin" +sunxi/dt-for-4.16 "arm64: dts: allwinner: h5: NanoPi NEO Plus2 : add EMAC support" + +Signed-off-by: Antony Antony + +diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile +index 1e29a5a..977b82e 100644 +--- a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile +@@ -9,6 +9,7 @@ + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb ++dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo-plus2.dtb + + always:= $(dtb-y) + subdir-y := $(dts-dirs) +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts +new file mode 100644 +index ..1ed9f219deaf +--- /dev/null b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts +@@ -0,0 +1,210 @@ ++/* ++ * Copyright (C) 2017 Antony Antony ++ * Copyright (C) 2016 ARM Ltd. ++ * ++ * This file is dual-licensed: you can use it either under the terms ++ * of the GPL or the X11 license, at your option. Note that this dual ++ * licensing only applies to this file, and not this project as a ++ * whole. ++ * ++ * a) This file is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This file is distr
[LEDE-DEV] [PATCH v2 hauke/kernel-4.14-sunxi 2/2] sunxi: add u-boot DT for NanoPi NEO Plus2 board
u-boot upstream commit 6130b1f6bc23
Signed-off-by: Antony Antony
---
v1->v2 refactor patches
---
.../004-add-sunxi50i-nanopi-neo-plus2.patch| 176 +
1 file changed, 176 insertions(+)
create mode 100644
package/boot/uboot-sunxi/patches/004-add-sunxi50i-nanopi-neo-plus2.patch
diff --git
a/package/boot/uboot-sunxi/patches/004-add-sunxi50i-nanopi-neo-plus2.patch
b/package/boot/uboot-sunxi/patches/004-add-sunxi50i-nanopi-neo-plus2.patch
new file mode 100644
index 000..59f26f1
--- /dev/null
+++ b/package/boot/uboot-sunxi/patches/004-add-sunxi50i-nanopi-neo-plus2.patch
@@ -0,0 +1,176 @@
+From 77f54e8698001d8a987f2aa4870f71b65dc089eb Mon Sep 17 00:00:00 2001
+In-Reply-To: <20170921152217.4011-1-ant...@phenome.org>
+References: <20170921152217.4011-1-ant...@phenome.org>
+From: Antony Antony
+Date: Thu, 21 Sep 2017 13:34:07 +0200
+Subject: [PATCH] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
+
+Add initial DT for NanoPi NEO Plus2 by FriendlyARM
+- Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
+- 1 GB DDR3 RAM
+- 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
+- micro SD card slot
+- Gigabit Ethernet (external RTL8211E-VB-CG chip)
+- 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
+- 2x USB 2.0 host ports
+
+Signed-off-by: Antony Antony
+---
+ arch/arm/dts/Makefile | 1 +
+ arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 106
+ configs/nanopi_neo_plus2_defconfig | 18 +
+ 3 files changed, 125 insertions(+)
+ create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
+ create mode 100644 configs/nanopi_neo_plus2_defconfig
+
+diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
+index 6db64f91..e44ceaf 100644
+--- a/arch/arm/dts/Makefile
b/arch/arm/dts/Makefile
+@@ -336,6 +336,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
+ sun8i-v3s-licheepi-zero.dtb
+ dtb-$(CONFIG_MACH_SUN50I_H5) += \
+ sun50i-h5-nanopi-neo2.dtb \
++ sun50i-h5-nanopi-neo-plus2.dtb \
+ sun50i-h5-orangepi-pc2.dtb \
+ sun50i-h5-orangepi-prime.dtb \
+ sun50i-h5-orangepi-zero-plus2.dtb
+diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
+new file mode 100644
+index 000..f1406c2
+--- /dev/null
b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
+@@ -0,0 +1,106 @@
++/*
++ * Copyright (C) 2017 Antony Antony
++ * Copyright (c) 2016 ARM Ltd.
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ * a) This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * Or, alternatively,
++ *
++ * b) Permission is hereby granted, free of charge, to any person
++ * obtaining a copy of this software and associated documentation
++ * files (the "Software"), to deal in the Software without
++ * restriction, including without limitation the rights to use,
++ * copy, modify, merge, publish, distribute, sublicense, and/or
++ * sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following
++ * conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ * OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++
++#include "sun50i-h5.dtsi"
++
++#include
++
++/ {
++ model = "FriendlyARM NanoPi NEO Plus 2";
++ compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
++
++ aliases {
++ serial0 = &uart0;
++ };
++
++ chosen {
++ stdout-path = "serial0:115200n8";
++ };
++
++ reg_vcc3v3: vcc3v3 {
++ compatible = "regulator-fixed&q
Re: [LEDE-DEV] [PATCH hauke/kernel-4.14-sunxi 0/4] add LEDE support for NanoPi NEO Plus2 board
Hi Hauke, thanks for your response. I appreciate it. On Fri, Dec 29, 2017 at 01:53:46PM +0100, Hauke Mehrtens wrote: > Hi antony, > > On 12/28/2017 06:21 PM, Antony Antony wrote: > > Hi Hauke, > > > > This will add initial LEDE support for a new board, NanoPi NEO Plus2 board. > > > > LEDE menu options, u-boot, and kernel DT files. The patches are against > > hauke/kernel-4.14-sunxi branch. > > Ok this is my development branch, now I send the patches to the list. I know it is a long shot to send you patch against a rapidly changing development branch. I think this is the best fit. Kernel 4.14 is good base for this sunxi H5 board. I would appreciate if you could apply the patches to your branch. And feel free to modify it afterwards in any way your branch move forward. > > The patches are in upstream. > > Kernel DT initial support is in 4.15 and Gigabit support is queued for 4.16. > > u-boot support is #master, it will be in 2018.01 > > You split the patches in a strange way. > I would suggest to have only two patches, one adding the changes needed > for U-Boot and one for the kernel and image build. Your current split > will have problems with git bisect when only your first patch is applied. thanks for the feedback. Now I have a better idea how to split it. I was not sure what would be optimal split. > Otherwise these patches are looking good. great thanks. I will send new version out soon. regards, -antony ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH hauke/kernel-4.14-sunxi 0/4] add LEDE support for NanoPi NEO Plus2 board
Hi Hauke, This will add initial LEDE support for a new board, NanoPi NEO Plus2 board. LEDE menu options, u-boot, and kernel DT files. The patches are against hauke/kernel-4.14-sunxi branch. The patches are in upstream. Kernel DT initial support is in 4.15 and Gigabit support is queued for 4.16. u-boot support is #master, it will be in 2018.01 regards, -antony Antony Antony (4): sunxi: add support for NanoPi NEO Plus2 board sunxi: add u-boot DT for NanoPi NEO Plus2 board sunxi: add DT node, dwmac ethernet for Nano Pi Neo Plus2 sunxi: add kernel DT for NanoPi NEO Plus2 board package/boot/uboot-sunxi/Makefile | 9 + .../210-add-sunxi50i-nanopi-neo-plus2.patch| 176 target/linux/sunxi/image/cortex-a53.mk | 10 + ...sun50i-support-for-nanopi-neo-plus2-board.patch | 229 + ...-dts-sun50i-nanopi-neo-plus2-add-ethernet.patch | 46 + 5 files changed, 470 insertions(+) create mode 100644 package/boot/uboot-sunxi/patches/210-add-sunxi50i-nanopi-neo-plus2.patch create mode 100644 target/linux/sunxi/patches-4.14/061-arm-dts-sun50i-support-for-nanopi-neo-plus2-board.patch create mode 100644 target/linux/sunxi/patches-4.14/062-arm-dts-sun50i-nanopi-neo-plus2-add-ethernet.patch -- 2.7.4 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH hauke/kernel-4.14-sunxi 3/4] sunxi: add DT node, dwmac ethernet for Nano Pi Neo Plus2
from sunxi/dt64-for-4.16 commit 27d7f929702739c186e72a
arm64: dts: allwinner: h5: NanoPi NEO Plus2 : add EMAC support
add arm64 H5 dwmac-sun8i support for this board
Signed-off-by: Antony Antony
---
...-dts-sun50i-nanopi-neo-plus2-add-ethernet.patch | 46 ++
1 file changed, 46 insertions(+)
create mode 100644
target/linux/sunxi/patches-4.14/062-arm-dts-sun50i-nanopi-neo-plus2-add-ethernet.patch
diff --git
a/target/linux/sunxi/patches-4.14/062-arm-dts-sun50i-nanopi-neo-plus2-add-ethernet.patch
b/target/linux/sunxi/patches-4.14/062-arm-dts-sun50i-nanopi-neo-plus2-add-ethernet.patch
new file mode 100644
index 000..e572947
--- /dev/null
+++
b/target/linux/sunxi/patches-4.14/062-arm-dts-sun50i-nanopi-neo-plus2-add-ethernet.patch
@@ -0,0 +1,46 @@
+From 27d7f929702739c186e72a4dcd255e0faa3beefc Mon Sep 17 00:00:00 2001
+From: Antony Antony
+Date: Wed, 29 Nov 2017 15:17:16 +0100
+Subject: [PATCH] arm64: dts: allwinner: h5: NanoPi NEO Plus2 : add EMAC
+ support
+
+add arm64 H5 dwmac-sun8i support for this board
+
+Signed-off-by: Antony Antony
+Signed-off-by: Maxime Ripard
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
+index ea11012..1ed9f21 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
+@@ -53,6 +53,7 @@
+ compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
+
+ aliases {
++ ethernet0 = &emac;
+ serial0 = &uart0;
+ };
+
+@@ -133,6 +134,22 @@
+ status = "okay";
+ };
+
++&emac {
++ pinctrl-names = "default";
++ pinctrl-0 = <&emac_rgmii_pins>;
++ phy-supply = <®_gmac_3v3>;
++ phy-handle = <&ext_rgmii_phy>;
++ phy-mode = "rgmii";
++ status = "okay";
++};
++
++&external_mdio {
++ ext_rgmii_phy: ethernet-phy@7 {
++ compatible = "ethernet-phy-ieee802.3-c22";
++ reg = <7>;
++ };
++};
++
+ &mmc0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins_a>;
--
2.7.4
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH hauke/kernel-4.14-sunxi 4/4] sunxi: add kernel DT for NanoPi NEO Plus2 board
Linux Kernel upstream commit d73413058
Signed-off-by: Antony Antony
---
...sun50i-support-for-nanopi-neo-plus2-board.patch | 229 +
1 file changed, 229 insertions(+)
create mode 100644
target/linux/sunxi/patches-4.14/061-arm-dts-sun50i-support-for-nanopi-neo-plus2-board.patch
diff --git
a/target/linux/sunxi/patches-4.14/061-arm-dts-sun50i-support-for-nanopi-neo-plus2-board.patch
b/target/linux/sunxi/patches-4.14/061-arm-dts-sun50i-support-for-nanopi-neo-plus2-board.patch
new file mode 100644
index 000..16ec2f8
--- /dev/null
+++
b/target/linux/sunxi/patches-4.14/061-arm-dts-sun50i-support-for-nanopi-neo-plus2-board.patch
@@ -0,0 +1,229 @@
+From d7341305863bcc054ee168bd77864100e0c3b144 Mon Sep 17 00:00:00 2001
+From: Antony Antony
+Date: Thu, 7 Sep 2017 18:42:22 +0200
+Subject: [PATCH] arm64: allwinner: h5: add NanoPi NEO Plus2 DT support
+
+Add initial DT for NanoPi NEO Plus2 by FriendlyARM
+- Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
+- 1 GB DDR3 RAM
+- 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
+- micro SD card slot
+- Gigabit Ethernet (external RTL8211E-VB-CG chip)
+- 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
+- 2x USB 2.0 host ports & 2x USB via headers
+
+Kernel 4.15 commit d7341305863b
+
+Signed-off-by: Antony Antony
+
+diff --git a/arch/arm64/boot/dts/allwinner/Makefile
b/arch/arm64/boot/dts/allwinner/Makefile
+index 1e29a5a..977b82e 100644
+--- a/arch/arm64/boot/dts/allwinner/Makefile
b/arch/arm64/boot/dts/allwinner/Makefile
+@@ -9,6 +9,7 @@
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb
++dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo-plus2.dtb
+
+ always:= $(dtb-y)
+ subdir-y := $(dts-dirs)
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
+new file mode 100644
+index ..7c028af58f47
+--- /dev/null
b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
+@@ -0,0 +1,193 @@
++/*
++ * Copyright (C) 2017 Antony Antony
++ * Copyright (C) 2016 ARM Ltd.
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ * a) This file is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This file is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * Or, alternatively,
++ *
++ * b) Permission is hereby granted, free of charge, to any person
++ * obtaining a copy of this software and associated documentation
++ * files (the "Software"), to deal in the Software without
++ * restriction, including without limitation the rights to use,
++ * copy, modify, merge, publish, distribute, sublicense, and/or
++ * sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following
++ * conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ * OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++#include "sun50i-h5.dtsi"
++
++#include
++#include
++#include
++
++/ {
++ model = "FriendlyARM NanoPi NEO Plus2";
++ compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
++
++ aliases {
++ serial0 = &uart0;
++ };
++
++ chosen {
++ stdout-path = "serial0:115200n8";
++ };
++
++ leds {
++ compatible = "gpio-leds";
++
++ pwr {
++ label = "nanopi:green:pwr";
++ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;
++ default-state = "on";
++ };
++
++
[LEDE-DEV] [PATCH hauke/kernel-4.14-sunxi 2/4] sunxi: add u-boot DT for NanoPi NEO Plus2 board
u-boot upstream commit 6130b1f6bc23
Signed-off-by: Antony Antony
---
.../210-add-sunxi50i-nanopi-neo-plus2.patch| 176 +
1 file changed, 176 insertions(+)
create mode 100644
package/boot/uboot-sunxi/patches/210-add-sunxi50i-nanopi-neo-plus2.patch
diff --git
a/package/boot/uboot-sunxi/patches/210-add-sunxi50i-nanopi-neo-plus2.patch
b/package/boot/uboot-sunxi/patches/210-add-sunxi50i-nanopi-neo-plus2.patch
new file mode 100644
index 000..c3f2a9e
--- /dev/null
+++ b/package/boot/uboot-sunxi/patches/210-add-sunxi50i-nanopi-neo-plus2.patch
@@ -0,0 +1,176 @@
+From 77f54e8698001d8a987f2aa4870f71b65dc089eb Mon Sep 17 00:00:00 2001
+In-Reply-To: <20170921152217.4011-1-ant...@phenome.org>
+References: <20170921152217.4011-1-ant...@phenome.org>
+From: Antony Antony
+Date: Thu, 21 Sep 2017 13:34:07 +0200
+Subject: [PATCH v5 1/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
+
+Add initial DT for NanoPi NEO Plus2 by FriendlyARM
+- Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
+- 1 GB DDR3 RAM
+- 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
+- micro SD card slot
+- Gigabit Ethernet (external RTL8211E-VB-CG chip)
+- 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
+- 2x USB 2.0 host ports
+
+Signed-off-by: Antony Antony
+---
+ arch/arm/dts/Makefile | 1 +
+ arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 106
+ configs/nanopi_neo_plus2_defconfig | 18 +
+ 3 files changed, 125 insertions(+)
+ create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
+ create mode 100644 configs/nanopi_neo_plus2_defconfig
+
+diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
+index 6db64f91..e44ceaf 100644
+--- a/arch/arm/dts/Makefile
b/arch/arm/dts/Makefile
+@@ -336,6 +336,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
+ sun8i-v3s-licheepi-zero.dtb
+ dtb-$(CONFIG_MACH_SUN50I_H5) += \
+ sun50i-h5-nanopi-neo2.dtb \
++ sun50i-h5-nanopi-neo-plus2.dtb \
+ sun50i-h5-orangepi-pc2.dtb \
+ sun50i-h5-orangepi-prime.dtb \
+ sun50i-h5-orangepi-zero-plus2.dtb
+diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
+new file mode 100644
+index 000..f1406c2
+--- /dev/null
b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
+@@ -0,0 +1,106 @@
++/*
++ * Copyright (C) 2017 Antony Antony
++ * Copyright (c) 2016 ARM Ltd.
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ * a) This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * Or, alternatively,
++ *
++ * b) Permission is hereby granted, free of charge, to any person
++ * obtaining a copy of this software and associated documentation
++ * files (the "Software"), to deal in the Software without
++ * restriction, including without limitation the rights to use,
++ * copy, modify, merge, publish, distribute, sublicense, and/or
++ * sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following
++ * conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ * OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++
++#include "sun50i-h5.dtsi"
++
++#include
++
++/ {
++ model = "FriendlyARM NanoPi NEO Plus 2";
++ compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
++
++ aliases {
++ serial0 = &uart0;
++ };
++
++ chosen {
++ stdout-path = "serial0:115200n8";
++ };
++
++ reg_vcc3v3: vcc3v3 {
++ compatible = "regulator-fixed";
++ regulator-nam
[LEDE-DEV] [PATCH hauke/kernel-4.14-sunxi 1/4] sunxi: add support for NanoPi NEO Plus2 board
arm64: allwinner: h5: NanoPi NEO Plus2 DT support Add initial DT for NanoPi NEO Plus2 by FriendlyARM - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU - 1 GB DDR3 RAM - 8GB eMMC flash (Samsung KLM8G1WEPD-B031) - micro SD card slot - Gigabit Ethernet (external RTL8211E-VB-CG chip) - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module) - 2x USB 2.0 host ports & 2x USB via headers Signed-off-by: Antony Antony --- package/boot/uboot-sunxi/Makefile | 9 + target/linux/sunxi/image/cortex-a53.mk | 10 ++ 2 files changed, 19 insertions(+) diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile index 056300e..9ec8e24 100644 --- a/package/boot/uboot-sunxi/Makefile +++ b/package/boot/uboot-sunxi/Makefile @@ -168,6 +168,14 @@ define U-Boot/pangolin UENV:=pangolin endef +define U-Boot/nanopi_neo_plus2 + BUILD_SUBTARGET:=cortexa53 + NAME:=NanoPi NEO Plus2 (H5) + BUILD_DEVICES:=sun50i-h5-nanopi-neo-plus2 + DEPENDS:=+PACKAGE_u-boot-nanopi-neo-plus2:arm-trusted-firmware-sunxi + UENV:=a64 +endef + define U-Boot/pine64_plus BUILD_SUBTARGET:=cortexa53 NAME:=Pine64 Plus A64 @@ -197,6 +205,7 @@ UBOOT_TARGETS := \ Lamobo_R1 \ nanopi_m1_plus \ nanopi_neo \ + nanopi_neo_plus2 \ orangepi_r1 \ orangepi_plus \ orangepi_2 \ diff --git a/target/linux/sunxi/image/cortex-a53.mk b/target/linux/sunxi/image/cortex-a53.mk index bbb253f..eb31aa8 100644 --- a/target/linux/sunxi/image/cortex-a53.mk +++ b/target/linux/sunxi/image/cortex-a53.mk @@ -7,6 +7,16 @@ # ifeq ($(SUBTARGET),cortexa53) +define Device/sun50i-h5-nanopi-neo-plus2 + DEVICE_TITLE:=Nanopi NEO Plus2 (H5) + SUPPORTED_DEVICES:=nanopi-neo-plus2 + SUNXI_DTS:=allwinner/sun50i-h5-nanopi-neo-plus2 + KERNEL_NAME := Image + KERNEL := kernel-bin +endef + +TARGET_DEVICES += sun50i-h5-nanopi-neo-plus2 + define Device/sun50i-a64-pine64-plus DEVICE_TITLE:=Pine64 Plus A64 SUPPORTED_DEVICES:=pine64,pine64-plus -- 2.7.4 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
