Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

[karo-tx-linux.git] / drivers / net / ethernet / apm / xgene / xgene_enet_main.c

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index e47298faf78dedbdf1f562fe17c636793e19717f..ce1068771b327e711fd1723065f9f3ad3c5dadc3 100644 (file)
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -1118,6 +1118,47 @@ static int xgene_get_port_id_dt(struct device *dev, struct xgene_enet_pdata *pda
        return ret;
 }
 
+static int xgene_get_tx_delay(struct xgene_enet_pdata *pdata)
+{
+       struct device *dev = &pdata->pdev->dev;
+       int delay, ret;
+
+       ret = of_property_read_u32(dev->of_node, "tx-delay", &delay);
+       if (ret) {
+               pdata->tx_delay = 4;
+               return 0;
+       }
+
+       if (delay < 0 || delay > 7) {
+               dev_err(dev, "Invalid tx-delay specified\n");
+               return -EINVAL;
+       }
+
+       pdata->tx_delay = delay;
+
+       return 0;
+}
+
+static int xgene_get_rx_delay(struct xgene_enet_pdata *pdata)
+{
+       struct device *dev = &pdata->pdev->dev;
+       int delay, ret;
+
+       ret = of_property_read_u32(dev->of_node, "rx-delay", &delay);
+       if (ret) {
+               pdata->rx_delay = 2;
+               return 0;
+       }
+
+       if (delay < 0 || delay > 7) {
+               dev_err(dev, "Invalid rx-delay specified\n");
+               return -EINVAL;
+       }
+
+       pdata->rx_delay = delay;
+
+       return 0;
+}
 
 static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
 {
@@ -1194,6 +1235,14 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
                return -ENODEV;
        }
 
+       ret = xgene_get_tx_delay(pdata);
+       if (ret)
+               return ret;
+
+       ret = xgene_get_rx_delay(pdata);
+       if (ret)
+               return ret;
+
        ret = platform_get_irq(pdev, 0);
        if (ret <= 0) {
                dev_err(dev, "Unable to get ENET Rx IRQ\n");
@@ -1305,10 +1354,17 @@ static void xgene_enet_setup_ops(struct xgene_enet_pdata *pdata)
                        pdata->ring_num = START_RING_NUM_0;
                        break;
                case 1:
-                       pdata->cpu_bufnum = START_CPU_BUFNUM_1;
-                       pdata->eth_bufnum = START_ETH_BUFNUM_1;
-                       pdata->bp_bufnum = START_BP_BUFNUM_1;
-                       pdata->ring_num = START_RING_NUM_1;
+                       if (pdata->phy_mode == PHY_INTERFACE_MODE_XGMII) {
+                               pdata->cpu_bufnum = XG_START_CPU_BUFNUM_1;
+                               pdata->eth_bufnum = XG_START_ETH_BUFNUM_1;
+                               pdata->bp_bufnum = XG_START_BP_BUFNUM_1;
+                               pdata->ring_num = XG_START_RING_NUM_1;
+                       } else {
+                               pdata->cpu_bufnum = START_CPU_BUFNUM_1;
+                               pdata->eth_bufnum = START_ETH_BUFNUM_1;
+                               pdata->bp_bufnum = START_BP_BUFNUM_1;
+                               pdata->ring_num = START_RING_NUM_1;
+                       }
                        break;
                default:
                        break;
@@ -1478,6 +1534,7 @@ static const struct acpi_device_id xgene_enet_acpi_match[] = {
        { "APMC0D05", XGENE_ENET1},
        { "APMC0D30", XGENE_ENET1},
        { "APMC0D31", XGENE_ENET1},
+       { "APMC0D3F", XGENE_ENET1},
        { "APMC0D26", XGENE_ENET2},
        { "APMC0D25", XGENE_ENET2},
        { }