From: Ioana Ciornei <ciorneiioana@gmail.com> To: davem@davemloft.net, kuba@kernel.org, hkallweit1@gmail.com, netdev@vger.kernel.org, Grant Likely <grant.likely@arm.com>, "Rafael J . Wysocki" <rafael@kernel.org>, Jeremy Linton <jeremy.linton@arm.com>, Andrew Lunn <andrew@lunn.ch>, Andy Shevchenko <andy.shevchenko@gmail.com>, Florian Fainelli <f.fainelli@gmail.com>, Russell King - ARM Linux admin <linux@armlinux.org.uk>, Heikki Krogerus <heikki.krogerus@linux.intel.com>, Marcin Wojtas <mw@semihalf.com>, Pieter Jansen Van Vuuren <pieter.jansenvv@bamboosystems.io>, Jon <jon@solid-run.com>, Saravana Kannan <saravanak@google.com>, Randy Dunlap <rdunlap@infradead.org>, calvin.johnson@oss.nxp.com Cc: Cristi Sovaiala <cristian.sovaiala@nxp.com>, Florin Laurentiu Chiculita <florinlaurentiu.chiculita@nxp.com>, Madalin Bucur <madalin.bucur@nxp.com>, linux-arm-kernel@lists.infradead.org, Diana Madalina Craciun <diana.craciun@nxp.com>, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux.cj@gmail.com, Laurentiu Tudor <laurentiu.tudor@nxp.com>, Len Brown <lenb@kernel.org>, "Rafael J . Wysocki" <rjw@rjwysocki.net>, Ioana Ciornei <ioana.ciornei@nxp.com> Subject: [PATCH net-next v9 12/15] net/fsl: Use [acpi|of]_mdiobus_register Date: Fri, 11 Jun 2021 13:53:58 +0300 [thread overview] Message-ID: <20210611105401.270673-13-ciorneiioana@gmail.com> (raw) In-Reply-To: <20210611105401.270673-1-ciorneiioana@gmail.com> From: Calvin Johnson <calvin.johnson@oss.nxp.com> Depending on the device node type, call the specific OF or ACPI mdiobus_register function. Note: For both ACPI and DT cases, endianness of MDIO controllers need to be specified using the "little-endian" property. Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com> Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com> Acked-by: Grant Likely <grant.likely@arm.com> --- Changes in v9: none Changes in v8: - Directly call the OF or ACPI variants of registering the MDIO bus. This is needed because the fwnode_mdio.c module should only implement features which can be achieved without going back to the OF/ACPI variants. Without this restrictions we directly end up in a dependency cycle: of_mdio -> fwnode_mdio -> of_mdio. - Changed the commit title since the fwnode_mdiobus_register() is no longer available Changes in v7: - Include fwnode_mdio.h - Alphabetically sort header inclusions Changes in v6: None Changes in v5: None Changes in v4: - Cleanup xgmac_mdio_probe() Changes in v3: - Avoid unnecessary line removal - Remove unused inclusion of acpi.h Changes in v2: None drivers/net/ethernet/freescale/xgmac_mdio.c | 30 ++++++++++++++------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/freescale/xgmac_mdio.c b/drivers/net/ethernet/freescale/xgmac_mdio.c index bfa2826c5545..0b68852379da 100644 --- a/drivers/net/ethernet/freescale/xgmac_mdio.c +++ b/drivers/net/ethernet/freescale/xgmac_mdio.c @@ -2,6 +2,7 @@ * QorIQ 10G MDIO Controller * * Copyright 2012 Freescale Semiconductor, Inc. + * Copyright 2021 NXP * * Authors: Andy Fleming <afleming@freescale.com> * Timur Tabi <timur@freescale.com> @@ -11,15 +12,17 @@ * kind, whether express or implied. */ -#include <linux/kernel.h> -#include <linux/slab.h> +#include <linux/acpi.h> +#include <linux/acpi_mdio.h> #include <linux/interrupt.h> -#include <linux/module.h> -#include <linux/phy.h> +#include <linux/kernel.h> #include <linux/mdio.h> +#include <linux/module.h> #include <linux/of_address.h> -#include <linux/of_platform.h> #include <linux/of_mdio.h> +#include <linux/of_platform.h> +#include <linux/phy.h> +#include <linux/slab.h> /* Number of microseconds to wait for a register to respond */ #define TIMEOUT 1000 @@ -243,10 +246,10 @@ static int xgmac_mdio_read(struct mii_bus *bus, int phy_id, int regnum) static int xgmac_mdio_probe(struct platform_device *pdev) { - struct device_node *np = pdev->dev.of_node; - struct mii_bus *bus; - struct resource *res; + struct fwnode_handle *fwnode; struct mdio_fsl_priv *priv; + struct resource *res; + struct mii_bus *bus; int ret; /* In DPAA-1, MDIO is one of the many FMan sub-devices. The FMan @@ -279,13 +282,22 @@ static int xgmac_mdio_probe(struct platform_device *pdev) goto err_ioremap; } + /* For both ACPI and DT cases, endianness of MDIO controller + * needs to be specified using "little-endian" property. + */ priv->is_little_endian = device_property_read_bool(&pdev->dev, "little-endian"); priv->has_a011043 = device_property_read_bool(&pdev->dev, "fsl,erratum-a011043"); - ret = of_mdiobus_register(bus, np); + fwnode = pdev->dev.fwnode; + if (is_of_node(fwnode)) + ret = of_mdiobus_register(bus, to_of_node(fwnode)); + else if (is_acpi_node(fwnode)) + ret = acpi_mdiobus_register(bus, fwnode); + else + ret = -EINVAL; if (ret) { dev_err(&pdev->dev, "cannot register MDIO bus\n"); goto err_registration; -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: Ioana Ciornei <ciorneiioana@gmail.com> To: davem@davemloft.net, kuba@kernel.org, hkallweit1@gmail.com, netdev@vger.kernel.org, Grant Likely <grant.likely@arm.com>, "Rafael J . Wysocki" <rafael@kernel.org>, Jeremy Linton <jeremy.linton@arm.com>, Andrew Lunn <andrew@lunn.ch>, Andy Shevchenko <andy.shevchenko@gmail.com>, Florian Fainelli <f.fainelli@gmail.com>, Russell King - ARM Linux admin <linux@armlinux.org.uk>, Heikki Krogerus <heikki.krogerus@linux.intel.com>, Marcin Wojtas <mw@semihalf.com>, Pieter Jansen Van Vuuren <pieter.jansenvv@bamboosystems.io>, Jon <jon@solid-run.com>, Saravana Kannan <saravanak@google.com>, Randy Dunlap <rdunlap@infradead.org>, calvin.johnson@oss.nxp.com Cc: Cristi Sovaiala <cristian.sovaiala@nxp.com>, Florin Laurentiu Chiculita <florinlaurentiu.chiculita@nxp.com>, Madalin Bucur <madalin.bucur@nxp.com>, linux-arm-kernel@lists.infradead.org, Diana Madalina Craciun <diana.craciun@nxp.com>, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux.cj@gmail.com, Laurentiu Tudor <laurentiu.tudor@nxp.com>, Len Brown <lenb@kernel.org>, "Rafael J . Wysocki" <rjw@rjwysocki.net>, Ioana Ciornei <ioana.ciornei@nxp.com> Subject: [PATCH net-next v9 12/15] net/fsl: Use [acpi|of]_mdiobus_register Date: Fri, 11 Jun 2021 13:53:58 +0300 [thread overview] Message-ID: <20210611105401.270673-13-ciorneiioana@gmail.com> (raw) In-Reply-To: <20210611105401.270673-1-ciorneiioana@gmail.com> From: Calvin Johnson <calvin.johnson@oss.nxp.com> Depending on the device node type, call the specific OF or ACPI mdiobus_register function. Note: For both ACPI and DT cases, endianness of MDIO controllers need to be specified using the "little-endian" property. Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com> Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com> Acked-by: Grant Likely <grant.likely@arm.com> --- Changes in v9: none Changes in v8: - Directly call the OF or ACPI variants of registering the MDIO bus. This is needed because the fwnode_mdio.c module should only implement features which can be achieved without going back to the OF/ACPI variants. Without this restrictions we directly end up in a dependency cycle: of_mdio -> fwnode_mdio -> of_mdio. - Changed the commit title since the fwnode_mdiobus_register() is no longer available Changes in v7: - Include fwnode_mdio.h - Alphabetically sort header inclusions Changes in v6: None Changes in v5: None Changes in v4: - Cleanup xgmac_mdio_probe() Changes in v3: - Avoid unnecessary line removal - Remove unused inclusion of acpi.h Changes in v2: None drivers/net/ethernet/freescale/xgmac_mdio.c | 30 ++++++++++++++------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/freescale/xgmac_mdio.c b/drivers/net/ethernet/freescale/xgmac_mdio.c index bfa2826c5545..0b68852379da 100644 --- a/drivers/net/ethernet/freescale/xgmac_mdio.c +++ b/drivers/net/ethernet/freescale/xgmac_mdio.c @@ -2,6 +2,7 @@ * QorIQ 10G MDIO Controller * * Copyright 2012 Freescale Semiconductor, Inc. + * Copyright 2021 NXP * * Authors: Andy Fleming <afleming@freescale.com> * Timur Tabi <timur@freescale.com> @@ -11,15 +12,17 @@ * kind, whether express or implied. */ -#include <linux/kernel.h> -#include <linux/slab.h> +#include <linux/acpi.h> +#include <linux/acpi_mdio.h> #include <linux/interrupt.h> -#include <linux/module.h> -#include <linux/phy.h> +#include <linux/kernel.h> #include <linux/mdio.h> +#include <linux/module.h> #include <linux/of_address.h> -#include <linux/of_platform.h> #include <linux/of_mdio.h> +#include <linux/of_platform.h> +#include <linux/phy.h> +#include <linux/slab.h> /* Number of microseconds to wait for a register to respond */ #define TIMEOUT 1000 @@ -243,10 +246,10 @@ static int xgmac_mdio_read(struct mii_bus *bus, int phy_id, int regnum) static int xgmac_mdio_probe(struct platform_device *pdev) { - struct device_node *np = pdev->dev.of_node; - struct mii_bus *bus; - struct resource *res; + struct fwnode_handle *fwnode; struct mdio_fsl_priv *priv; + struct resource *res; + struct mii_bus *bus; int ret; /* In DPAA-1, MDIO is one of the many FMan sub-devices. The FMan @@ -279,13 +282,22 @@ static int xgmac_mdio_probe(struct platform_device *pdev) goto err_ioremap; } + /* For both ACPI and DT cases, endianness of MDIO controller + * needs to be specified using "little-endian" property. + */ priv->is_little_endian = device_property_read_bool(&pdev->dev, "little-endian"); priv->has_a011043 = device_property_read_bool(&pdev->dev, "fsl,erratum-a011043"); - ret = of_mdiobus_register(bus, np); + fwnode = pdev->dev.fwnode; + if (is_of_node(fwnode)) + ret = of_mdiobus_register(bus, to_of_node(fwnode)); + else if (is_acpi_node(fwnode)) + ret = acpi_mdiobus_register(bus, fwnode); + else + ret = -EINVAL; if (ret) { dev_err(&pdev->dev, "cannot register MDIO bus\n"); goto err_registration; -- 2.31.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-06-11 10:57 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-11 10:53 [PATCH net-next v9 00/15] ACPI support for dpaa2 driver Ioana Ciornei 2021-06-11 10:53 ` Ioana Ciornei 2021-06-11 10:53 ` [PATCH net-next v9 01/15] Documentation: ACPI: DSD: Document MDIO PHY Ioana Ciornei 2021-06-11 10:53 ` Ioana Ciornei 2021-06-11 10:53 ` [PATCH net-next v9 02/15] net: phy: Introduce fwnode_mdio_find_device() Ioana Ciornei 2021-06-11 10:53 ` Ioana Ciornei 2021-06-11 11:20 ` Andy Shevchenko 2021-06-11 11:20 ` Andy Shevchenko 2021-06-11 10:53 ` [PATCH net-next v9 03/15] net: phy: Introduce phy related fwnode functions Ioana Ciornei 2021-06-11 10:53 ` Ioana Ciornei 2021-06-11 11:26 ` Andy Shevchenko 2021-06-11 11:26 ` Andy Shevchenko 2021-06-11 11:40 ` Rafael J. Wysocki 2021-06-11 11:40 ` Rafael J. Wysocki 2021-06-11 12:08 ` Russell King (Oracle) 2021-06-11 12:08 ` Russell King (Oracle) 2021-06-11 12:31 ` Rafael J. Wysocki 2021-06-11 12:31 ` Rafael J. Wysocki 2021-06-11 10:53 ` [PATCH net-next v9 04/15] of: mdio: Refactor of_phy_find_device() Ioana Ciornei 2021-06-11 10:53 ` Ioana Ciornei 2021-06-11 11:28 ` Andy Shevchenko 2021-06-11 11:28 ` Andy Shevchenko 2021-06-11 11:30 ` Andy Shevchenko 2021-06-11 11:30 ` Andy Shevchenko 2021-06-11 11:35 ` Russell King (Oracle) 2021-06-11 11:35 ` Russell King (Oracle) 2021-06-11 10:53 ` [PATCH net-next v9 05/15] net: phy: Introduce fwnode_get_phy_id() Ioana Ciornei 2021-06-11 10:53 ` Ioana Ciornei 2021-06-11 10:53 ` [PATCH net-next v9 06/15] of: mdio: Refactor of_get_phy_id() Ioana Ciornei 2021-06-11 10:53 ` Ioana Ciornei 2021-06-11 10:53 ` [PATCH net-next v9 07/15] net: mii_timestamper: check NULL in unregister_mii_timestamper() Ioana Ciornei 2021-06-11 10:53 ` Ioana Ciornei 2021-06-11 10:53 ` [PATCH net-next v9 08/15] net: mdiobus: Introduce fwnode_mdiobus_register_phy() Ioana Ciornei 2021-06-11 10:53 ` Ioana Ciornei 2021-06-15 20:15 ` andy 2021-06-11 10:53 ` [PATCH net-next v9 09/15] of: mdio: Refactor of_mdiobus_register_phy() Ioana Ciornei 2021-06-11 10:53 ` Ioana Ciornei 2021-06-11 10:53 ` [PATCH net-next v9 10/15] ACPI: utils: Introduce acpi_get_local_address() Ioana Ciornei 2021-06-11 10:53 ` Ioana Ciornei 2021-06-11 10:53 ` [PATCH net-next v9 11/15] net: mdio: Add ACPI support code for mdio Ioana Ciornei 2021-06-11 10:53 ` Ioana Ciornei 2021-06-11 10:53 ` Ioana Ciornei [this message] 2021-06-11 10:53 ` [PATCH net-next v9 12/15] net/fsl: Use [acpi|of]_mdiobus_register Ioana Ciornei 2021-06-11 10:53 ` [PATCH net-next v9 13/15] net: phylink: introduce phylink_fwnode_phy_connect() Ioana Ciornei 2021-06-11 10:53 ` Ioana Ciornei 2021-06-11 11:17 ` Russell King (Oracle) 2021-06-11 11:17 ` Russell King (Oracle) 2021-06-15 20:18 ` andy 2021-06-11 10:54 ` [PATCH net-next v9 14/15] net: phylink: Refactor phylink_of_phy_connect() Ioana Ciornei 2021-06-11 10:54 ` Ioana Ciornei 2021-06-11 11:18 ` Russell King (Oracle) 2021-06-11 11:18 ` Russell King (Oracle) 2021-06-11 10:54 ` [PATCH net-next v9 15/15] net: dpaa2-mac: Add ACPI support for DPAA2 MAC driver Ioana Ciornei 2021-06-11 10:54 ` Ioana Ciornei 2021-06-11 20:20 ` [PATCH net-next v9 00/15] ACPI support for dpaa2 driver patchwork-bot+netdevbpf 2021-06-11 20:20 ` patchwork-bot+netdevbpf
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210611105401.270673-13-ciorneiioana@gmail.com \ --to=ciorneiioana@gmail.com \ --cc=andrew@lunn.ch \ --cc=andy.shevchenko@gmail.com \ --cc=calvin.johnson@oss.nxp.com \ --cc=cristian.sovaiala@nxp.com \ --cc=davem@davemloft.net \ --cc=diana.craciun@nxp.com \ --cc=f.fainelli@gmail.com \ --cc=florinlaurentiu.chiculita@nxp.com \ --cc=grant.likely@arm.com \ --cc=heikki.krogerus@linux.intel.com \ --cc=hkallweit1@gmail.com \ --cc=ioana.ciornei@nxp.com \ --cc=jeremy.linton@arm.com \ --cc=jon@solid-run.com \ --cc=kuba@kernel.org \ --cc=laurentiu.tudor@nxp.com \ --cc=lenb@kernel.org \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux.cj@gmail.com \ --cc=linux@armlinux.org.uk \ --cc=madalin.bucur@nxp.com \ --cc=mw@semihalf.com \ --cc=netdev@vger.kernel.org \ --cc=pieter.jansenvv@bamboosystems.io \ --cc=rafael@kernel.org \ --cc=rdunlap@infradead.org \ --cc=rjw@rjwysocki.net \ --cc=saravanak@google.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.