AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-21 08:46:49 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: mscc: ocelot: get HSIO regmap from syscon

Browse Source 
HSIO address space was moved to a syscon, hence we need to get the
regmap of this address space from there and no more from the device
node.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Quentin Schulz <quentin.schulz@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Quentin Schulz 2018-10-04 14:22:00 +02:00 committed by David S. Miller
parent 6afea95a80
commit 19aedfbe65
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/ethernet/mscc/ocelot_board.c
View File

@ -9,6 +9,7 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/of_mdio.h> #include <linux/of_mdio.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/mfd/syscon.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include "ocelot.h" #include "ocelot.h"
@ -168,6 +169,7 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct device_node *ports, *portnp; struct device_node *ports, *portnp;
struct ocelot *ocelot; struct ocelot *ocelot;
struct regmap *hsio;
u32 val; u32 val;
struct { struct {
@ -179,7 +181,6 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
{ QSYS, "qsys" }, { QSYS, "qsys" },
{ ANA, "ana" }, { ANA, "ana" },
{ QS, "qs" }, { QS, "qs" },
{ HSIO, "hsio" },
}; };
if (!np && !pdev->dev.platform_data) if (!np && !pdev->dev.platform_data)
@ -202,6 +203,14 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
ocelot->targets[res[i].id] = target; ocelot->targets[res[i].id] = target;
} }
hsio = syscon_regmap_lookup_by_compatible("mscc,ocelot-hsio");
if (IS_ERR(hsio)) {
dev_err(&pdev->dev, "missing hsio syscon\n");
return PTR_ERR(hsio);
}
ocelot->targets[HSIO] = hsio;
err = ocelot_chip_init(ocelot); err = ocelot_chip_init(ocelot);
if (err) if (err)
return err; return err;