Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

[mirror_ubuntu-artful-kernel.git] / arch / arm / boot / dts / am335x-baltos.dtsi

diff --git a/arch/arm/boot/dts/am335x-baltos.dtsi b/arch/arm/boot/dts/am335x-baltos.dtsi
index dd45d172a892a12dcc7947e1caaddcca547d0862..efb5eae290a8b7437b95206fa9f69ae4ccecab44 100644 (file)
--- a/arch/arm/boot/dts/am335x-baltos.dtsi
+++ b/arch/arm/boot/dts/am335x-baltos.dtsi
@@ -364,11 +364,14 @@
 };
 
 &davinci_mdio {
+       status = "okay";
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&davinci_mdio_default>;
        pinctrl-1 = <&davinci_mdio_sleep>;
 
-       status = "okay";
+       phy1: ethernet-phy@1 {
+               reg = <7>;
+       };
 };
 
 &mmc1 {
@@ -406,3 +409,7 @@
 &gpio0 {
        ti,no-reset-on-init;
 };
+
+&gpio3 {
+       ti,no-reset-on-init;
+};