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
/
imx6qdl-sr-som.dtsi
diff --git
a/arch/arm/boot/dts/imx6qdl-sr-som.dtsi
b/arch/arm/boot/dts/imx6qdl-sr-som.dtsi
index 4ccb7afc4b35ddb3ff465b0880ff8f7bc54c6e22..6d7f6b9035bc173eae0ba1369a07c07e94162049 100644
(file)
--- a/
arch/arm/boot/dts/imx6qdl-sr-som.dtsi
+++ b/
arch/arm/boot/dts/imx6qdl-sr-som.dtsi
@@
-53,7
+53,7
@@
&fec {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_microsom_enet_ar8035>;
- phy-mode = "rgmii";
+ phy-mode = "rgmii
-id
";
phy-reset-duration = <2>;
phy-reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;
status = "okay";