From: Antony Antony <antony@phenome.org>
Date: Tue, 6 Mar 2018 19:08:42 +0000 (+0100)
Subject: sunxi: NanoPi NEO Plus2 backport Gigabit Ethernet DT node
X-Git-Tag: v19.07.0-rc1~4234
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d6634edfc1f0177cb19e52441d71d7e3e03807c2;p=openwrt%2Fstaging%2Fhauke.git

sunxi: NanoPi NEO Plus2 backport Gigabit Ethernet DT node

Kernel 4.16 commit 27d7f9297027

Signed-off-by: Antony Antony <antony@phenome.org>
---

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
index 535c8b6d1f..9c0e64a902 100644
--- 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
@@ -1,6 +1,6 @@
-From d7341305863bcc054ee168bd77864100e0c3b144 Mon Sep 17 00:00:00 2001
+From 54cc3330c2334a0cea8cafc105a29c5d67f9fd32 Mon Sep 17 00:00:00 2001
 From: Antony Antony <antony@phenome.org>
-Date: Thu, 7 Sep 2017 18:42:22 +0200
+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
@@ -13,6 +13,7 @@ Add initial DT for NanoPi NEO Plus2 by FriendlyARM
 - 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 <antony@phenome.org>
 
@@ -28,7 +29,7 @@ Signed-off-by: Antony Antony <antony@phenome.org>
  subdir-y	:= $(dts-dirs)
 --- /dev/null
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
-@@ -0,0 +1,193 @@
+@@ -0,0 +1,210 @@
 +/*
 + * Copyright (C) 2017 Antony Antony <antony@phenome.org>
 + * Copyright (C) 2016 ARM Ltd.
@@ -84,6 +85,7 @@ Signed-off-by: Antony Antony <antony@phenome.org>
 +	compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
 +
 +	aliases {
++		ethernet0 = &emac;
 +		serial0 = &uart0;
 +	};
 +
@@ -164,6 +166,22 @@ Signed-off-by: Antony Antony <antony@phenome.org>
 +	status = "okay";
 +};
 +
++&emac {
++	pinctrl-names = "default";
++	pinctrl-0 = <&emac_rgmii_pins>;
++	phy-supply = <&reg_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>, <&mmc0_cd_pin>;