From patchwork Mon Sep 4 16:30:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 809767 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CrwVVH06"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xmFlC6nT4z9t2c for ; Tue, 5 Sep 2017 02:33:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753933AbdIDQcn (ORCPT ); Mon, 4 Sep 2017 12:32:43 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:37851 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753892AbdIDQcZ (ORCPT ); Mon, 4 Sep 2017 12:32:25 -0400 Received: by mail-wm0-f66.google.com with SMTP id x189so762748wmg.4; Mon, 04 Sep 2017 09:32:24 -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:in-reply-to:references; bh=TJDON8TrGp6QwnVdJpWbxvP94B2L9qIH8bwds37uyN4=; b=CrwVVH06PCOF/3GJEYwvVQBxBJoehVaZcxqNNwju8mfs1Q6QgALqM4GW7qC6Ma2FUe fpqW5vDzSme4mhiPXHLclhIiO1OB/oXDZGc369IIZBsXsXG82KJqids9eQ1mcfGXw1Wq A3wX5otxi48NBmMPjX1C8SBqIHq+FmDN4p+mGzwep50eSsdjUgQVneSk4irL8CpYdHHb WPm39aMoydxyYdPaJKuTxNC+AfsQQurS2ls7uOinwoNGVXZ001EpgYGeGLBlajAWJqEx sqWKnDGY8p4oikOy1aWnPzIf4vEH/pScZXwfu/8T6XExxHOrJkxpd8l79suc5ibRgTFb D9IQ== 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:in-reply-to :references; bh=TJDON8TrGp6QwnVdJpWbxvP94B2L9qIH8bwds37uyN4=; b=JUviQfayT8yIYxK0GZ/R/gMbhLaF3WNz9fxEYCeTQmFDXodM9V/ZmI9FmlTvDXlgS0 zUiFUKHPItlrVVcLGtHRXxFM+ZWs3OWUBQBUhcrdo7lRbLNi8/2pLZTprO368Nos4Lbh veeF0dQVfZN3a7l2FTSjkVLdyZpOTbbhF/WndYa2Jm7xNlWdXzdieDnFRYdWkASVOrC5 idMKRfanIT+jElYiv/Tes0NBQUNLzW0Pf35jwE1j/oE7YYFmqRx13xdQmtht/OYtZJ3J r6EYYkW2sJ7DVxrJ4uoXA0rZ2AWlZnmo3ixdy2fNuqejkTeH9l8myi6sffRRNL6oySBy ILPQ== X-Gm-Message-State: AHPjjUii4F3czJpFWaVPuwBa36voPqEqQjxIM+GUhAgG8gNUz8TdPG9c 7Za5EZv0A6Gi9g== X-Google-Smtp-Source: ADKCNb4DVeveDCN/qBk3LzMRoNL0Og82GHuSeTwew2x9UfeFn3430TMRDw5hLyR7loIfQEo86Pbctg== X-Received: by 10.28.134.4 with SMTP id i4mr548862wmd.37.1504542744344; Mon, 04 Sep 2017 09:32:24 -0700 (PDT) Received: from Red.local (LFbn-MAR-1-577-78.w90-118.abo.wanadoo.fr. [90.118.156.78]) by smtp.googlemail.com with ESMTPSA id c83sm870010wmd.38.2017.09.04.09.32.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Sep 2017 09:32:23 -0700 (PDT) From: Corentin Labbe To: andrew@lunn.ch, f.fainelli@gmail.com, rjui@broadcom.com, sbranden@broadcom.com, jonmason@broadcom.com Cc: bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Corentin Labbe Subject: [PATCH 1/1] net: mdio-mux: add mdio_mux parameter to mdio_mux_init() Date: Mon, 4 Sep 2017 18:30:14 +0200 Message-Id: <20170904163014.955-2-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170904163014.955-1-clabbe.montjoie@gmail.com> References: <20170904163014.955-1-clabbe.montjoie@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org mdio_mux_init() use the parameter dev for two distinct thing: 1) Have a device for all devm_ functions 2) Get device_node from it Since it is two distinct purpose, this patch add a parameter mdio_mux that is linked to task 2. This will also permit to register an of_node mdio-mux that lacks a direct owning device. For example a mdio-mux which is a subnode of a real device. Signed-off-by: Corentin Labbe Reviewed-by: Florian Fainelli Reviewed-by: Florian Fainelli --- drivers/net/phy/mdio-mux-bcm-iproc.c | 2 +- drivers/net/phy/mdio-mux-gpio.c | 2 +- drivers/net/phy/mdio-mux-mmioreg.c | 3 ++- drivers/net/phy/mdio-mux.c | 7 ++++--- include/linux/mdio-mux.h | 9 +++++++++ 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c index 0a5f62e0efcc..0831b7142df7 100644 --- a/drivers/net/phy/mdio-mux-bcm-iproc.c +++ b/drivers/net/phy/mdio-mux-bcm-iproc.c @@ -199,7 +199,7 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) platform_set_drvdata(pdev, md); - rc = mdio_mux_init(md->dev, mdio_mux_iproc_switch_fn, + rc = mdio_mux_init(md->dev, md->dev->of_node, mdio_mux_iproc_switch_fn, &md->mux_handle, md, md->mii_bus); if (rc) { dev_info(md->dev, "mdiomux initialization failed\n"); diff --git a/drivers/net/phy/mdio-mux-gpio.c b/drivers/net/phy/mdio-mux-gpio.c index 919949960a10..082ffef0dec4 100644 --- a/drivers/net/phy/mdio-mux-gpio.c +++ b/drivers/net/phy/mdio-mux-gpio.c @@ -54,7 +54,7 @@ static int mdio_mux_gpio_probe(struct platform_device *pdev) if (IS_ERR(s->gpios)) return PTR_ERR(s->gpios); - r = mdio_mux_init(&pdev->dev, + r = mdio_mux_init(&pdev->dev, pdev->dev.of_node, mdio_mux_gpio_switch_fn, &s->mux_handle, s, NULL); if (r != 0) { diff --git a/drivers/net/phy/mdio-mux-mmioreg.c b/drivers/net/phy/mdio-mux-mmioreg.c index c3825c7da038..2573ab012f16 100644 --- a/drivers/net/phy/mdio-mux-mmioreg.c +++ b/drivers/net/phy/mdio-mux-mmioreg.c @@ -159,7 +159,8 @@ static int mdio_mux_mmioreg_probe(struct platform_device *pdev) } } - ret = mdio_mux_init(&pdev->dev, mdio_mux_mmioreg_switch_fn, + ret = mdio_mux_init(&pdev->dev, pdev->dev.of_node, + mdio_mux_mmioreg_switch_fn, &s->mux_handle, s, NULL); if (ret) { dev_err(&pdev->dev, "failed to register mdio-mux bus %pOF\n", diff --git a/drivers/net/phy/mdio-mux.c b/drivers/net/phy/mdio-mux.c index 6f75e9f27fed..0a86f1e4c02f 100644 --- a/drivers/net/phy/mdio-mux.c +++ b/drivers/net/phy/mdio-mux.c @@ -86,6 +86,7 @@ static int mdio_mux_write(struct mii_bus *bus, int phy_id, static int parent_count; int mdio_mux_init(struct device *dev, + struct device_node *mux_node, int (*switch_fn)(int cur, int desired, void *data), void **mux_handle, void *data, @@ -98,11 +99,11 @@ int mdio_mux_init(struct device *dev, struct mdio_mux_parent_bus *pb; struct mdio_mux_child_bus *cb; - if (!dev->of_node) + if (!mux_node) return -ENODEV; if (!mux_bus) { - parent_bus_node = of_parse_phandle(dev->of_node, + parent_bus_node = of_parse_phandle(mux_node, "mdio-parent-bus", 0); if (!parent_bus_node) @@ -132,7 +133,7 @@ int mdio_mux_init(struct device *dev, pb->mii_bus = parent_bus; ret_val = -ENODEV; - for_each_available_child_of_node(dev->of_node, child_bus_node) { + for_each_available_child_of_node(mux_node, child_bus_node) { int v; r = of_property_read_u32(child_bus_node, "reg", &v); diff --git a/include/linux/mdio-mux.h b/include/linux/mdio-mux.h index 61f5b21b31c7..a5d58f221939 100644 --- a/include/linux/mdio-mux.h +++ b/include/linux/mdio-mux.h @@ -12,7 +12,16 @@ #include #include +/* mdio_mux_init() - Initialize a MDIO mux + * @dev The device owning the MDIO mux + * @mux_node The device node of the MDIO mux + * @switch_fn The function called for switching target MDIO child + * mux_handle A pointer to a (void *) used internaly by mdio-mux + * @data Private data used by switch_fn() + * @mux_bus An optional parent bus (Other case are to use parent_bus property) + */ int mdio_mux_init(struct device *dev, + struct device_node *mux_node, int (*switch_fn) (int cur, int desired, void *data), void **mux_handle, void *data,