net: ftgmac100: Add match data containing MAC ID

The driver supports 4 different versions of the FTGMAC core.  Extend
the compatible matching to include match data, which indicates the
version of the MAC. Default to the initial Faraday device if DT is not
being used. Lookup the match data early in probe to keep error handing
simple.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Jacky Chou <jacky_chou@aspeedtech.com>
Link: https://patch.msgid.link/20260206-ftgmac-cleanup-v5-2-ad28a9067ea7@aspeedtech.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index bd768a93b9e67d039fbd755b52ed2d1084387a04..104eb7b1f5bb856870bd0f3f17cf648b8b3c0385 100644 (file)
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -33,6 +33,17 @@
 
 #define DRV_NAME       "ftgmac100"
 
+enum ftgmac100_mac_id {
+       FTGMAC100_FARADAY = 1,
+       FTGMAC100_AST2400,
+       FTGMAC100_AST2500,
+       FTGMAC100_AST2600
+};
+
+struct ftgmac100_match_data {
+       enum ftgmac100_mac_id mac_id;
+};
+
 /* Arbitrary values, I am not sure the HW has limits */
 #define MAX_RX_QUEUE_ENTRIES   1024
 #define MAX_TX_QUEUE_ENTRIES   1024
@@ -66,6 +77,8 @@ struct ftgmac100 {
        struct resource *res;
        void __iomem *base;
 
+       enum ftgmac100_mac_id mac_id;
+
        /* Rx ring */
        unsigned int rx_q_entries;
        struct ftgmac100_rxdes *rxdes;
@@ -1835,6 +1848,8 @@ static bool ftgmac100_has_child_node(struct device_node *np, const char *name)
 
 static int ftgmac100_probe(struct platform_device *pdev)
 {
+       const struct ftgmac100_match_data *match_data;
+       enum ftgmac100_mac_id mac_id;
        struct resource *res;
        int irq;
        struct net_device *netdev;
@@ -1843,6 +1858,16 @@ static int ftgmac100_probe(struct platform_device *pdev)
        struct device_node *np;
        int err = 0;
 
+       np = pdev->dev.of_node;
+       if (np) {
+               match_data = of_device_get_match_data(&pdev->dev);
+               if (!match_data)
+                       return -EINVAL;
+               mac_id = match_data->mac_id;
+       } else {
+               mac_id = FTGMAC100_FARADAY;
+       }
+
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res)
                return -ENXIO;
@@ -1870,6 +1895,7 @@ static int ftgmac100_probe(struct platform_device *pdev)
        priv = netdev_priv(netdev);
        priv->netdev = netdev;
        priv->dev = &pdev->dev;
+       priv->mac_id = mac_id;
        INIT_WORK(&priv->reset_task, ftgmac100_reset_task);
 
        /* map io memory */
@@ -1900,7 +1926,6 @@ static int ftgmac100_probe(struct platform_device *pdev)
        if (err)
                goto err_phy_connect;
 
-       np = pdev->dev.of_node;
        if (np && (of_device_is_compatible(np, "aspeed,ast2400-mac") ||
                   of_device_is_compatible(np, "aspeed,ast2500-mac") ||
                   of_device_is_compatible(np, "aspeed,ast2600-mac"))) {
@@ -2090,11 +2115,31 @@ static void ftgmac100_remove(struct platform_device *pdev)
        free_netdev(netdev);
 }
 
+static const struct ftgmac100_match_data ftgmac100_match_data_ast2400 = {
+       .mac_id = FTGMAC100_AST2400
+};
+
+static const struct ftgmac100_match_data ftgmac100_match_data_ast2500 = {
+       .mac_id = FTGMAC100_AST2500
+};
+
+static const struct ftgmac100_match_data ftgmac100_match_data_ast2600 = {
+       .mac_id = FTGMAC100_AST2600
+};
+
+static const struct ftgmac100_match_data ftgmac100_match_data_faraday = {
+       .mac_id = FTGMAC100_FARADAY
+};
+
 static const struct of_device_id ftgmac100_of_match[] = {
-       { .compatible = "aspeed,ast2400-mac" },
-       { .compatible = "aspeed,ast2500-mac" },
-       { .compatible = "aspeed,ast2600-mac" },
-       { .compatible = "faraday,ftgmac100" },
+       { .compatible = "aspeed,ast2400-mac",
+         .data = &ftgmac100_match_data_ast2400},
+       { .compatible = "aspeed,ast2500-mac",
+         .data = &ftgmac100_match_data_ast2500 },
+       { .compatible = "aspeed,ast2600-mac",
+         .data = &ftgmac100_match_data_ast2600 },
+       { .compatible = "faraday,ftgmac100",
+         .data = &ftgmac100_match_data_faraday },
        { }
 };
 MODULE_DEVICE_TABLE(of, ftgmac100_of_match);