| Message ID | 1482318994-23488-15-git-send-email-thomas.petazzoni@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Thomas Minor nit pick. On Wed, Dec 21, 2016 at 12:16:21PM +0100, Thomas Petazzoni wrote: > In preparation to the introduction for the support of PPv2.2 in the > mvpp2 driver, this commit adds an ip_version field to the struct > mvpp2 When i read this, i was thinking IPv4 vs IPv6. It is a network driver after all. Could you maybe call this hw_version? Thanks Andrew
Hello, On Wed, 21 Dec 2016 18:02:52 +0100, Andrew Lunn wrote: > On Wed, Dec 21, 2016 at 12:16:21PM +0100, Thomas Petazzoni wrote: > > In preparation to the introduction for the support of PPv2.2 in the > > mvpp2 driver, this commit adds an ip_version field to the struct > > mvpp2 > > When i read this, i was thinking IPv4 vs IPv6. It is a network driver after all. > Could you maybe call this hw_version? Sure, will do. Thanks for the feedback! Thomas
diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index e35871f..af00405 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -25,6 +25,7 @@ #include <linux/of_mdio.h> #include <linux/of_net.h> #include <linux/of_address.h> +#include <linux/of_device.h> #include <linux/phy.h> #include <linux/clk.h> #include <linux/hrtimer.h> @@ -649,6 +650,9 @@ struct mvpp2 { /* Tclk value */ u32 tclk; + + /* HW IP Version */ + enum { MVPP21, MVPP22 } ip_version; }; struct mvpp2_pcpu_stats { @@ -6497,6 +6501,9 @@ static int mvpp2_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; + priv->ip_version = + (unsigned long)of_device_get_match_data(&pdev->dev); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); priv->base = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(priv->base)) @@ -6601,7 +6608,10 @@ static int mvpp2_remove(struct platform_device *pdev) } static const struct of_device_id mvpp2_match[] = { - { .compatible = "marvell,armada-375-pp2" }, + { + .compatible = "marvell,armada-375-pp2", + .data = (void *)MVPP21, + }, { } }; MODULE_DEVICE_TABLE(of, mvpp2_match);
In preparation to the introduction for the support of PPv2.2 in the mvpp2 driver, this commit adds an ip_version field to the struct mvpp2, and uses the .data field of the DT match table to fill it in. Having the MVPP21 and MVPP22 definitions available will allow to start adding the necessary conditional code to support PPv2.2. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- drivers/net/ethernet/marvell/mvpp2.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)