From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752021AbcGPPD2 (ORCPT ); Sat, 16 Jul 2016 11:03:28 -0400 Received: from marmot.wormnet.eu ([188.246.204.87]:50762 "EHLO marmot.wormnet.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751972AbcGPPDX (ORCPT ); Sat, 16 Jul 2016 11:03:23 -0400 From: Jamie Lentin To: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Imre Kaloz , Florian Fainelli Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jamie Lentin Subject: [PATCH v0 08/10] net: phy: Try looking for a phy-handle property to find the OF node Date: Sat, 16 Jul 2016 15:29:06 +0100 Message-Id: <1468679348-10522-9-git-send-email-jm@lentin.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1468679348-10522-1-git-send-email-jm@lentin.co.uk> References: <1468679348-10522-1-git-send-email-jm@lentin.co.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If PHY is registered via. a DSA switch, the MDIO bus the phy is on does not exist in devicetree, but there may be a reference to the PHY node on the physical MDIO bus to use. Signed-off-by: Jamie Lentin --- drivers/net/phy/marvell.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 280e879..c2ca347 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -302,14 +302,24 @@ static int marvell_config_aneg(struct phy_device *phydev) */ static int marvell_of_reg_init(struct phy_device *phydev) { - const __be32 *paddr; + const __be32 *paddr = NULL; int len, i, saved_page, current_page, page_changed, ret; + struct device_node *phy_dn; + + if (phydev->mdio.dev.of_node) + paddr = of_get_property(phydev->mdio.dev.of_node, + "marvell,reg-init", &len); + else if (phydev->attached_dev->dev.of_node) { + /* A DSA slave-mii-bus has no OF node, but the PHY might */ + phy_dn = of_parse_phandle(phydev->attached_dev->dev.of_node, + "phy-handle", 0); + if (phy_dn) { + paddr = of_get_property(phy_dn, + "marvell,reg-init", &len); + of_node_put(phy_dn); + } + } - if (!phydev->mdio.dev.of_node) - return 0; - - paddr = of_get_property(phydev->mdio.dev.of_node, - "marvell,reg-init", &len); if (!paddr || len < (4 * sizeof(*paddr))) return 0; -- 2.8.1