summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2017-08-28 11:49:50 +0300
committerMaxime Ripard <maxime.ripard@free-electrons.com>2017-08-28 11:56:32 +0300
commit6b0e06df5cadba8471524266cc472dbbda55146b (patch)
tree781d4e82bfe01ff3047a29892ede6bd605380a95 /arch/arm/boot
parent359b5a1e1c2d81af6d68de509e11d08ab4c150dc (diff)
downloadlinux-6b0e06df5cadba8471524266cc472dbbda55146b.tar.xz
Revert "ARM: dts: sun8i: h3: Enable dwmac-sun8i on the Beelink X2"
This reverts commit ddb56254ae52acff7bd7fbd8f963e79bffc324d4. The EMAC bindings have not stabilized yet, so we can't commit to keeping them stable. Acked-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/sun8i-h3-beelink-x2.dts9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
index 546837ccd8af..10da56e86ab8 100644
--- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
+++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
@@ -53,7 +53,7 @@
aliases {
serial0 = &uart0;
- ethernet0 = &emac;
+ /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
ethernet1 = &sdiowifi;
};
@@ -108,13 +108,6 @@
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>;