From patchwork Sun Oct 7 17:38:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Cochran X-Patchwork-Id: 980214 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rYzO/Hh7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42SrM2719Gz9sD2 for ; Mon, 8 Oct 2018 04:38:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728388AbeJHAqb (ORCPT ); Sun, 7 Oct 2018 20:46:31 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:45151 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728185AbeJHAqa (ORCPT ); Sun, 7 Oct 2018 20:46:30 -0400 Received: by mail-pl1-f196.google.com with SMTP id y15-v6so8995912plr.12; Sun, 07 Oct 2018 10:38:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=pSErlfrO5+p/cyb/CE/7nfhz0DxAs6Y9YT9RKeB+nlE=; b=rYzO/Hh7TRDBUcP98aYJdLAeGoaqaLwg/If2ksbmIhYC8iLFKfWqUi7DqB9HOrbE6K 4JEWIjNmDK2MYxeARGVHSTb6hB444YjABk8+uR/X5ra6WKOQ2S2Q3pv5SlXO8Oqwih9C hQI8qkikyr5EO53NbqZWFlwbyZwCnd/nDE06Or9CmOpBMY7LhTCwBz8u7v2R4X+V5d8G 8EjzT2diA1pruQWWuVUxOFHduyk5CYQg0KYUJd8Q7P+KVSE3S0MI8Zyxwsukhf0f2JXD rWfv8qHd3/WVwRBpx3EUuaEWOD0dmShzQFbttx2dQcR5RcnP+vltfLDcGYikgrZKMwYv c5kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=pSErlfrO5+p/cyb/CE/7nfhz0DxAs6Y9YT9RKeB+nlE=; b=Wd2NA7VjpMoXZ/6hQ8qUiJbB1MGyXKqEOoLaVeUqmCTwenTXOwVEEZ1PPJZYgif2Ys 8YWHcEGcU1WL2MhbPQM0AdHwNbkv7LvnDoTPnokzx6uDTqkP+C5oJP8pJYr8aavGGoYh jmIRVGPVZmxu1ygOFHRAgW8v3tGXTJFS8bXxTMHmw3/hHy2VP+TInMD7PkkHnMj2dItw /vNHGrVPCdSyTtvpZLwbzz/myV6jpniFi8Me106VUAhN+783ebvPxmVMbmHOyw1BKPVp K+VykqmOFjIPZHWUiI1gExrdx5wEcz75XDhKW+p23HM9zNHWTqMN7gYDv0f9weIc6VpW Q39w== X-Gm-Message-State: ABuFfoiqhVbQV47rvNUAnJYxghYAy/8fpVw/e3oRxMyT9Qh5Q39mvlVV 54KAYanANAE8BZJzloCnrLFeNBHx X-Google-Smtp-Source: ACcGV63DGhgwjq1xhS3Rzww6ukhUnKFb1qcGn31JLR7bkfmVEWaBc3rM0HQ1V30li518uOAHXvS0Ng== X-Received: by 2002:a17:902:b903:: with SMTP id bf3-v6mr20985370plb.54.1538933910766; Sun, 07 Oct 2018 10:38:30 -0700 (PDT) Received: from localhost.localdomain (c-24-4-232-171.hsd1.ca.comcast.net. [24.4.232.171]) by smtp.gmail.com with ESMTPSA id c79-v6sm21433389pfb.147.2018.10.07.10.38.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Oct 2018 10:38:30 -0700 (PDT) From: Richard Cochran To: netdev@vger.kernel.org Cc: devicetree@vger.kernel.org, Andrew Lunn , David Miller , Florian Fainelli , Jacob Keller , Mark Rutland , Miroslav Lichvar , Rob Herring , Willem de Bruijn Subject: [PATCH V2 net-next 4/5] net: mdio: of: Register discovered MII time stampers. Date: Sun, 7 Oct 2018 10:38:22 -0700 Message-Id: <20181007173823.21590-5-richardcochran@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org When parsing a PHY node, register its time stamper, if any, and attach the instance to the PHY device. Signed-off-by: Richard Cochran --- drivers/net/phy/phy_device.c | 3 +++ drivers/of/of_mdio.c | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index a454432d166f..c24bce9b7270 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -833,6 +833,9 @@ EXPORT_SYMBOL(phy_device_register); */ void phy_device_remove(struct phy_device *phydev) { + if (phydev->mii_ts) + unregister_mii_timestamper(phydev->mii_ts); + device_del(&phydev->mdio.dev); /* Assert the reset signal */ diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index f76c10ecc616..7699f167e4a9 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -44,14 +44,38 @@ static int of_get_phy_id(struct device_node *device, u32 *phy_id) return -EINVAL; } +struct mii_timestamper *of_find_mii_timestamper(struct device_node *node) +{ + struct of_phandle_args args; + unsigned int port = 0; + int err; + + err = of_parse_phandle_with_args(node, "timestamper", + "#phandle-cells", 0, &args); + if (err == -ENOENT) + return NULL; + else if (err) + return ERR_PTR(err); + + if (args.args_count >= 1) + port = args.args[0]; + + return register_mii_timestamper(args.np, port); +} + static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *child, u32 addr) { + struct mii_timestamper *mii_ts; struct phy_device *phy; bool is_c45; int rc; u32 phy_id; + mii_ts = of_find_mii_timestamper(child); + if (IS_ERR(mii_ts)) + return PTR_ERR(mii_ts); + is_c45 = of_device_is_compatible(child, "ethernet-phy-ieee802.3-c45"); @@ -97,6 +121,8 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, return rc; } + phy->mii_ts = mii_ts; + dev_dbg(&mdio->dev, "registered phy %s at address %i\n", child->name, addr); return 0;