]> git.sur5r.net Git - u-boot/blobdiff - drivers/net/mvpp2.c
mvpp2: Fix warning over 32bit vs 64bit targets
[u-boot] / drivers / net / mvpp2.c
index 1c83884d19d4d6a386985d22a78ba000d4a78d95..e3d31a560d54af4697cf8d48d678e878b4dd3fae 100644 (file)
@@ -30,6 +30,8 @@
 #include <asm/arch/soc.h>
 #include <linux/compat.h>
 #include <linux/mbus.h>
+#include <asm-generic/gpio.h>
+#include <fdt_support.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -314,6 +316,8 @@ do {                                                                        \
 #define            MVPP22_BM_ADDR_HIGH_VIRT_RLS_MASK   0xff00
 #define     MVPP22_BM_ADDR_HIGH_VIRT_RLS_SHIFT 8
 #define MVPP22_BM_MC_RLS_REG                   0x64d4
+#define MVPP22_BM_POOL_BASE_HIGH_REG           0x6310
+#define MVPP22_BM_POOL_BASE_HIGH_MASK          0xff
 
 /* TX Scheduler registers */
 #define MVPP2_TXP_SCHED_PORT_INDEX_REG         0x8000
@@ -355,6 +359,7 @@ do {                                                                        \
 /* Per-port registers */
 #define MVPP2_GMAC_CTRL_0_REG                  0x0
 #define      MVPP2_GMAC_PORT_EN_MASK           BIT(0)
+#define      MVPP2_GMAC_PORT_TYPE_MASK         BIT(1)
 #define      MVPP2_GMAC_MAX_RX_SIZE_OFFS       2
 #define      MVPP2_GMAC_MAX_RX_SIZE_MASK       0x7ffc
 #define      MVPP2_GMAC_MIB_CNTR_EN_MASK       BIT(15)
@@ -366,29 +371,131 @@ do {                                                                     \
 #define      MVPP2_GMAC_SA_LOW_OFFS            7
 #define MVPP2_GMAC_CTRL_2_REG                  0x8
 #define      MVPP2_GMAC_INBAND_AN_MASK         BIT(0)
+#define      MVPP2_GMAC_SGMII_MODE_MASK                BIT(0)
 #define      MVPP2_GMAC_PCS_ENABLE_MASK                BIT(3)
 #define      MVPP2_GMAC_PORT_RGMII_MASK                BIT(4)
+#define      MVPP2_GMAC_PORT_DIS_PADING_MASK   BIT(5)
 #define      MVPP2_GMAC_PORT_RESET_MASK                BIT(6)
+#define      MVPP2_GMAC_CLK_125_BYPS_EN_MASK   BIT(9)
 #define MVPP2_GMAC_AUTONEG_CONFIG              0xc
 #define      MVPP2_GMAC_FORCE_LINK_DOWN                BIT(0)
 #define      MVPP2_GMAC_FORCE_LINK_PASS                BIT(1)
+#define      MVPP2_GMAC_EN_PCS_AN              BIT(2)
+#define      MVPP2_GMAC_AN_BYPASS_EN           BIT(3)
 #define      MVPP2_GMAC_CONFIG_MII_SPEED       BIT(5)
 #define      MVPP2_GMAC_CONFIG_GMII_SPEED      BIT(6)
 #define      MVPP2_GMAC_AN_SPEED_EN            BIT(7)
 #define      MVPP2_GMAC_FC_ADV_EN              BIT(9)
+#define      MVPP2_GMAC_EN_FC_AN               BIT(11)
 #define      MVPP2_GMAC_CONFIG_FULL_DUPLEX     BIT(12)
 #define      MVPP2_GMAC_AN_DUPLEX_EN           BIT(13)
+#define      MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG        BIT(15)
 #define MVPP2_GMAC_PORT_FIFO_CFG_1_REG         0x1c
 #define      MVPP2_GMAC_TX_FIFO_MIN_TH_OFFS    6
 #define      MVPP2_GMAC_TX_FIFO_MIN_TH_ALL_MASK        0x1fc0
 #define      MVPP2_GMAC_TX_FIFO_MIN_TH_MASK(v) (((v) << 6) & \
                                        MVPP2_GMAC_TX_FIFO_MIN_TH_ALL_MASK)
+#define MVPP2_GMAC_CTRL_4_REG                  0x90
+#define      MVPP2_GMAC_CTRL4_EXT_PIN_GMII_SEL_MASK    BIT(0)
+#define      MVPP2_GMAC_CTRL4_DP_CLK_SEL_MASK  BIT(5)
+#define      MVPP2_GMAC_CTRL4_SYNC_BYPASS_MASK BIT(6)
+#define      MVPP2_GMAC_CTRL4_QSGMII_BYPASS_ACTIVE_MASK        BIT(7)
 
-#define MVPP22_SMI_MISC_CFG_REG                        0x1204
+/*
+ * Per-port XGMAC registers. PPv2.2 only, only for GOP port 0,
+ * relative to port->base.
+ */
+
+/* Port Mac Control0 */
+#define MVPP22_XLG_CTRL0_REG                   0x100
+#define      MVPP22_XLG_PORT_EN                        BIT(0)
+#define      MVPP22_XLG_MAC_RESETN             BIT(1)
+#define      MVPP22_XLG_RX_FC_EN               BIT(7)
+#define      MVPP22_XLG_MIBCNT_DIS             BIT(13)
+/* Port Mac Control1 */
+#define MVPP22_XLG_CTRL1_REG                   0x104
+#define      MVPP22_XLG_MAX_RX_SIZE_OFFS       0
+#define      MVPP22_XLG_MAX_RX_SIZE_MASK       0x1fff
+/* Port Interrupt Mask */
+#define MVPP22_XLG_INTERRUPT_MASK_REG          0x118
+#define      MVPP22_XLG_INTERRUPT_LINK_CHANGE  BIT(1)
+/* Port Mac Control3 */
+#define MVPP22_XLG_CTRL3_REG                   0x11c
+#define      MVPP22_XLG_CTRL3_MACMODESELECT_MASK       (7 << 13)
+#define      MVPP22_XLG_CTRL3_MACMODESELECT_GMAC       (0 << 13)
+#define      MVPP22_XLG_CTRL3_MACMODESELECT_10GMAC     (1 << 13)
+/* Port Mac Control4 */
+#define MVPP22_XLG_CTRL4_REG                   0x184
+#define      MVPP22_XLG_FORWARD_802_3X_FC_EN   BIT(5)
+#define      MVPP22_XLG_FORWARD_PFC_EN         BIT(6)
+#define      MVPP22_XLG_MODE_DMA_1G            BIT(12)
+#define      MVPP22_XLG_EN_IDLE_CHECK_FOR_LINK BIT(14)
+
+/* XPCS registers */
+
+/* Global Configuration 0 */
+#define MVPP22_XPCS_GLOBAL_CFG_0_REG           0x0
+#define      MVPP22_XPCS_PCSRESET              BIT(0)
+#define      MVPP22_XPCS_PCSMODE_OFFS          3
+#define      MVPP22_XPCS_PCSMODE_MASK          (0x3 << \
+                                                MVPP22_XPCS_PCSMODE_OFFS)
+#define      MVPP22_XPCS_LANEACTIVE_OFFS       5
+#define      MVPP22_XPCS_LANEACTIVE_MASK       (0x3 << \
+                                                MVPP22_XPCS_LANEACTIVE_OFFS)
+
+/* MPCS registers */
+
+#define PCS40G_COMMON_CONTROL                  0x14
+#define      FORWARD_ERROR_CORRECTION_MASK     BIT(10)
+
+#define PCS_CLOCK_RESET                                0x14c
+#define      TX_SD_CLK_RESET_MASK              BIT(0)
+#define      RX_SD_CLK_RESET_MASK              BIT(1)
+#define      MAC_CLK_RESET_MASK                        BIT(2)
+#define      CLK_DIVISION_RATIO_OFFS           4
+#define      CLK_DIVISION_RATIO_MASK           (0x7 << CLK_DIVISION_RATIO_OFFS)
+#define      CLK_DIV_PHASE_SET_MASK            BIT(11)
+
+/* System Soft Reset 1 */
+#define GOP_SOFT_RESET_1_REG                   0x108
+#define     NETC_GOP_SOFT_RESET_OFFS           6
+#define     NETC_GOP_SOFT_RESET_MASK           (0x1 << \
+                                                NETC_GOP_SOFT_RESET_OFFS)
+
+/* Ports Control 0 */
+#define NETCOMP_PORTS_CONTROL_0_REG            0x110
+#define     NETC_BUS_WIDTH_SELECT_OFFS         1
+#define     NETC_BUS_WIDTH_SELECT_MASK         (0x1 << \
+                                                NETC_BUS_WIDTH_SELECT_OFFS)
+#define     NETC_GIG_RX_DATA_SAMPLE_OFFS       29
+#define     NETC_GIG_RX_DATA_SAMPLE_MASK       (0x1 << \
+                                                NETC_GIG_RX_DATA_SAMPLE_OFFS)
+#define     NETC_CLK_DIV_PHASE_OFFS            31
+#define     NETC_CLK_DIV_PHASE_MASK            (0x1 << NETC_CLK_DIV_PHASE_OFFS)
+/* Ports Control 1 */
+#define NETCOMP_PORTS_CONTROL_1_REG            0x114
+#define     NETC_PORTS_ACTIVE_OFFSET(p)                (0 + p)
+#define     NETC_PORTS_ACTIVE_MASK(p)          (0x1 << \
+                                                NETC_PORTS_ACTIVE_OFFSET(p))
+#define     NETC_PORT_GIG_RF_RESET_OFFS(p)     (28 + p)
+#define     NETC_PORT_GIG_RF_RESET_MASK(p)     (0x1 << \
+                                                NETC_PORT_GIG_RF_RESET_OFFS(p))
+#define NETCOMP_CONTROL_0_REG                  0x120
+#define     NETC_GBE_PORT0_SGMII_MODE_OFFS     0
+#define     NETC_GBE_PORT0_SGMII_MODE_MASK     (0x1 << \
+                                                NETC_GBE_PORT0_SGMII_MODE_OFFS)
+#define     NETC_GBE_PORT1_SGMII_MODE_OFFS     1
+#define     NETC_GBE_PORT1_SGMII_MODE_MASK     (0x1 << \
+                                                NETC_GBE_PORT1_SGMII_MODE_OFFS)
+#define     NETC_GBE_PORT1_MII_MODE_OFFS       2
+#define     NETC_GBE_PORT1_MII_MODE_MASK       (0x1 << \
+                                                NETC_GBE_PORT1_MII_MODE_OFFS)
+
+#define MVPP22_SMI_MISC_CFG_REG                        (MVPP22_SMI + 0x04)
 #define      MVPP22_SMI_POLLING_EN             BIT(10)
 
-#define MVPP22_PORT_BASE                       0x30e00
-#define MVPP22_PORT_OFFSET                     0x1000
+#define MVPP22_SMI_PHY_ADDR_REG(port)          (MVPP22_SMI + 0x04 + \
+                                                (0x4 * (port)))
 
 #define MVPP2_CAUSE_TXQ_SENT_DESC_ALL_MASK     0xff
 
@@ -414,6 +521,48 @@ do {                                                                       \
 #define     MVPP2_PHY_ADDR_MASK                        0x1f
 #define     MVPP2_PHY_REG_MASK                 0x1f
 
+/* Additional PPv2.2 offsets */
+#define MVPP22_MPCS                            0x007000
+#define MVPP22_XPCS                            0x007400
+#define MVPP22_PORT_BASE                       0x007e00
+#define MVPP22_PORT_OFFSET                     0x001000
+#define MVPP22_RFU1                            0x318000
+
+/* Maximum number of ports */
+#define MVPP22_GOP_MAC_NUM                     4
+
+/* Sets the field located at the specified in data */
+#define MVPP2_RGMII_TX_FIFO_MIN_TH             0x41
+#define MVPP2_SGMII_TX_FIFO_MIN_TH             0x5
+#define MVPP2_SGMII2_5_TX_FIFO_MIN_TH          0xb
+
+/* Net Complex */
+enum mv_netc_topology {
+       MV_NETC_GE_MAC2_SGMII           =       BIT(0),
+       MV_NETC_GE_MAC3_SGMII           =       BIT(1),
+       MV_NETC_GE_MAC3_RGMII           =       BIT(2),
+};
+
+enum mv_netc_phase {
+       MV_NETC_FIRST_PHASE,
+       MV_NETC_SECOND_PHASE,
+};
+
+enum mv_netc_sgmii_xmi_mode {
+       MV_NETC_GBE_SGMII,
+       MV_NETC_GBE_XMII,
+};
+
+enum mv_netc_mii_mode {
+       MV_NETC_GBE_RGMII,
+       MV_NETC_GBE_MII,
+};
+
+enum mv_netc_lanes {
+       MV_NETC_LANE_23,
+       MV_NETC_LANE_45,
+};
+
 /* Various constants */
 
 /* Coalescing */
@@ -470,10 +619,10 @@ do {                                                                      \
 #define MVPP2_MAX_TXD                  16
 
 /* Amount of Tx descriptors that can be reserved at once by CPU */
-#define MVPP2_CPU_DESC_CHUNK           64
+#define MVPP2_CPU_DESC_CHUNK           16
 
 /* Max number of Tx descriptors in each aggregated queue */
-#define MVPP2_AGGR_TXQ_SIZE            256
+#define MVPP2_AGGR_TXQ_SIZE            16
 
 /* Descriptor aligned size */
 #define MVPP2_DESC_ALIGNED_SIZE                32
@@ -763,6 +912,12 @@ struct mvpp2 {
        void __iomem *iface_base;
        void __iomem *mdio_base;
 
+       void __iomem *mpcs_base;
+       void __iomem *xpcs_base;
+       void __iomem *rfu1_base;
+
+       u32 netc_config;
+
        /* List of pointers to port structures */
        struct mvpp2_port **port_list;
 
@@ -789,6 +944,7 @@ struct mvpp2 {
        struct mii_dev *bus;
 
        int probe_done;
+       u8 num_ports;
 };
 
 struct mvpp2_pcpu_stats {
@@ -834,11 +990,17 @@ struct mvpp2_port {
        phy_interface_t phy_interface;
        int phy_node;
        int phyaddr;
+#ifdef CONFIG_DM_GPIO
+       struct gpio_desc phy_reset_gpio;
+       struct gpio_desc phy_tx_disable_gpio;
+#endif
        int init;
        unsigned int link;
        unsigned int duplex;
        unsigned int speed;
 
+       unsigned int phy_speed;         /* SGMII 1Gbps vs 2.5Gbps */
+
        struct mvpp2_bm_pool *pool_long;
        struct mvpp2_bm_pool *pool_short;
 
@@ -1092,9 +1254,6 @@ struct mvpp2_bm_pool {
 
        /* Ports using BM pool */
        u32 port_map;
-
-       /* Occupied buffers indicator */
-       int in_use_thresh;
 };
 
 /* Static declaractions */
@@ -2437,6 +2596,10 @@ static int mvpp2_bm_pool_create(struct udevice *dev,
 
        mvpp2_write(priv, MVPP2_BM_POOL_BASE_REG(bm_pool->id),
                    lower_32_bits(bm_pool->dma_addr));
+       if (priv->hw_version == MVPP22)
+               mvpp2_write(priv, MVPP22_BM_POOL_BASE_HIGH_REG,
+                           (upper_32_bits(bm_pool->dma_addr) &
+                           MVPP22_BM_POOL_BASE_HIGH_MASK));
        mvpp2_write(priv, MVPP2_BM_POOL_SIZE_REG(bm_pool->id), size);
 
        val = mvpp2_read(priv, MVPP2_BM_POOL_CTRL_REG(bm_pool->id));
@@ -2468,6 +2631,13 @@ static void mvpp2_bm_pool_bufsize_set(struct mvpp2 *priv,
 static void mvpp2_bm_bufs_free(struct udevice *dev, struct mvpp2 *priv,
                               struct mvpp2_bm_pool *bm_pool)
 {
+       int i;
+
+       for (i = 0; i < bm_pool->buf_num; i++) {
+               /* Allocate buffer back from the buffer manager */
+               mvpp2_read(priv, MVPP2_BM_PHY_ALLOC_REG(bm_pool->id));
+       }
+
        bm_pool->buf_num = 0;
 }
 
@@ -2505,7 +2675,7 @@ static int mvpp2_bm_pools_init(struct udevice *dev,
                err = mvpp2_bm_pool_create(dev, priv, bm_pool, size);
                if (err)
                        goto err_unroll_pools;
-               mvpp2_bm_pool_bufsize_set(priv, bm_pool, 0);
+               mvpp2_bm_pool_bufsize_set(priv, bm_pool, RX_BUFFER_SIZE);
        }
        return 0;
 
@@ -2639,7 +2809,6 @@ static int mvpp2_bm_bufs_add(struct mvpp2_port *port,
 
        /* Update BM driver with number of buffers added to pool */
        bm_pool->buf_num += i;
-       bm_pool->in_use_thresh = bm_pool->buf_num / 4;
 
        return i;
 }
@@ -2692,9 +2861,6 @@ mvpp2_bm_pool_use(struct mvpp2_port *port, int pool, enum mvpp2_bm_type type,
                }
        }
 
-       mvpp2_bm_pool_bufsize_set(port->priv, new_pool,
-                                 MVPP2_RX_BUF_SIZE(new_pool->pkt_size));
-
        return new_pool;
 }
 
@@ -2733,6 +2899,7 @@ static void mvpp2_port_mii_set(struct mvpp2_port *port)
                val |= MVPP2_GMAC_INBAND_AN_MASK;
                break;
        case PHY_INTERFACE_MODE_RGMII:
+       case PHY_INTERFACE_MODE_RGMII_ID:
                val |= MVPP2_GMAC_PORT_RGMII_MASK;
        default:
                val &= ~MVPP2_GMAC_PCS_ENABLE_MASK;
@@ -2824,6 +2991,719 @@ static inline void mvpp2_gmac_max_rx_size_set(struct mvpp2_port *port)
        writel(val, port->base + MVPP2_GMAC_CTRL_0_REG);
 }
 
+/* PPv2.2 GoP/GMAC config */
+
+/* Set the MAC to reset or exit from reset */
+static int gop_gmac_reset(struct mvpp2_port *port, int reset)
+{
+       u32 val;
+
+       /* read - modify - write */
+       val = readl(port->base + MVPP2_GMAC_CTRL_2_REG);
+       if (reset)
+               val |= MVPP2_GMAC_PORT_RESET_MASK;
+       else
+               val &= ~MVPP2_GMAC_PORT_RESET_MASK;
+       writel(val, port->base + MVPP2_GMAC_CTRL_2_REG);
+
+       return 0;
+}
+
+/*
+ * gop_gpcs_mode_cfg
+ *
+ * Configure port to working with Gig PCS or don't.
+ */
+static int gop_gpcs_mode_cfg(struct mvpp2_port *port, int en)
+{
+       u32 val;
+
+       val = readl(port->base + MVPP2_GMAC_CTRL_2_REG);
+       if (en)
+               val |= MVPP2_GMAC_PCS_ENABLE_MASK;
+       else
+               val &= ~MVPP2_GMAC_PCS_ENABLE_MASK;
+       /* enable / disable PCS on this port */
+       writel(val, port->base + MVPP2_GMAC_CTRL_2_REG);
+
+       return 0;
+}
+
+static int gop_bypass_clk_cfg(struct mvpp2_port *port, int en)
+{
+       u32 val;
+
+       val = readl(port->base + MVPP2_GMAC_CTRL_2_REG);
+       if (en)
+               val |= MVPP2_GMAC_CLK_125_BYPS_EN_MASK;
+       else
+               val &= ~MVPP2_GMAC_CLK_125_BYPS_EN_MASK;
+       /* enable / disable PCS on this port */
+       writel(val, port->base + MVPP2_GMAC_CTRL_2_REG);
+
+       return 0;
+}
+
+static void gop_gmac_sgmii2_5_cfg(struct mvpp2_port *port)
+{
+       u32 val, thresh;
+
+       /*
+        * Configure minimal level of the Tx FIFO before the lower part
+        * starts to read a packet
+        */
+       thresh = MVPP2_SGMII2_5_TX_FIFO_MIN_TH;
+       val = readl(port->base + MVPP2_GMAC_PORT_FIFO_CFG_1_REG);
+       val &= ~MVPP2_GMAC_TX_FIFO_MIN_TH_ALL_MASK;
+       val |= MVPP2_GMAC_TX_FIFO_MIN_TH_MASK(thresh);
+       writel(val, port->base + MVPP2_GMAC_PORT_FIFO_CFG_1_REG);
+
+       /* Disable bypass of sync module */
+       val = readl(port->base + MVPP2_GMAC_CTRL_4_REG);
+       val |= MVPP2_GMAC_CTRL4_SYNC_BYPASS_MASK;
+       /* configure DP clock select according to mode */
+       val |= MVPP2_GMAC_CTRL4_DP_CLK_SEL_MASK;
+       /* configure QSGMII bypass according to mode */
+       val |= MVPP2_GMAC_CTRL4_QSGMII_BYPASS_ACTIVE_MASK;
+       writel(val, port->base + MVPP2_GMAC_CTRL_4_REG);
+
+       val = readl(port->base + MVPP2_GMAC_CTRL_0_REG);
+       /*
+        * Configure GIG MAC to 1000Base-X mode connected to a fiber
+        * transceiver
+        */
+       val |= MVPP2_GMAC_PORT_TYPE_MASK;
+       writel(val, port->base + MVPP2_GMAC_CTRL_0_REG);
+
+       /* configure AN 0x9268 */
+       val = MVPP2_GMAC_EN_PCS_AN |
+               MVPP2_GMAC_AN_BYPASS_EN |
+               MVPP2_GMAC_CONFIG_MII_SPEED  |
+               MVPP2_GMAC_CONFIG_GMII_SPEED     |
+               MVPP2_GMAC_FC_ADV_EN    |
+               MVPP2_GMAC_CONFIG_FULL_DUPLEX |
+               MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG;
+       writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG);
+}
+
+static void gop_gmac_sgmii_cfg(struct mvpp2_port *port)
+{
+       u32 val, thresh;
+
+       /*
+        * Configure minimal level of the Tx FIFO before the lower part
+        * starts to read a packet
+        */
+       thresh = MVPP2_SGMII_TX_FIFO_MIN_TH;
+       val = readl(port->base + MVPP2_GMAC_PORT_FIFO_CFG_1_REG);
+       val &= ~MVPP2_GMAC_TX_FIFO_MIN_TH_ALL_MASK;
+       val |= MVPP2_GMAC_TX_FIFO_MIN_TH_MASK(thresh);
+       writel(val, port->base + MVPP2_GMAC_PORT_FIFO_CFG_1_REG);
+
+       /* Disable bypass of sync module */
+       val = readl(port->base + MVPP2_GMAC_CTRL_4_REG);
+       val |= MVPP2_GMAC_CTRL4_SYNC_BYPASS_MASK;
+       /* configure DP clock select according to mode */
+       val &= ~MVPP2_GMAC_CTRL4_DP_CLK_SEL_MASK;
+       /* configure QSGMII bypass according to mode */
+       val |= MVPP2_GMAC_CTRL4_QSGMII_BYPASS_ACTIVE_MASK;
+       writel(val, port->base + MVPP2_GMAC_CTRL_4_REG);
+
+       val = readl(port->base + MVPP2_GMAC_CTRL_0_REG);
+       /* configure GIG MAC to SGMII mode */
+       val &= ~MVPP2_GMAC_PORT_TYPE_MASK;
+       writel(val, port->base + MVPP2_GMAC_CTRL_0_REG);
+
+       /* configure AN */
+       val = MVPP2_GMAC_EN_PCS_AN |
+               MVPP2_GMAC_AN_BYPASS_EN |
+               MVPP2_GMAC_AN_SPEED_EN  |
+               MVPP2_GMAC_EN_FC_AN     |
+               MVPP2_GMAC_AN_DUPLEX_EN |
+               MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG;
+       writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG);
+}
+
+static void gop_gmac_rgmii_cfg(struct mvpp2_port *port)
+{
+       u32 val, thresh;
+
+       /*
+        * Configure minimal level of the Tx FIFO before the lower part
+        * starts to read a packet
+        */
+       thresh = MVPP2_RGMII_TX_FIFO_MIN_TH;
+       val = readl(port->base + MVPP2_GMAC_PORT_FIFO_CFG_1_REG);
+       val &= ~MVPP2_GMAC_TX_FIFO_MIN_TH_ALL_MASK;
+       val |= MVPP2_GMAC_TX_FIFO_MIN_TH_MASK(thresh);
+       writel(val, port->base + MVPP2_GMAC_PORT_FIFO_CFG_1_REG);
+
+       /* Disable bypass of sync module */
+       val = readl(port->base + MVPP2_GMAC_CTRL_4_REG);
+       val |= MVPP2_GMAC_CTRL4_SYNC_BYPASS_MASK;
+       /* configure DP clock select according to mode */
+       val &= ~MVPP2_GMAC_CTRL4_DP_CLK_SEL_MASK;
+       val |= MVPP2_GMAC_CTRL4_QSGMII_BYPASS_ACTIVE_MASK;
+       val |= MVPP2_GMAC_CTRL4_EXT_PIN_GMII_SEL_MASK;
+       writel(val, port->base + MVPP2_GMAC_CTRL_4_REG);
+
+       val = readl(port->base + MVPP2_GMAC_CTRL_0_REG);
+       /* configure GIG MAC to SGMII mode */
+       val &= ~MVPP2_GMAC_PORT_TYPE_MASK;
+       writel(val, port->base + MVPP2_GMAC_CTRL_0_REG);
+
+       /* configure AN 0xb8e8 */
+       val = MVPP2_GMAC_AN_BYPASS_EN |
+               MVPP2_GMAC_AN_SPEED_EN   |
+               MVPP2_GMAC_EN_FC_AN      |
+               MVPP2_GMAC_AN_DUPLEX_EN  |
+               MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG;
+       writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG);
+}
+
+/* Set the internal mux's to the required MAC in the GOP */
+static int gop_gmac_mode_cfg(struct mvpp2_port *port)
+{
+       u32 val;
+
+       /* Set TX FIFO thresholds */
+       switch (port->phy_interface) {
+       case PHY_INTERFACE_MODE_SGMII:
+               if (port->phy_speed == 2500)
+                       gop_gmac_sgmii2_5_cfg(port);
+               else
+                       gop_gmac_sgmii_cfg(port);
+               break;
+
+       case PHY_INTERFACE_MODE_RGMII:
+       case PHY_INTERFACE_MODE_RGMII_ID:
+               gop_gmac_rgmii_cfg(port);
+               break;
+
+       default:
+               return -1;
+       }
+
+       /* Jumbo frame support - 0x1400*2= 0x2800 bytes */
+       val = readl(port->base + MVPP2_GMAC_CTRL_0_REG);
+       val &= ~MVPP2_GMAC_MAX_RX_SIZE_MASK;
+       val |= 0x1400 << MVPP2_GMAC_MAX_RX_SIZE_OFFS;
+       writel(val, port->base + MVPP2_GMAC_CTRL_0_REG);
+
+       /* PeriodicXonEn disable */
+       val = readl(port->base + MVPP2_GMAC_CTRL_1_REG);
+       val &= ~MVPP2_GMAC_PERIODIC_XON_EN_MASK;
+       writel(val, port->base + MVPP2_GMAC_CTRL_1_REG);
+
+       return 0;
+}
+
+static void gop_xlg_2_gig_mac_cfg(struct mvpp2_port *port)
+{
+       u32 val;
+
+       /* relevant only for MAC0 (XLG0 and GMAC0) */
+       if (port->gop_id > 0)
+               return;
+
+       /* configure 1Gig MAC mode */
+       val = readl(port->base + MVPP22_XLG_CTRL3_REG);
+       val &= ~MVPP22_XLG_CTRL3_MACMODESELECT_MASK;
+       val |= MVPP22_XLG_CTRL3_MACMODESELECT_GMAC;
+       writel(val, port->base + MVPP22_XLG_CTRL3_REG);
+}
+
+static int gop_gpcs_reset(struct mvpp2_port *port, int reset)
+{
+       u32 val;
+
+       val = readl(port->base + MVPP2_GMAC_CTRL_2_REG);
+       if (reset)
+               val &= ~MVPP2_GMAC_SGMII_MODE_MASK;
+       else
+               val |= MVPP2_GMAC_SGMII_MODE_MASK;
+       writel(val, port->base + MVPP2_GMAC_CTRL_2_REG);
+
+       return 0;
+}
+
+/* Set the internal mux's to the required PCS in the PI */
+static int gop_xpcs_mode(struct mvpp2_port *port, int num_of_lanes)
+{
+       u32 val;
+       int lane;
+
+       switch (num_of_lanes) {
+       case 1:
+               lane = 0;
+               break;
+       case 2:
+               lane = 1;
+               break;
+       case 4:
+               lane = 2;
+               break;
+       default:
+               return -1;
+       }
+
+       /* configure XG MAC mode */
+       val = readl(port->priv->xpcs_base + MVPP22_XPCS_GLOBAL_CFG_0_REG);
+       val &= ~MVPP22_XPCS_PCSMODE_MASK;
+       val &= ~MVPP22_XPCS_LANEACTIVE_MASK;
+       val |= (2 * lane) << MVPP22_XPCS_LANEACTIVE_OFFS;
+       writel(val, port->priv->xpcs_base + MVPP22_XPCS_GLOBAL_CFG_0_REG);
+
+       return 0;
+}
+
+static int gop_mpcs_mode(struct mvpp2_port *port)
+{
+       u32 val;
+
+       /* configure PCS40G COMMON CONTROL */
+       val = readl(port->priv->mpcs_base + PCS40G_COMMON_CONTROL);
+       val &= ~FORWARD_ERROR_CORRECTION_MASK;
+       writel(val, port->priv->mpcs_base + PCS40G_COMMON_CONTROL);
+
+       /* configure PCS CLOCK RESET */
+       val = readl(port->priv->mpcs_base + PCS_CLOCK_RESET);
+       val &= ~CLK_DIVISION_RATIO_MASK;
+       val |= 1 << CLK_DIVISION_RATIO_OFFS;
+       writel(val, port->priv->mpcs_base + PCS_CLOCK_RESET);
+
+       val &= ~CLK_DIV_PHASE_SET_MASK;
+       val |= MAC_CLK_RESET_MASK;
+       val |= RX_SD_CLK_RESET_MASK;
+       val |= TX_SD_CLK_RESET_MASK;
+       writel(val, port->priv->mpcs_base + PCS_CLOCK_RESET);
+
+       return 0;
+}
+
+/* Set the internal mux's to the required MAC in the GOP */
+static int gop_xlg_mac_mode_cfg(struct mvpp2_port *port, int num_of_act_lanes)
+{
+       u32 val;
+
+       /* configure 10G MAC mode */
+       val = readl(port->base + MVPP22_XLG_CTRL0_REG);
+       val |= MVPP22_XLG_RX_FC_EN;
+       writel(val, port->base + MVPP22_XLG_CTRL0_REG);
+
+       val = readl(port->base + MVPP22_XLG_CTRL3_REG);
+       val &= ~MVPP22_XLG_CTRL3_MACMODESELECT_MASK;
+       val |= MVPP22_XLG_CTRL3_MACMODESELECT_10GMAC;
+       writel(val, port->base + MVPP22_XLG_CTRL3_REG);
+
+       /* read - modify - write */
+       val = readl(port->base + MVPP22_XLG_CTRL4_REG);
+       val &= ~MVPP22_XLG_MODE_DMA_1G;
+       val |= MVPP22_XLG_FORWARD_PFC_EN;
+       val |= MVPP22_XLG_FORWARD_802_3X_FC_EN;
+       val &= ~MVPP22_XLG_EN_IDLE_CHECK_FOR_LINK;
+       writel(val, port->base + MVPP22_XLG_CTRL4_REG);
+
+       /* Jumbo frame support: 0x1400 * 2 = 0x2800 bytes */
+       val = readl(port->base + MVPP22_XLG_CTRL1_REG);
+       val &= ~MVPP22_XLG_MAX_RX_SIZE_MASK;
+       val |= 0x1400 << MVPP22_XLG_MAX_RX_SIZE_OFFS;
+       writel(val, port->base + MVPP22_XLG_CTRL1_REG);
+
+       /* unmask link change interrupt */
+       val = readl(port->base + MVPP22_XLG_INTERRUPT_MASK_REG);
+       val |= MVPP22_XLG_INTERRUPT_LINK_CHANGE;
+       val |= 1; /* unmask summary bit */
+       writel(val, port->base + MVPP22_XLG_INTERRUPT_MASK_REG);
+
+       return 0;
+}
+
+/* Set PCS to reset or exit from reset */
+static int gop_xpcs_reset(struct mvpp2_port *port, int reset)
+{
+       u32 val;
+
+       /* read - modify - write */
+       val = readl(port->priv->xpcs_base + MVPP22_XPCS_GLOBAL_CFG_0_REG);
+       if (reset)
+               val &= ~MVPP22_XPCS_PCSRESET;
+       else
+               val |= MVPP22_XPCS_PCSRESET;
+       writel(val, port->priv->xpcs_base + MVPP22_XPCS_GLOBAL_CFG_0_REG);
+
+       return 0;
+}
+
+/* Set the MAC to reset or exit from reset */
+static int gop_xlg_mac_reset(struct mvpp2_port *port, int reset)
+{
+       u32 val;
+
+       /* read - modify - write */
+       val = readl(port->base + MVPP22_XLG_CTRL0_REG);
+       if (reset)
+               val &= ~MVPP22_XLG_MAC_RESETN;
+       else
+               val |= MVPP22_XLG_MAC_RESETN;
+       writel(val, port->base + MVPP22_XLG_CTRL0_REG);
+
+       return 0;
+}
+
+/*
+ * gop_port_init
+ *
+ * Init physical port. Configures the port mode and all it's elements
+ * accordingly.
+ * Does not verify that the selected mode/port number is valid at the
+ * core level.
+ */
+static int gop_port_init(struct mvpp2_port *port)
+{
+       int mac_num = port->gop_id;
+       int num_of_act_lanes;
+
+       if (mac_num >= MVPP22_GOP_MAC_NUM) {
+               netdev_err(NULL, "%s: illegal port number %d", __func__,
+                          mac_num);
+               return -1;
+       }
+
+       switch (port->phy_interface) {
+       case PHY_INTERFACE_MODE_RGMII:
+       case PHY_INTERFACE_MODE_RGMII_ID:
+               gop_gmac_reset(port, 1);
+
+               /* configure PCS */
+               gop_gpcs_mode_cfg(port, 0);
+               gop_bypass_clk_cfg(port, 1);
+
+               /* configure MAC */
+               gop_gmac_mode_cfg(port);
+               /* pcs unreset */
+               gop_gpcs_reset(port, 0);
+
+               /* mac unreset */
+               gop_gmac_reset(port, 0);
+               break;
+
+       case PHY_INTERFACE_MODE_SGMII:
+               /* configure PCS */
+               gop_gpcs_mode_cfg(port, 1);
+
+               /* configure MAC */
+               gop_gmac_mode_cfg(port);
+               /* select proper Mac mode */
+               gop_xlg_2_gig_mac_cfg(port);
+
+               /* pcs unreset */
+               gop_gpcs_reset(port, 0);
+               /* mac unreset */
+               gop_gmac_reset(port, 0);
+               break;
+
+       case PHY_INTERFACE_MODE_SFI:
+               num_of_act_lanes = 2;
+               mac_num = 0;
+               /* configure PCS */
+               gop_xpcs_mode(port, num_of_act_lanes);
+               gop_mpcs_mode(port);
+               /* configure MAC */
+               gop_xlg_mac_mode_cfg(port, num_of_act_lanes);
+
+               /* pcs unreset */
+               gop_xpcs_reset(port, 0);
+
+               /* mac unreset */
+               gop_xlg_mac_reset(port, 0);
+               break;
+
+       default:
+               netdev_err(NULL, "%s: Requested port mode (%d) not supported\n",
+                          __func__, port->phy_interface);
+               return -1;
+       }
+
+       return 0;
+}
+
+static void gop_xlg_mac_port_enable(struct mvpp2_port *port, int enable)
+{
+       u32 val;
+
+       val = readl(port->base + MVPP22_XLG_CTRL0_REG);
+       if (enable) {
+               /* Enable port and MIB counters update */
+               val |= MVPP22_XLG_PORT_EN;
+               val &= ~MVPP22_XLG_MIBCNT_DIS;
+       } else {
+               /* Disable port */
+               val &= ~MVPP22_XLG_PORT_EN;
+       }
+       writel(val, port->base + MVPP22_XLG_CTRL0_REG);
+}
+
+static void gop_port_enable(struct mvpp2_port *port, int enable)
+{
+       switch (port->phy_interface) {
+       case PHY_INTERFACE_MODE_RGMII:
+       case PHY_INTERFACE_MODE_RGMII_ID:
+       case PHY_INTERFACE_MODE_SGMII:
+               if (enable)
+                       mvpp2_port_enable(port);
+               else
+                       mvpp2_port_disable(port);
+               break;
+
+       case PHY_INTERFACE_MODE_SFI:
+               gop_xlg_mac_port_enable(port, enable);
+
+               break;
+       default:
+               netdev_err(NULL, "%s: Wrong port mode (%d)\n", __func__,
+                          port->phy_interface);
+               return;
+       }
+}
+
+/* RFU1 functions */
+static inline u32 gop_rfu1_read(struct mvpp2 *priv, u32 offset)
+{
+       return readl(priv->rfu1_base + offset);
+}
+
+static inline void gop_rfu1_write(struct mvpp2 *priv, u32 offset, u32 data)
+{
+       writel(data, priv->rfu1_base + offset);
+}
+
+static u32 mvpp2_netc_cfg_create(int gop_id, phy_interface_t phy_type)
+{
+       u32 val = 0;
+
+       if (gop_id == 2) {
+               if (phy_type == PHY_INTERFACE_MODE_SGMII)
+                       val |= MV_NETC_GE_MAC2_SGMII;
+       }
+
+       if (gop_id == 3) {
+               if (phy_type == PHY_INTERFACE_MODE_SGMII)
+                       val |= MV_NETC_GE_MAC3_SGMII;
+               else if (phy_type == PHY_INTERFACE_MODE_RGMII ||
+                        phy_type == PHY_INTERFACE_MODE_RGMII_ID)
+                       val |= MV_NETC_GE_MAC3_RGMII;
+       }
+
+       return val;
+}
+
+static void gop_netc_active_port(struct mvpp2 *priv, int gop_id, u32 val)
+{
+       u32 reg;
+
+       reg = gop_rfu1_read(priv, NETCOMP_PORTS_CONTROL_1_REG);
+       reg &= ~(NETC_PORTS_ACTIVE_MASK(gop_id));
+
+       val <<= NETC_PORTS_ACTIVE_OFFSET(gop_id);
+       val &= NETC_PORTS_ACTIVE_MASK(gop_id);
+
+       reg |= val;
+
+       gop_rfu1_write(priv, NETCOMP_PORTS_CONTROL_1_REG, reg);
+}
+
+static void gop_netc_mii_mode(struct mvpp2 *priv, int gop_id, u32 val)
+{
+       u32 reg;
+
+       reg = gop_rfu1_read(priv, NETCOMP_CONTROL_0_REG);
+       reg &= ~NETC_GBE_PORT1_MII_MODE_MASK;
+
+       val <<= NETC_GBE_PORT1_MII_MODE_OFFS;
+       val &= NETC_GBE_PORT1_MII_MODE_MASK;
+
+       reg |= val;
+
+       gop_rfu1_write(priv, NETCOMP_CONTROL_0_REG, reg);
+}
+
+static void gop_netc_gop_reset(struct mvpp2 *priv, u32 val)
+{
+       u32 reg;
+
+       reg = gop_rfu1_read(priv, GOP_SOFT_RESET_1_REG);
+       reg &= ~NETC_GOP_SOFT_RESET_MASK;
+
+       val <<= NETC_GOP_SOFT_RESET_OFFS;
+       val &= NETC_GOP_SOFT_RESET_MASK;
+
+       reg |= val;
+
+       gop_rfu1_write(priv, GOP_SOFT_RESET_1_REG, reg);
+}
+
+static void gop_netc_gop_clock_logic_set(struct mvpp2 *priv, u32 val)
+{
+       u32 reg;
+
+       reg = gop_rfu1_read(priv, NETCOMP_PORTS_CONTROL_0_REG);
+       reg &= ~NETC_CLK_DIV_PHASE_MASK;
+
+       val <<= NETC_CLK_DIV_PHASE_OFFS;
+       val &= NETC_CLK_DIV_PHASE_MASK;
+
+       reg |= val;
+
+       gop_rfu1_write(priv, NETCOMP_PORTS_CONTROL_0_REG, reg);
+}
+
+static void gop_netc_port_rf_reset(struct mvpp2 *priv, int gop_id, u32 val)
+{
+       u32 reg;
+
+       reg = gop_rfu1_read(priv, NETCOMP_PORTS_CONTROL_1_REG);
+       reg &= ~(NETC_PORT_GIG_RF_RESET_MASK(gop_id));
+
+       val <<= NETC_PORT_GIG_RF_RESET_OFFS(gop_id);
+       val &= NETC_PORT_GIG_RF_RESET_MASK(gop_id);
+
+       reg |= val;
+
+       gop_rfu1_write(priv, NETCOMP_PORTS_CONTROL_1_REG, reg);
+}
+
+static void gop_netc_gbe_sgmii_mode_select(struct mvpp2 *priv, int gop_id,
+                                          u32 val)
+{
+       u32 reg, mask, offset;
+
+       if (gop_id == 2) {
+               mask = NETC_GBE_PORT0_SGMII_MODE_MASK;
+               offset = NETC_GBE_PORT0_SGMII_MODE_OFFS;
+       } else {
+               mask = NETC_GBE_PORT1_SGMII_MODE_MASK;
+               offset = NETC_GBE_PORT1_SGMII_MODE_OFFS;
+       }
+       reg = gop_rfu1_read(priv, NETCOMP_CONTROL_0_REG);
+       reg &= ~mask;
+
+       val <<= offset;
+       val &= mask;
+
+       reg |= val;
+
+       gop_rfu1_write(priv, NETCOMP_CONTROL_0_REG, reg);
+}
+
+static void gop_netc_bus_width_select(struct mvpp2 *priv, u32 val)
+{
+       u32 reg;
+
+       reg = gop_rfu1_read(priv, NETCOMP_PORTS_CONTROL_0_REG);
+       reg &= ~NETC_BUS_WIDTH_SELECT_MASK;
+
+       val <<= NETC_BUS_WIDTH_SELECT_OFFS;
+       val &= NETC_BUS_WIDTH_SELECT_MASK;
+
+       reg |= val;
+
+       gop_rfu1_write(priv, NETCOMP_PORTS_CONTROL_0_REG, reg);
+}
+
+static void gop_netc_sample_stages_timing(struct mvpp2 *priv, u32 val)
+{
+       u32 reg;
+
+       reg = gop_rfu1_read(priv, NETCOMP_PORTS_CONTROL_0_REG);
+       reg &= ~NETC_GIG_RX_DATA_SAMPLE_MASK;
+
+       val <<= NETC_GIG_RX_DATA_SAMPLE_OFFS;
+       val &= NETC_GIG_RX_DATA_SAMPLE_MASK;
+
+       reg |= val;
+
+       gop_rfu1_write(priv, NETCOMP_PORTS_CONTROL_0_REG, reg);
+}
+
+static void gop_netc_mac_to_xgmii(struct mvpp2 *priv, int gop_id,
+                                 enum mv_netc_phase phase)
+{
+       switch (phase) {
+       case MV_NETC_FIRST_PHASE:
+               /* Set Bus Width to HB mode = 1 */
+               gop_netc_bus_width_select(priv, 1);
+               /* Select RGMII mode */
+               gop_netc_gbe_sgmii_mode_select(priv, gop_id, MV_NETC_GBE_XMII);
+               break;
+
+       case MV_NETC_SECOND_PHASE:
+               /* De-assert the relevant port HB reset */
+               gop_netc_port_rf_reset(priv, gop_id, 1);
+               break;
+       }
+}
+
+static void gop_netc_mac_to_sgmii(struct mvpp2 *priv, int gop_id,
+                                 enum mv_netc_phase phase)
+{
+       switch (phase) {
+       case MV_NETC_FIRST_PHASE:
+               /* Set Bus Width to HB mode = 1 */
+               gop_netc_bus_width_select(priv, 1);
+               /* Select SGMII mode */
+               if (gop_id >= 1) {
+                       gop_netc_gbe_sgmii_mode_select(priv, gop_id,
+                                                      MV_NETC_GBE_SGMII);
+               }
+
+               /* Configure the sample stages */
+               gop_netc_sample_stages_timing(priv, 0);
+               /* Configure the ComPhy Selector */
+               /* gop_netc_com_phy_selector_config(netComplex); */
+               break;
+
+       case MV_NETC_SECOND_PHASE:
+               /* De-assert the relevant port HB reset */
+               gop_netc_port_rf_reset(priv, gop_id, 1);
+               break;
+       }
+}
+
+static int gop_netc_init(struct mvpp2 *priv, enum mv_netc_phase phase)
+{
+       u32 c = priv->netc_config;
+
+       if (c & MV_NETC_GE_MAC2_SGMII)
+               gop_netc_mac_to_sgmii(priv, 2, phase);
+       else
+               gop_netc_mac_to_xgmii(priv, 2, phase);
+
+       if (c & MV_NETC_GE_MAC3_SGMII) {
+               gop_netc_mac_to_sgmii(priv, 3, phase);
+       } else {
+               gop_netc_mac_to_xgmii(priv, 3, phase);
+               if (c & MV_NETC_GE_MAC3_RGMII)
+                       gop_netc_mii_mode(priv, 3, MV_NETC_GBE_RGMII);
+               else
+                       gop_netc_mii_mode(priv, 3, MV_NETC_GBE_MII);
+       }
+
+       /* Activate gop ports 0, 2, 3 */
+       gop_netc_active_port(priv, 0, 1);
+       gop_netc_active_port(priv, 2, 1);
+       gop_netc_active_port(priv, 3, 1);
+
+       if (phase == MV_NETC_SECOND_PHASE) {
+               /* Enable the GOP internal clock logic */
+               gop_netc_gop_clock_logic_set(priv, 1);
+               /* De-assert GOP unit reset */
+               gop_netc_gop_reset(priv, 1);
+       }
+
+       return 0;
+}
+
 /* Set defaults to the MVPP2 port */
 static void mvpp2_defaults_set(struct mvpp2_port *port)
 {
@@ -3597,10 +4477,21 @@ static int mvpp2_rx_refill(struct mvpp2_port *port,
 /* Set hw internals when starting port */
 static void mvpp2_start_dev(struct mvpp2_port *port)
 {
-       mvpp2_gmac_max_rx_size_set(port);
+       switch (port->phy_interface) {
+       case PHY_INTERFACE_MODE_RGMII:
+       case PHY_INTERFACE_MODE_RGMII_ID:
+       case PHY_INTERFACE_MODE_SGMII:
+               mvpp2_gmac_max_rx_size_set(port);
+       default:
+               break;
+       }
+
        mvpp2_txp_max_tx_size_set(port);
 
-       mvpp2_port_enable(port);
+       if (port->priv->hw_version == MVPP21)
+               mvpp2_port_enable(port);
+       else
+               gop_port_enable(port, 1);
 }
 
 /* Set hw internals when stopping port */
@@ -3610,7 +4501,11 @@ static void mvpp2_stop_dev(struct mvpp2_port *port)
        mvpp2_ingress_disable(port);
 
        mvpp2_egress_disable(port);
-       mvpp2_port_disable(port);
+
+       if (port->priv->hw_version == MVPP21)
+               mvpp2_port_disable(port);
+       else
+               gop_port_enable(port, 0);
 }
 
 static int mvpp2_phy_connect(struct udevice *dev, struct mvpp2_port *port)
@@ -3685,11 +4580,16 @@ static int mvpp2_open(struct udevice *dev, struct mvpp2_port *port)
                return err;
        }
 
-       err = mvpp2_phy_connect(dev, port);
-       if (err < 0)
-               return err;
+       if (port->phy_node) {
+               err = mvpp2_phy_connect(dev, port);
+               if (err < 0)
+                       return err;
 
-       mvpp2_link_event(port);
+               mvpp2_link_event(port);
+       } else {
+               mvpp2_egress_enable(port);
+               mvpp2_ingress_enable(port);
+       }
 
        mvpp2_start_dev(port);
 
@@ -3704,7 +4604,9 @@ static void mvpp2_port_power_up(struct mvpp2_port *port)
 {
        struct mvpp2 *priv = port->priv;
 
-       mvpp2_port_mii_set(port);
+       /* On PPv2.2 the GoP / interface configuration has already been done */
+       if (priv->hw_version == MVPP21)
+               mvpp2_port_mii_set(port);
        mvpp2_port_periodic_xon_disable(port);
        if (priv->hw_version == MVPP21)
                mvpp2_port_fc_adv_enable(port);
@@ -3724,7 +4626,10 @@ static int mvpp2_port_init(struct udevice *dev, struct mvpp2_port *port)
 
        /* Disable port */
        mvpp2_egress_disable(port);
-       mvpp2_port_disable(port);
+       if (priv->hw_version == MVPP21)
+               mvpp2_port_disable(port);
+       else
+               gop_port_enable(port, 0);
 
        port->txqs = devm_kcalloc(dev, txq_number, sizeof(*port->txqs),
                                  GFP_KERNEL);
@@ -3779,20 +4684,6 @@ static int mvpp2_port_init(struct udevice *dev, struct mvpp2_port *port)
                port->rxqs[queue] = rxq;
        }
 
-       /* Configure Rx queue group interrupt for this port */
-       if (priv->hw_version == MVPP21) {
-               mvpp2_write(priv, MVPP21_ISR_RXQ_GROUP_REG(port->id),
-                           CONFIG_MV_ETH_RXQ);
-       } else {
-               u32 val;
-
-               val = (port->id << MVPP22_ISR_RXQ_GROUP_INDEX_GROUP_OFFSET);
-               mvpp2_write(priv, MVPP22_ISR_RXQ_GROUP_INDEX_REG, val);
-
-               val = (CONFIG_MV_ETH_RXQ <<
-                      MVPP22_ISR_RXQ_SUB_GROUP_SIZE_OFFSET);
-               mvpp2_write(priv, MVPP22_ISR_RXQ_SUB_GROUP_CONFIG_REG, val);
-       }
 
        /* Create Rx descriptor rings */
        for (queue = 0; queue < rxq_number; queue++) {
@@ -3827,15 +4718,44 @@ static int phy_info_parse(struct udevice *dev, struct mvpp2_port *port)
 {
        int port_node = dev_of_offset(dev);
        const char *phy_mode_str;
-       int phy_node;
+       int phy_node, mdio_off, cp_node;
        u32 id;
-       u32 phyaddr;
+       u32 phyaddr = 0;
        int phy_mode = -1;
+       phys_addr_t mdio_addr;
 
        phy_node = fdtdec_lookup_phandle(gd->fdt_blob, port_node, "phy");
-       if (phy_node < 0) {
-               dev_err(&pdev->dev, "missing phy\n");
-               return -ENODEV;
+
+       if (phy_node > 0) {
+               phyaddr = fdtdec_get_int(gd->fdt_blob, phy_node, "reg", 0);
+               if (phyaddr < 0) {
+                       dev_err(&pdev->dev, "could not find phy address\n");
+                       return -1;
+               }
+               mdio_off = fdt_parent_offset(gd->fdt_blob, phy_node);
+
+               /* TODO: This WA for mdio issue. U-boot 2017 don't have
+                * mdio driver and on MACHIATOBin board ports from CP1
+                * connected to mdio on CP0.
+                * WA is to get mdio address from phy handler parent
+                * base address. WA should be removed after
+                * mdio driver implementation.
+                */
+               mdio_addr = fdtdec_get_uint(gd->fdt_blob,
+                                           mdio_off, "reg", 0);
+
+               cp_node = fdt_parent_offset(gd->fdt_blob, mdio_off);
+               mdio_addr |= fdt_get_base_address((void *)gd->fdt_blob,
+                                                 cp_node);
+
+               port->priv->mdio_base = (void *)mdio_addr;
+
+               if (port->priv->mdio_base < 0) {
+                       dev_err(&pdev->dev, "could not find mdio base address\n");
+                       return -1;
+               }
+       } else {
+               phy_node = 0;
        }
 
        phy_mode_str = fdt_getprop(gd->fdt_blob, port_node, "phy-mode", NULL);
@@ -3852,7 +4772,21 @@ static int phy_info_parse(struct udevice *dev, struct mvpp2_port *port)
                return -EINVAL;
        }
 
-       phyaddr = fdtdec_get_int(gd->fdt_blob, phy_node, "reg", 0);
+#ifdef CONFIG_DM_GPIO
+       gpio_request_by_name(dev, "phy-reset-gpios", 0,
+                            &port->phy_reset_gpio, GPIOD_IS_OUT);
+       gpio_request_by_name(dev, "marvell,sfp-tx-disable-gpio", 0,
+                            &port->phy_tx_disable_gpio, GPIOD_IS_OUT);
+#endif
+
+       /*
+        * ToDo:
+        * Not sure if this DT property "phy-speed" will get accepted, so
+        * this might change later
+        */
+       /* Get phy-speed for SGMII 2.5Gbps vs 1Gbps setup */
+       port->phy_speed = fdtdec_get_int(gd->fdt_blob, port_node,
+                                        "phy-speed", 1000);
 
        port->id = id;
        if (port->priv->hw_version == MVPP21)
@@ -3866,6 +4800,21 @@ static int phy_info_parse(struct udevice *dev, struct mvpp2_port *port)
        return 0;
 }
 
+#ifdef CONFIG_DM_GPIO
+/* Port GPIO initialization */
+static void mvpp2_gpio_init(struct mvpp2_port *port)
+{
+       if (dm_gpio_is_valid(&port->phy_reset_gpio)) {
+               dm_gpio_set_value(&port->phy_reset_gpio, 0);
+               udelay(1000);
+               dm_gpio_set_value(&port->phy_reset_gpio, 1);
+       }
+
+       if (dm_gpio_is_valid(&port->phy_tx_disable_gpio))
+               dm_gpio_set_value(&port->phy_tx_disable_gpio, 0);
+}
+#endif
+
 /* Ports initialization */
 static int mvpp2_port_probe(struct udevice *dev,
                            struct mvpp2_port *port,
@@ -3884,7 +4833,12 @@ static int mvpp2_port_probe(struct udevice *dev,
        }
        mvpp2_port_power_up(port);
 
+#ifdef CONFIG_DM_GPIO
+       mvpp2_gpio_init(port);
+#endif
+
        priv->port_list[port->id] = port;
+       priv->num_ports++;
        return 0;
 }
 
@@ -4049,22 +5003,24 @@ static int mvpp2_init(struct udevice *dev, struct mvpp2 *priv)
                return -EINVAL;
        }
 
-       /* MBUS windows configuration */
-       dram_target_info = mvebu_mbus_dram_info();
-       if (dram_target_info)
-               mvpp2_conf_mbus_windows(dram_target_info, priv);
-
        if (priv->hw_version == MVPP22)
                mvpp2_axi_init(priv);
+       else {
+               /* MBUS windows configuration */
+               dram_target_info = mvebu_mbus_dram_info();
+               if (dram_target_info)
+                       mvpp2_conf_mbus_windows(dram_target_info, priv);
+       }
 
-       /* Disable HW PHY polling */
        if (priv->hw_version == MVPP21) {
+               /* Disable HW PHY polling */
                val = readl(priv->lms_base + MVPP2_PHY_AN_CFG0_REG);
                val |= MVPP2_PHY_AN_STOP_SMI0_MASK;
                writel(val, priv->lms_base + MVPP2_PHY_AN_CFG0_REG);
        } else {
+               /* Enable HW PHY polling */
                val = readl(priv->iface_base + MVPP22_SMI_MISC_CFG_REG);
-               val &= ~MVPP22_SMI_POLLING_EN;
+               val |= MVPP22_SMI_POLLING_EN;
                writel(val, priv->iface_base + MVPP22_SMI_MISC_CFG_REG);
        }
 
@@ -4091,25 +5047,6 @@ static int mvpp2_init(struct udevice *dev, struct mvpp2 *priv)
        if (priv->hw_version == MVPP22)
                mvpp2_tx_fifo_init(priv);
 
-       /* Reset Rx queue group interrupt configuration */
-       for (i = 0; i < MVPP2_MAX_PORTS; i++) {
-               if (priv->hw_version == MVPP21) {
-                       mvpp2_write(priv, MVPP21_ISR_RXQ_GROUP_REG(i),
-                                   CONFIG_MV_ETH_RXQ);
-                       continue;
-               } else {
-                       u32 val;
-
-                       val = (i << MVPP22_ISR_RXQ_GROUP_INDEX_GROUP_OFFSET);
-                       mvpp2_write(priv, MVPP22_ISR_RXQ_GROUP_INDEX_REG, val);
-
-                       val = (CONFIG_MV_ETH_RXQ <<
-                              MVPP22_ISR_RXQ_SUB_GROUP_SIZE_OFFSET);
-                       mvpp2_write(priv,
-                                   MVPP22_ISR_RXQ_SUB_GROUP_CONFIG_REG, val);
-               }
-       }
-
        if (priv->hw_version == MVPP21)
                writel(MVPP2_EXT_GLOBAL_CTRL_DEFAULT,
                       priv->lms_base + MVPP2_MNG_EXTENDED_GLOBAL_CTRL_REG);
@@ -4255,21 +5192,10 @@ static int mvpp2_recv(struct udevice *dev, int flags, uchar **packetp)
        int pool, rx_bytes, err;
        int rx_received;
        struct mvpp2_rx_queue *rxq;
-       u32 cause_rx_tx, cause_rx, cause_misc;
        u8 *data;
 
-       cause_rx_tx = mvpp2_read(port->priv,
-                                MVPP2_ISR_RX_TX_CAUSE_REG(port->id));
-       cause_rx_tx &= ~MVPP2_CAUSE_TXQ_OCCUP_DESC_ALL_MASK;
-       cause_misc = cause_rx_tx & MVPP2_CAUSE_MISC_SUM_MASK;
-       if (!cause_rx_tx && !cause_misc)
-               return 0;
-
-       cause_rx = cause_rx_tx & MVPP2_CAUSE_RXQ_OCCUP_DESC_ALL_MASK;
-
        /* Process RX packets */
-       cause_rx |= port->pending_cause_rx;
-       rxq = mvpp2_get_rx_queue(port, cause_rx);
+       rxq = port->rxqs[0];
 
        /* Get number of received packets and clamp the to-do */
        rx_received = mvpp2_rxq_received(port, rxq->id);
@@ -4325,21 +5251,6 @@ static int mvpp2_recv(struct udevice *dev, int flags, uchar **packetp)
        return rx_bytes;
 }
 
-/* Drain Txq */
-static void mvpp2_txq_drain(struct mvpp2_port *port, struct mvpp2_tx_queue *txq,
-                           int enable)
-{
-       u32 val;
-
-       mvpp2_write(port->priv, MVPP2_TXQ_NUM_REG, txq->id);
-       val = mvpp2_read(port->priv, MVPP2_TXQ_PREF_BUF_REG);
-       if (enable)
-               val |= MVPP2_TXQ_DRAIN_EN_MASK;
-       else
-               val &= ~MVPP2_TXQ_DRAIN_EN_MASK;
-       mvpp2_write(port->priv, MVPP2_TXQ_PREF_BUF_REG, val);
-}
-
 static int mvpp2_send(struct udevice *dev, void *packet, int length)
 {
        struct mvpp2_port *port = dev_get_priv(dev);
@@ -4383,9 +5294,6 @@ static int mvpp2_send(struct udevice *dev, void *packet, int length)
                tx_done = mvpp2_txq_pend_desc_num_get(port, txq);
        } while (tx_done);
 
-       /* Enable TXQ drain */
-       mvpp2_txq_drain(port, txq, 1);
-
        timeout = 0;
        do {
                if (timeout++ > 10000) {
@@ -4395,9 +5303,6 @@ static int mvpp2_send(struct udevice *dev, void *packet, int length)
                tx_done = mvpp2_txq_sent_desc_proc(port, txq);
        } while (!tx_done);
 
-       /* Disable TXQ drain */
-       mvpp2_txq_drain(port, txq, 0);
-
        return 0;
 }
 
@@ -4412,7 +5317,14 @@ static int mvpp2_start(struct udevice *dev)
        /* Reconfigure parser accept the original MAC address */
        mvpp2_prs_update_mac_da(port, port->dev_addr);
 
-       mvpp2_port_power_up(port);
+       switch (port->phy_interface) {
+       case PHY_INTERFACE_MODE_RGMII:
+       case PHY_INTERFACE_MODE_RGMII_ID:
+       case PHY_INTERFACE_MODE_SGMII:
+               mvpp2_port_power_up(port);
+       default:
+               break;
+       }
 
        mvpp2_open(dev, port);
 
@@ -4428,6 +5340,14 @@ static void mvpp2_stop(struct udevice *dev)
        mvpp2_cleanup_txqs(port);
 }
 
+static int mvpp22_smi_phy_addr_cfg(struct mvpp2_port *port)
+{
+       writel(port->phyaddr, port->priv->iface_base +
+              MVPP22_SMI_PHY_ADDR_REG(port->gop_id));
+
+       return 0;
+}
+
 static int mvpp2_base_probe(struct udevice *dev)
 {
        struct mvpp2 *priv = dev_get_priv(dev);
@@ -4482,22 +5402,27 @@ static int mvpp2_base_probe(struct udevice *dev)
        memset(bd_space, 0, size);
 
        /* Save base addresses for later use */
-       priv->base = (void *)dev_get_addr_index(dev, 0);
+       priv->base = (void *)devfdt_get_addr_index(dev, 0);
        if (IS_ERR(priv->base))
                return PTR_ERR(priv->base);
 
        if (priv->hw_version == MVPP21) {
-               priv->lms_base = (void *)dev_get_addr_index(dev, 1);
+               priv->lms_base = (void *)devfdt_get_addr_index(dev, 1);
                if (IS_ERR(priv->lms_base))
                        return PTR_ERR(priv->lms_base);
 
                priv->mdio_base = priv->lms_base + MVPP21_SMI;
        } else {
-               priv->iface_base = (void *)dev_get_addr_index(dev, 1);
+               priv->iface_base = (void *)devfdt_get_addr_index(dev, 1);
                if (IS_ERR(priv->iface_base))
                        return PTR_ERR(priv->iface_base);
 
                priv->mdio_base = priv->iface_base + MVPP22_SMI;
+
+               /* Store common base addresses for all ports */
+               priv->mpcs_base = priv->iface_base + MVPP22_MPCS;
+               priv->xpcs_base = priv->iface_base + MVPP22_XPCS;
+               priv->rfu1_base = priv->iface_base + MVPP22_RFU1;
        }
 
        if (priv->hw_version == MVPP21)
@@ -4528,10 +5453,8 @@ static int mvpp2_probe(struct udevice *dev)
        int err;
 
        /* Only call the probe function for the parent once */
-       if (!priv->probe_done) {
+       if (!priv->probe_done)
                err = mvpp2_base_probe(dev->parent);
-               priv->probe_done = 1;
-       }
 
        port->priv = dev_get_priv(dev->parent);
 
@@ -4546,7 +5469,7 @@ static int mvpp2_probe(struct udevice *dev)
        if (priv->hw_version == MVPP21) {
                int priv_common_regs_num = 2;
 
-               port->base = (void __iomem *)dev_get_addr_index(
+               port->base = (void __iomem *)devfdt_get_addr_index(
                        dev->parent, priv_common_regs_num + port->id);
                if (IS_ERR(port->base))
                        return PTR_ERR(port->base);
@@ -4560,16 +5483,60 @@ static int mvpp2_probe(struct udevice *dev)
 
                port->base = priv->iface_base + MVPP22_PORT_BASE +
                        port->gop_id * MVPP22_PORT_OFFSET;
+
+               /* Set phy address of the port */
+               if(port->phy_node)
+                       mvpp22_smi_phy_addr_cfg(port);
+
+               /* GoP Init */
+               gop_port_init(port);
        }
 
-       /* Initialize network controller */
-       err = mvpp2_init(dev, priv);
-       if (err < 0) {
-               dev_err(&pdev->dev, "failed to initialize controller\n");
+       if (!priv->probe_done) {
+               /* Initialize network controller */
+               err = mvpp2_init(dev, priv);
+               if (err < 0) {
+                       dev_err(&pdev->dev, "failed to initialize controller\n");
+                       return err;
+               }
+               priv->num_ports = 0;
+               priv->probe_done = 1;
+       }
+
+       err = mvpp2_port_probe(dev, port, dev_of_offset(dev), priv);
+       if (err)
                return err;
+
+       if (priv->hw_version == MVPP22) {
+               priv->netc_config |= mvpp2_netc_cfg_create(port->gop_id,
+                                                          port->phy_interface);
+
+               /* Netcomplex configurations for all ports */
+               gop_netc_init(priv, MV_NETC_FIRST_PHASE);
+               gop_netc_init(priv, MV_NETC_SECOND_PHASE);
        }
 
-       return mvpp2_port_probe(dev, port, dev_of_offset(dev), priv);
+       return 0;
+}
+
+/*
+ * Empty BM pool and stop its activity before the OS is started
+ */
+static int mvpp2_remove(struct udevice *dev)
+{
+       struct mvpp2_port *port = dev_get_priv(dev);
+       struct mvpp2 *priv = port->priv;
+       int i;
+
+       priv->num_ports--;
+
+       if (priv->num_ports)
+               return 0;
+
+       for (i = 0; i < MVPP2_BM_POOLS_NUM; i++)
+               mvpp2_bm_pool_destroy(dev, priv, &priv->bm_pools[i]);
+
+       return 0;
 }
 
 static const struct eth_ops mvpp2_ops = {
@@ -4583,9 +5550,11 @@ static struct driver mvpp2_driver = {
        .name   = "mvpp2",
        .id     = UCLASS_ETH,
        .probe  = mvpp2_probe,
+       .remove = mvpp2_remove,
        .ops    = &mvpp2_ops,
        .priv_auto_alloc_size = sizeof(struct mvpp2_port),
        .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+       .flags  = DM_FLAG_ACTIVE_DMA,
 };
 
 /*