Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de387e11 authored by Robert Richter's avatar Robert Richter Committed by David S. Miller
Browse files

net: thunder: Factor out DT specific code in BGX 



Separate DT code in preparation for follow-on ACPI integration.

Based on code from: Tomasz Nowicki <tomasz.nowicki@linaro.org>

Signed-off-by: default avatarRobert Richter <rrichter@cavium.com>
Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 07a51cd3

drivers/net/ethernet/cavium/thunder/thunder_bgx.c

+35 −13
Original line number Diff line number Diff line
@@ -835,17 +835,27 @@ static void bgx_get_qlm_mode(struct bgx *bgx) 
	}

}



static void bgx_init_of(struct bgx *bgx, struct device_node *np)

#if IS_ENABLED(CONFIG_OF_MDIO)



static int bgx_init_of_phy(struct bgx *bgx)

{

	struct device_node *np;

	struct device_node *np_child;

	u8 lmac = 0;



	for_each_child_of_node(np, np_child) {

		struct device_node *phy_np;

	char bgx_sel[5];

	const char *mac;



		phy_np = of_parse_phandle(np_child, "phy-handle", 0);

		if (phy_np)

	/* Get BGX node from DT */

	snprintf(bgx_sel, 5, "bgx%d", bgx->bgx_id);

	np = of_find_node_by_name(NULL, bgx_sel);

	if (!np)

		return -ENODEV;



	for_each_child_of_node(np, np_child) {

		struct device_node *phy_np = of_parse_phandle(np_child,

							      "phy-handle", 0);

		if (!phy_np)

			continue;

		bgx->lmac[lmac].phydev = of_phy_find_device(phy_np);



		mac = of_get_mac_address(np_child);
@@ -858,6 +868,21 @@ static void bgx_init_of(struct bgx *bgx, struct device_node *np) 
		if (lmac == MAX_LMAC_PER_BGX)

			break;

	}

	return 0;

}



#else



static int bgx_init_of_phy(struct bgx *bgx)

{

	return -ENODEV;

}



#endif /* CONFIG_OF_MDIO */



static int bgx_init_phy(struct bgx *bgx)

{

	return bgx_init_of_phy(bgx);

}



static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
@@ -865,8 +890,6 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	int err;

	struct device *dev = &pdev->dev;

	struct bgx *bgx = NULL;

	struct device_node *np;

	char bgx_sel[5];

	u8 lmac;



	bgx = devm_kzalloc(dev, sizeof(*bgx), GFP_KERNEL);
@@ -902,10 +925,9 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	bgx_vnic[bgx->bgx_id] = bgx;

	bgx_get_qlm_mode(bgx);



	snprintf(bgx_sel, 5, "bgx%d", bgx->bgx_id);

	np = of_find_node_by_name(NULL, bgx_sel);

	if (np)

		bgx_init_of(bgx, np);

	err = bgx_init_phy(bgx);

	if (err)

		goto err_enable;



	bgx_init_hw(bgx);