| Message ID | 1469635835-2063-4-git-send-email-hdegoede@redhat.com |
|---|---|
| State | Accepted |
| Commit | fcada3b05e56c9b22bf5f92ba94fa80449452e76 |
| Delegated to: | Hans de Goede |
| Headers | show |
On Wed, 2016-07-27 at 18:10 +0200, Hans de Goede wrote: > With the recent bug fixes for the sun8i_emac driver all known issues > are resolved, so we can re-enable the driver. > > While at it, also enable the emac on the Orange Pi One. > > Cc: Chen-Yu Tsai <wens@csie.org> > Cc: Corentin LABBE <clabbe.montjoie@gmail.com> > Cc: Amit Singh Tomar <amittomer25@gmail.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
On 27 July 2016 at 23:55, Ian Campbell <ijc+uboot@hellion.org.uk> wrote: > On Wed, 2016-07-27 at 18:10 +0200, Hans de Goede wrote: >> With the recent bug fixes for the sun8i_emac driver all known issues >> are resolved, so we can re-enable the driver. >> >> While at it, also enable the emac on the Orange Pi One. >> >> Cc: Chen-Yu Tsai <wens@csie.org> >> Cc: Corentin LABBE <clabbe.montjoie@gmail.com> >> Cc: Amit Singh Tomar <amittomer25@gmail.com> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > Acked-by: Ian Campbell <ijc@hellion.org.uk> Acked-by: Jagan Teki <jteki@openedev.com>
diff --git a/arch/arm/dts/sun8i-h3-orangepi-one.dts b/arch/arm/dts/sun8i-h3-orangepi-one.dts index 0adf932..8df5c74 100644 --- a/arch/arm/dts/sun8i-h3-orangepi-one.dts +++ b/arch/arm/dts/sun8i-h3-orangepi-one.dts @@ -94,6 +94,17 @@ status = "okay"; }; +&emac { + phy = <&phy1>; + phy-mode = "mii"; + allwinner,use-internal-phy; + allwinner,leds-active-low; + status = "okay"; + phy1: ethernet-phy@1 { + reg = <1>; + }; +}; + &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig index be8afca..81299e6 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -13,3 +13,4 @@ CONFIG_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set CONFIG_USB_EHCI_HCD=y +CONFIG_SUN8I_EMAC=y diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index 366fa08..2281aed 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -14,3 +14,4 @@ CONFIG_SPL=y # CONFIG_CMD_FPGA is not set CONFIG_SY8106A_POWER=y CONFIG_USB_EHCI_HCD=y +CONFIG_SUN8I_EMAC=y diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index c78aec3..3ec6dac 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -15,3 +15,4 @@ CONFIG_SPL=y # CONFIG_CMD_FPGA is not set CONFIG_SY8106A_POWER=y CONFIG_USB_EHCI_HCD=y +CONFIG_SUN8I_EMAC=y diff --git a/configs/pine64_plus_defconfig b/configs/pine64_plus_defconfig index 0bf79bf..5c97de1 100644 --- a/configs/pine64_plus_defconfig +++ b/configs/pine64_plus_defconfig @@ -10,3 +10,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pine64-plus" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y +CONFIG_SUN8I_EMAC=y
With the recent bug fixes for the sun8i_emac driver all known issues are resolved, so we can re-enable the driver. While at it, also enable the emac on the Orange Pi One. Cc: Chen-Yu Tsai <wens@csie.org> Cc: Corentin LABBE <clabbe.montjoie@gmail.com> Cc: Amit Singh Tomar <amittomer25@gmail.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- arch/arm/dts/sun8i-h3-orangepi-one.dts | 11 +++++++++++ configs/orangepi_one_defconfig | 1 + configs/orangepi_pc_defconfig | 1 + configs/orangepi_pc_plus_defconfig | 1 + configs/pine64_plus_defconfig | 1 + 5 files changed, 15 insertions(+)