git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'rproc-v4.16' of git://github.com/andersson/remoteproc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun8i-h3-nanopi-m1.dts
diff --git
a/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts
b/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts
index 3a2ccdb28afddf293e324210874fc2744497e3b9..c77fbca4f227a3fa70da9425eaa7f25f74c3b337 100644
(file)
--- 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";
/ {
model = "FriendlyArm NanoPi M1";
compatible = "friendlyarm,nanopi-m1", "allwinner,sun8i-h3";
+
+ aliases {
+ ethernet0 = &emac;
+ };
};
&ehci1 {
};
&ehci1 {
@@
-55,6
+59,13
@@
status = "okay";
};
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>;
&ir {
pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>;