Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32e43779 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Modernize-mdio-gpio' 



Andrew Lunn says:

====================
Modernize mdio-gpio

This patchset is inspired by a previous version by Linus Walleij

It reworks the mdio-gpio code to make use of gpio descriptors instead
of gpio numbers. However compared to the previous version, it retains
support for platform devices. It does however remove the platform_data
header file. The needed GPIOs are now passed by making use of a gpiod
lookup table. e.g:

static struct gpiod_lookup_table zii_scu_mdio_gpiod_table = {
	.dev_id = "mdio-gpio.0",
	.table = {
		GPIO_LOOKUP_IDX("gpio_ich", 17, NULL, MDIO_GPIO_MDC,
				GPIO_ACTIVE_HIGH),
		GPIO_LOOKUP_IDX("gpio_ich", 2, NULL, MDIO_GPIO_MDIO,
				GPIO_ACTIVE_HIGH),
		GPIO_LOOKUP_IDX("gpio_ich", 21, NULL, MDIO_GPIO_MDO,
				GPIO_ACTIVE_LOW),
	},
};
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3f4fe759 0207dd11

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -5321,7 +5321,6 @@ F: include/linux/*mdio*.h 
F:	include/linux/of_net.h

F:	include/linux/phy.h

F:	include/linux/phy_fixed.h

F:	include/linux/platform_data/mdio-gpio.h

F:	include/linux/platform_data/mdio-bcm-unimac.h

F:	include/trace/events/mdio.h

F:	include/uapi/linux/mdio.h

drivers/net/phy/mdio-bitbang.c

+0 −9
Original line number Diff line number Diff line
@@ -205,14 +205,6 @@ static int mdiobb_write(struct mii_bus *bus, int phy, int reg, u16 val) 
	return 0;

}



static int mdiobb_reset(struct mii_bus *bus)

{

	struct mdiobb_ctrl *ctrl = bus->priv;

	if (ctrl->reset)

		ctrl->reset(bus);

	return 0;

}



struct mii_bus *alloc_mdio_bitbang(struct mdiobb_ctrl *ctrl)

{

	struct mii_bus *bus;
@@ -225,7 +217,6 @@ struct mii_bus *alloc_mdio_bitbang(struct mdiobb_ctrl *ctrl) 


	bus->read = mdiobb_read;

	bus->write = mdiobb_write;

	bus->reset = mdiobb_reset;

	bus->priv = ctrl;



	return bus;

drivers/net/phy/mdio-gpio.c

+31 −91
Original line number Diff line number Diff line
@@ -24,8 +24,10 @@ 
#include <linux/slab.h>

#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/mdio-bitbang.h>

#include <linux/mdio-gpio.h>

#include <linux/gpio.h>

#include <linux/platform_data/mdio-gpio.h>

#include <linux/gpio/consumer.h>



#include <linux/of_gpio.h>

#include <linux/of_mdio.h>
@@ -35,37 +37,22 @@ struct mdio_gpio_info { 
	struct gpio_desc *mdc, *mdio, *mdo;

};



static void *mdio_gpio_of_get_data(struct platform_device *pdev)

static int mdio_gpio_get_data(struct device *dev,

			      struct mdio_gpio_info *bitbang)

{

	struct device_node *np = pdev->dev.of_node;

	struct mdio_gpio_platform_data *pdata;

	enum of_gpio_flags flags;

	int ret;



	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);

	if (!pdata)

		return NULL;



	ret = of_get_gpio_flags(np, 0, &flags);

	if (ret < 0)

		return NULL;



	pdata->mdc = ret;

	pdata->mdc_active_low = flags & OF_GPIO_ACTIVE_LOW;



	ret = of_get_gpio_flags(np, 1, &flags);

	if (ret < 0)

		return NULL;

	pdata->mdio = ret;

	pdata->mdio_active_low = flags & OF_GPIO_ACTIVE_LOW;



	ret = of_get_gpio_flags(np, 2, &flags);

	if (ret > 0) {

		pdata->mdo = ret;

		pdata->mdo_active_low = flags & OF_GPIO_ACTIVE_LOW;

	}



	return pdata;

	bitbang->mdc = devm_gpiod_get_index(dev, NULL, MDIO_GPIO_MDC,

					    GPIOD_OUT_LOW);

	if (IS_ERR(bitbang->mdc))

		return PTR_ERR(bitbang->mdc);



	bitbang->mdio = devm_gpiod_get_index(dev, NULL, MDIO_GPIO_MDIO,

					     GPIOD_IN);

	if (IS_ERR(bitbang->mdio))

		return PTR_ERR(bitbang->mdio);



	bitbang->mdo = devm_gpiod_get_index_optional(dev, NULL, MDIO_GPIO_MDO,

						     GPIOD_OUT_LOW);

	return PTR_ERR_OR_ZERO(bitbang->mdo);

}



static void mdio_dir(struct mdiobb_ctrl *ctrl, int dir)
@@ -125,78 +112,28 @@ static const struct mdiobb_ops mdio_gpio_ops = { 
};



static struct mii_bus *mdio_gpio_bus_init(struct device *dev,

					  struct mdio_gpio_platform_data *pdata,

					  struct mdio_gpio_info *bitbang,

					  int bus_id)

{

	struct mii_bus *new_bus;

	struct mdio_gpio_info *bitbang;

	int i;

	int mdc, mdio, mdo;

	unsigned long mdc_flags = GPIOF_OUT_INIT_LOW;

	unsigned long mdio_flags = GPIOF_DIR_IN;

	unsigned long mdo_flags = GPIOF_OUT_INIT_HIGH;



	bitbang = devm_kzalloc(dev, sizeof(*bitbang), GFP_KERNEL);

	if (!bitbang)

		goto out;



	bitbang->ctrl.ops = &mdio_gpio_ops;

	bitbang->ctrl.reset = pdata->reset;

	mdc = pdata->mdc;

	bitbang->mdc = gpio_to_desc(mdc);

	if (pdata->mdc_active_low)

		mdc_flags = GPIOF_OUT_INIT_HIGH | GPIOF_ACTIVE_LOW;

	mdio = pdata->mdio;

	bitbang->mdio = gpio_to_desc(mdio);

	if (pdata->mdio_active_low)

		mdio_flags |= GPIOF_ACTIVE_LOW;

	mdo = pdata->mdo;

	if (mdo) {

		bitbang->mdo = gpio_to_desc(mdo);

		if (pdata->mdo_active_low)

			mdo_flags = GPIOF_OUT_INIT_LOW | GPIOF_ACTIVE_LOW;

	}



	new_bus = alloc_mdio_bitbang(&bitbang->ctrl);

	if (!new_bus)

		goto out;



	new_bus->name = "GPIO Bitbanged MDIO",

		return NULL;



	new_bus->phy_mask = pdata->phy_mask;

	new_bus->phy_ignore_ta_mask = pdata->phy_ignore_ta_mask;

	memcpy(new_bus->irq, pdata->irqs, sizeof(new_bus->irq));

	new_bus->name = "GPIO Bitbanged MDIO";

	new_bus->parent = dev;



	if (new_bus->phy_mask == ~0)

		goto out_free_bus;



	for (i = 0; i < PHY_MAX_ADDR; i++)

		if (!new_bus->irq[i])

			new_bus->irq[i] = PHY_POLL;



	if (bus_id != -1)

		snprintf(new_bus->id, MII_BUS_ID_SIZE, "gpio-%x", bus_id);

	else

		strncpy(new_bus->id, "gpio", MII_BUS_ID_SIZE);



	if (devm_gpio_request_one(dev, mdc, mdc_flags, "mdc"))

		goto out_free_bus;



	if (devm_gpio_request_one(dev, mdio, mdio_flags, "mdio"))

		goto out_free_bus;



	if (mdo && devm_gpio_request_one(dev, mdo, mdo_flags, "mdo"))

		goto out_free_bus;



	dev_set_drvdata(dev, new_bus);



	return new_bus;



out_free_bus:

	free_mdio_bitbang(new_bus);

out:

	return NULL;

}



static void mdio_gpio_bus_deinit(struct device *dev)
@@ -216,26 +153,29 @@ static void mdio_gpio_bus_destroy(struct device *dev) 


static int mdio_gpio_probe(struct platform_device *pdev)

{

	struct mdio_gpio_platform_data *pdata;

	struct mdio_gpio_info *bitbang;

	struct mii_bus *new_bus;

	int ret, bus_id;



	bitbang = devm_kzalloc(&pdev->dev, sizeof(*bitbang), GFP_KERNEL);

	if (!bitbang)

		return -ENOMEM;



	ret = mdio_gpio_get_data(&pdev->dev, bitbang);

	if (ret)

		return ret;



	if (pdev->dev.of_node) {

		pdata = mdio_gpio_of_get_data(pdev);

		bus_id = of_alias_get_id(pdev->dev.of_node, "mdio-gpio");

		if (bus_id < 0) {

			dev_warn(&pdev->dev, "failed to get alias id\n");

			bus_id = 0;

		}

	} else {

		pdata = dev_get_platdata(&pdev->dev);

		bus_id = pdev->id;

	}



	if (!pdata)

		return -ENODEV;



	new_bus = mdio_gpio_bus_init(&pdev->dev, pdata, bus_id);

	new_bus = mdio_gpio_bus_init(&pdev->dev, bitbang, bus_id);

	if (!new_bus)

		return -ENODEV;

include/linux/mdio-bitbang.h

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ struct mdiobb_ops { 


struct mdiobb_ctrl {

	const struct mdiobb_ops *ops;

	/* reset callback */

	int (*reset)(struct mii_bus *bus);

};



/* The returned bus is not yet registered with the phy layer. */

include/linux/mdio-gpio.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __LINUX_MDIO_GPIO_H

#define __LINUX_MDIO_GPIO_H



#define MDIO_GPIO_MDC	0

#define MDIO_GPIO_MDIO	1

#define MDIO_GPIO_MDO	2



#endif