diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-01 17:16:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-01 17:16:40 -0700 |
| commit | 54f70f52e3b3a26164220d98a712a274bd28502f (patch) | |
| tree | b0e42c3910a3d6b4fb294b5583ab5ca30502b0a8 /arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | |
| parent | f8c6d7246a380fd8d13ebc3f7dac2495dc53db47 (diff) | |
| parent | 6f71a925761e7843965a704eb6682ea337abb4a5 (diff) | |
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"A couple of late-arriving fixes before final 4.13:
- A few reverts of DT bindings on Allwinner for their ethernet
driver. Discussion didn't converge, and since bindings are
considered ABI it makes sense to revert instead of having to
support two bindings long-term.
- A fix to enumerate GPIOs properly on Marvell Armada AP806"
* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
arm64: dts: marvell: fix number of GPIOs in Armada AP806 description
arm: dts: sunxi: Revert EMAC changes
arm64: dts: allwinner: Revert EMAC changes
dt-bindings: net: Revert sun8i dwmac binding
Diffstat (limited to 'arch/arm/boot/dts/sun8i-h3-orangepi-2.dts')
| -rw-r--r-- | arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts index 17cdeae19c6f..8ff71b1bb45b 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts @@ -54,7 +54,6 @@ aliases { serial0 = &uart0; /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ - ethernet0 = &emac; ethernet1 = &rtl8189; }; @@ -118,13 +117,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>; |