2017-12-15 22:39:11

by Philipp Rossak

[permalink] [raw]
Subject: [PATCH 0/2] Ethernet for the Nanopi M1 & M1 plus

The first patch of this patch series, fixes a missing alias
on the nanopi m1 plus. The second patch enables the dwmac-sun8i
ethernet driver on the Nanopi M1.

Philipp Rossak (2):
ARM: dts: sun8i: h3: nanopi-m1-plus: fix missing ethernet 0 in aliases
ARM: dts: sun8i: h3: Enable dwmac-sun8i on the Nanopi M1

arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 1 +
arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts | 11 +++++++++++
2 files changed, 12 insertions(+)

--
2.11.0


2017-12-15 22:39:14

by Philipp Rossak

[permalink] [raw]
Subject: [PATCH 1/2] ARM: dts: sun8i: h3: nanopi-m1-plus: fix missing ethernet 0 in aliases

Signed-off-by: Philipp Rossak <[email protected]>
---
arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
index 0a8b79cf5954..87509a3e6aba 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
@@ -48,6 +48,7 @@

aliases {
serial1 = &uart3;
+ ethernet0 = &emac;
ethernet1 = &sdio_wifi;
};

--
2.11.0

2017-12-15 22:39:43

by Philipp Rossak

[permalink] [raw]
Subject: [PATCH 2/2] ARM: dts: sun8i: h3: Enable dwmac-sun8i on the Nanopi M1

The dwmac-sun8i hardware is present on the Nanopi M1.
It uses the internal PHY

Signed-off-by: Philipp Rossak <[email protected]>
---
arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts | 11 +++++++++++
1 file changed, 11 insertions(+)

diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts
index 3a2ccdb28afd..c77fbca4f227 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts
@@ -45,6 +45,10 @@
/ {
model = "FriendlyArm NanoPi M1";
compatible = "friendlyarm,nanopi-m1", "allwinner,sun8i-h3";
+
+ aliases {
+ ethernet0 = &emac;
+ };
};

&ehci1 {
@@ -55,6 +59,13 @@
status = "okay";
};

+&emac {
+ phy-handle = <&int_mii_phy>;
+ phy-mode = "mii";
+ allwinner,leds-active-low;
+ status = "okay";
+};
+
&ir {
pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>;
--
2.11.0

2017-12-18 06:45:11

by Maxime Ripard

[permalink] [raw]
Subject: Re: [PATCH 1/2] ARM: dts: sun8i: h3: nanopi-m1-plus: fix missing ethernet 0 in aliases

Hi,

On Fri, Dec 15, 2017 at 11:39:00PM +0100, Philipp Rossak wrote:
> Signed-off-by: Philipp Rossak <[email protected]>

Please add a commit log here.

--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

2017-12-18 11:52:40

by Philipp Rossak

[permalink] [raw]
Subject: Re: [PATCH 1/2] ARM: dts: sun8i: h3: nanopi-m1-plus: fix missing ethernet 0 in aliases

Sorry!
I will fix it!

On 18.12.2017 07:45, Maxime Ripard wrote:
> Hi,
>
> On Fri, Dec 15, 2017 at 11:39:00PM +0100, Philipp Rossak wrote:
>> Signed-off-by: Philipp Rossak <[email protected]>
>
> Please add a commit log here.
>

2017-12-19 08:54:21

by Maxime Ripard

[permalink] [raw]
Subject: Re: [PATCH 2/2] ARM: dts: sun8i: h3: Enable dwmac-sun8i on the Nanopi M1

On Fri, Dec 15, 2017 at 11:39:01PM +0100, Philipp Rossak wrote:
> The dwmac-sun8i hardware is present on the Nanopi M1.
> It uses the internal PHY
>
> Signed-off-by: Philipp Rossak <[email protected]>

Applied, thanks!
Maxime

--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com


Attachments:
(No filename) (326.00 B)
signature.asc (833.00 B)
Download all attachments