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 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6sx-sabreauto.dts
diff --git
a/arch/arm/boot/dts/imx6sx-sabreauto.dts
b/arch/arm/boot/dts/imx6sx-sabreauto.dts
index b0ee324afe581f79364faf89925093677460094c..315044ccd65fc6da86f1313c3d6715bb0aee8d56 100644
(file)
--- a/
arch/arm/boot/dts/imx6sx-sabreauto.dts
+++ b/
arch/arm/boot/dts/imx6sx-sabreauto.dts
@@
-75,7
+75,7
@@
&fec1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet1>;
- phy-mode = "rgmii";
+ phy-mode = "rgmii
-id
";
phy-handle = <ðphy1>;
fsl,magic-packet;
status = "okay";