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 branch 'x86-entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun9i-a80-optimus.dts
diff --git
a/arch/arm/boot/dts/sun9i-a80-optimus.dts
b/arch/arm/boot/dts/sun9i-a80-optimus.dts
index 2ed28d9e2787a6494323adbb2b6b59efc96d65ff..bbc6335e563141ee41ae97b6546c053ad77470cc 100644
(file)
--- a/
arch/arm/boot/dts/sun9i-a80-optimus.dts
+++ b/
arch/arm/boot/dts/sun9i-a80-optimus.dts
@@
-123,11
+123,13
@@
&gmac {
pinctrl-names = "default";
pinctrl-0 = <&gmac_rgmii_pins>;
- phy = <&phy1>;
+ phy
-handle
= <&phy1>;
phy-mode = "rgmii";
phy-supply = <®_cldo1>;
status = "okay";
+};
+&mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};