From patchwork Wed Jun 16 19:07:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 461871 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB4BBC48BE8 for ; Wed, 16 Jun 2021 19:08:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9E2CA61246 for ; Wed, 16 Jun 2021 19:08:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232418AbhFPTKi (ORCPT ); Wed, 16 Jun 2021 15:10:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232351AbhFPTKb (ORCPT ); Wed, 16 Jun 2021 15:10:31 -0400 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2306BC061574 for ; Wed, 16 Jun 2021 12:08:25 -0700 (PDT) Received: by mail-lj1-x230.google.com with SMTP id r16so5303959ljk.9 for ; Wed, 16 Jun 2021 12:08:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XwPUFmwMt+6ig9pUm7xR69UTaqxBREF6Kd62jKc8yaI=; b=BQ/amQy84n8KucLrbcdyONyn+4G87+J4dUfVzAJ6jeeaJgjg4ZS+ZqfenzMUM30yyf UW0UHQ7kUanjquaLOkRatvcA80WtEgRgEUhyfDOq/i2mA9wtTNFn0ygei5CZFmrbIFZn jhbkXZ0npg6uSRCMVSGmKXla4WTOoFIH8UhKrirZ8O4zHGgmKE1ofJ731vCH3quovrQv 3zhV1MExunmSNNf+3jZVbNb7azAGfZqdd6epMgZkhsbLpAaOJP2g9UqB5REApYokuqJS CivELkyiZp+od2aVig+dWQG5DDdiunOcwLfPr4F2qpEdMLp7V+d7qvaodUC3+o8dbVIy LGaw== 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:mime-version:content-transfer-encoding; bh=XwPUFmwMt+6ig9pUm7xR69UTaqxBREF6Kd62jKc8yaI=; b=dZe/1uHLcXokI/1x9XOTbjqDiDXycqCjtaNF1YPPeOK5sPxLIEWcfKa6qVYHGyvVKj gCx7k43q6MF0x6BoyssBUmY4eOOYkADmkxLy0JjeXEfRxN3Hgea3u128hLMjZqeLAC/b CBxV1DGny9bAuWjb57NI+OhTFwCH7wCxIj1feKhV8DBZMoJhqCv9ybLGb9Ogf1ytpDUC vI5w36pdpfh9wsnksiqTom4TlTSZJ9iL+LyQeldrznjPicrYFfaKeuB1Gx+IX4ROpkTF rpq6zZiRJowVnjwmAQFnXvJom446jbUWmDVPRpD/24BTpFcUNm4SnYq3+JgYAYY/KTr8 ZYqA== X-Gm-Message-State: AOAM530ysGLcf4AiEklAmdaYjBWRsHC9INamMg1KTKaO4WJbnvcqGef6 zALOd4Bt/Lw8OI3EXl3GZtObQA== X-Google-Smtp-Source: ABdhPJwym4wWzJVyfPCnct1qQl1FU7ernZ+6b1Nh1rWn8VG2YsSMO14y5o9x58hC3nYas6XlXAUJVg== X-Received: by 2002:a2e:a583:: with SMTP id m3mr1161671ljp.305.1623870502441; Wed, 16 Jun 2021 12:08:22 -0700 (PDT) Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id h22sm406939ljl.126.2021.06.16.12.08.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 12:08:21 -0700 (PDT) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, linux@armlinux.org.uk, jaz@semihalf.com, gjb@semihalf.com, upstream@semihalf.com, Samer.El-Haj-Mahmoud@arm.com, jon@solid-run.com, tn@semihalf.com, rjw@rjwysocki.net, lenb@kernel.org, Marcin Wojtas Subject: [net-next: PATCH v2 2/7] net: mdiobus: Introduce fwnode_mdbiobus_register() Date: Wed, 16 Jun 2021 21:07:54 +0200 Message-Id: <20210616190759.2832033-3-mw@semihalf.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20210616190759.2832033-1-mw@semihalf.com> References: <20210616190759.2832033-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch introduces a new helper function that wraps acpi_/of_ mdiobus_register() and allows its usage via common fwnode_ interface. Fall back to raw mdiobus_register() in case CONFIG_FWNODE_MDIO is not enabled, in order to satisfy compatibility in all future user drivers. Signed-off-by: Marcin Wojtas --- include/linux/fwnode_mdio.h | 12 +++++++++++ drivers/net/mdio/fwnode_mdio.c | 22 ++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/include/linux/fwnode_mdio.h b/include/linux/fwnode_mdio.h index faf603c48c86..13d4ae8fee0a 100644 --- a/include/linux/fwnode_mdio.h +++ b/include/linux/fwnode_mdio.h @@ -16,6 +16,7 @@ int fwnode_mdiobus_phy_device_register(struct mii_bus *mdio, int fwnode_mdiobus_register_phy(struct mii_bus *bus, struct fwnode_handle *child, u32 addr); +int fwnode_mdiobus_register(struct mii_bus *bus, struct fwnode_handle *fwnode); #else /* CONFIG_FWNODE_MDIO */ int fwnode_mdiobus_phy_device_register(struct mii_bus *mdio, struct phy_device *phy, @@ -30,6 +31,17 @@ static inline int fwnode_mdiobus_register_phy(struct mii_bus *bus, { return -EINVAL; } + +static inline int fwnode_mdiobus_register(struct mii_bus *bus, + struct fwnode_handle *fwnode) +{ + /* + * Fall back to mdiobus_register() function to register a bus. + * This way, we don't have to keep compat bits around in drivers. + */ + + return mdiobus_register(mdio); +} #endif #endif /* __LINUX_FWNODE_MDIO_H */ diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c index e96766da8de4..b6576af89fa1 100644 --- a/drivers/net/mdio/fwnode_mdio.c +++ b/drivers/net/mdio/fwnode_mdio.c @@ -7,8 +7,10 @@ */ #include +#include #include #include +#include #include MODULE_AUTHOR("Calvin Johnson "); @@ -142,3 +144,23 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus, return 0; } EXPORT_SYMBOL(fwnode_mdiobus_register_phy); + +/** + * fwnode_mdiobus_register - bring up all the PHYs on a given MDIO bus and + * attach them to it. + * @bus: Target MDIO bus. + * @fwnode: Pointer to fwnode of the MDIO controller. + * + * Return values are determined accordingly to acpi_/of_ mdiobus_register() + * operation. + */ +int fwnode_mdiobus_register(struct mii_bus *bus, struct fwnode_handle *fwnode) +{ + if (is_acpi_node(fwnode)) + return acpi_mdiobus_register(bus, fwnode); + else if (is_of_node(fwnode)) + return of_mdiobus_register(bus, to_of_node(fwnode)); + else + return -EINVAL; +} +EXPORT_SYMBOL(fwnode_mdiobus_register);