net: macb: Sync macb_config usage with mainline

Sync macb_config default init and clk_init with mainline.

Signed-off-by: Harini Katakam <harini.katakam@xilinx.com>
Reviewed-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 26e9d7cacededdc6e9c9052f73c96e2831c59ca1..434b891164e9e7f9a59d7231c620a43a77df0be8 100644 (file)
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -4137,15 +4137,25 @@ static const struct of_device_id macb_dt_ids[] = {
 MODULE_DEVICE_TABLE(of, macb_dt_ids);
 #endif /* CONFIG_OF */
 
+static const struct macb_config default_gem_config = {
+       .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE |
+                       MACB_CAPS_JUMBO |
+                       MACB_CAPS_GEM_HAS_PTP,
+       .dma_burst_length = 16,
+       .clk_init = macb_clk_init,
+       .init = macb_init,
+       .jumbo_max_len = 10240,
+};
+
 static int macb_probe(struct platform_device *pdev)
 {
+       const struct macb_config *macb_config = &default_gem_config;
        int (*clk_init)(struct platform_device *, struct clk **,
                        struct clk **, struct clk **,  struct clk **,
-                       struct clk **) = macb_clk_init;
-       int (*init)(struct platform_device *) = macb_init;
+                       struct clk **) = macb_config->clk_init;
+       int (*init)(struct platform_device *) = macb_config->init;
        struct device_node *np = pdev->dev.of_node;
        struct device_node *phy_node;
-       const struct macb_config *macb_config = NULL;
        struct clk *pclk, *hclk = NULL, *tx_clk = NULL, *rx_clk = NULL;
        struct clk *tsu_clk = NULL;
        unsigned int queue_mask, num_queues;