diff options
| author | Olof Johansson <olof@lixom.net> | 2017-08-29 22:39:18 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-08-29 22:39:18 -0700 |
| commit | fabed5ad230a5ff8320b2928ec20a52e59a9bf60 (patch) | |
| tree | fadeb37aad19748ebae3806f7b80277993ae10eb /arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | |
| parent | 93a4c8355e0e448d83f31801b4c72f66e4360975 (diff) | |
| parent | fe45174b72aead678da581bab9e9a37c9b26a070 (diff) | |
Merge tag 'sunxi-fixes-for-4.13-3' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes
Allwinner fixes for 4.13, take 3
This is a revert of the EMAC bindings. The discussion has not settled down
yet on a proper representation of the PHY, and therefore we cannot commit
to a binding yet
* tag 'sunxi-fixes-for-4.13-3' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
arm: dts: sunxi: Revert EMAC changes
arm64: dts: allwinner: Revert EMAC changes
dt-bindings: net: Revert sun8i dwmac binding
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts')
| -rw-r--r-- | arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts index a10281b455f5..8b93f5c781a7 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts @@ -53,11 +53,6 @@ }; }; -&emac { - /* LEDs changed to active high on the plus */ - /delete-property/ allwinner,leds-active-low; -}; - &mmc1 { pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins_a>; |