drivers: net: ls1088ardb: Fix EC1 and EC2 RCW offset

[oweals/u-boot.git] / drivers / net / mvneta.c

diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 45e5eda95522c0f588e4878ee2e46e1fd59be854..333be8ff28b14d97c87d0d3f0396f0ceda13fe84 100644 (file)
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -27,6 +27,7 @@
 #include <asm/arch/soc.h>
 #include <linux/compat.h>
 #include <linux/mbus.h>
+#include <asm-generic/gpio.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -34,14 +35,6 @@ DECLARE_GLOBAL_DATA_PTR;
 # error Marvell mvneta requires PHYLIB
 #endif
 
-/* Some linux -> U-Boot compatibility stuff */
-#define netdev_err(dev, fmt, args...)          \
-       printf(fmt, ##args)
-#define netdev_warn(dev, fmt, args...)         \
-       printf(fmt, ##args)
-#define netdev_info(dev, fmt, args...)         \
-       printf(fmt, ##args)
-
 #define CONFIG_NR_CPUS         1
 #define ETH_HLEN               14      /* Total octets in header */
 
@@ -282,6 +275,9 @@ struct mvneta_port {
        int init;
        int phyaddr;
        struct phy_device *phydev;
+#ifdef CONFIG_DM_GPIO
+       struct gpio_desc phy_reset_gpio;
+#endif
        struct mii_dev *bus;
 };
 
@@ -1702,11 +1698,13 @@ static int mvneta_probe(struct udevice *dev)
 
                /* Align buffer area for descs and rx_buffers to 1MiB */
                bd_space = memalign(1 << MMU_SECTION_SHIFT, BD_SPACE);
+               flush_dcache_range((ulong)bd_space, (ulong)bd_space + BD_SPACE);
                mmu_set_region_dcache_behaviour((phys_addr_t)bd_space, BD_SPACE,
                                                DCACHE_OFF);
                buffer_loc.tx_descs = (struct mvneta_tx_desc *)bd_space;
                size = roundup(MVNETA_MAX_TXD * sizeof(struct mvneta_tx_desc),
                                ARCH_DMA_MINALIGN);
+               memset(buffer_loc.tx_descs, 0, size);
                buffer_loc.rx_descs = (struct mvneta_rx_desc *)
                        ((phys_addr_t)bd_space + size);
                size += roundup(MVNETA_MAX_RXD * sizeof(struct mvneta_rx_desc),
@@ -1755,6 +1753,17 @@ static int mvneta_probe(struct udevice *dev)
        if (ret)
                return ret;
 
+#ifdef CONFIG_DM_GPIO
+       gpio_request_by_name(dev, "phy-reset-gpios", 0,
+                            &pp->phy_reset_gpio, GPIOD_IS_OUT);
+
+       if (dm_gpio_is_valid(&pp->phy_reset_gpio)) {
+               dm_gpio_set_value(&pp->phy_reset_gpio, 1);
+               mdelay(10);
+               dm_gpio_set_value(&pp->phy_reset_gpio, 0);
+       }
+#endif
+
        return board_network_enable(bus);
 }