poplar: enable Ethernet driver support

The 'phy' reset of gmac device in kernel device tree is not generic
enough for u-boot to use, so we need to overwrite the 'resets' property
as needed.  With this device tree fixup and poplar_defconfig changes,
Ethernet starts working on Poplar board.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>

diff --git a/arch/arm/dts/hi3798cv200-u-boot.dtsi b/arch/arm/dts/hi3798cv200-u-boot.dtsi
index 7844c5208c5d4e5a8083c51d3e04288b8b70b3a9..2de06d952914643fbc512cd2af4a2df1a69582f8 100644 (file)
--- a/arch/arm/dts/hi3798cv200-u-boot.dtsi
+++ b/arch/arm/dts/hi3798cv200-u-boot.dtsi
@@ -8,7 +8,15 @@
  * (C) Copyright 2017 Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
  */
 
+#include <dt-bindings/reset/ti-syscon.h>
+
 &soc {
+       rst: reset-controller@8a22000 {
+               compatible = "hisilicon,hi3798cv200-reset";
+               reg = <0x8a22000 0x1000>;
+               #reset-cells = <3>;
+       };
+
        usb2: ehci@9890000 {
                compatible = "generic-ehci";
                reg = <0x9890000 0x100>;
@@ -16,6 +24,12 @@
        };
 };
 
+&gmac1 {
+       resets = <&rst 0xcc 9  ASSERT_SET>,
+                <&rst 0xcc 11 ASSERT_SET>,
+                <&rst 0xcc 13 DEASSERT_SET>;
+};
+
 &uart0 {
        clock = <75000000>;
        status = "okay";

diff --git a/configs/poplar_defconfig b/configs/poplar_defconfig
index 81bd3702e42ad8bd7fd094c8e3e3a5bff6fbce63..76ab5eb70e7e23c2298ff26d9dc6085ccf6ebf3c 100644 (file)
--- a/configs/poplar_defconfig
+++ b/configs/poplar_defconfig
@@ -19,6 +19,9 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_DM_MMC=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_K3=y
+CONFIG_DM_ETH=y
+CONFIG_HIGMACV300_ETH=y
+CONFIG_RESET_HISILICON=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y