lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: mdio-gpio: Add support for separate MDI and MDO gpio pins

Browse Source 
This is for a system with fixed assignments of input and output pins
(various variants of Kontron COMe).

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Guenter Roeck
2014-04-15 19:16:42 -07:00
committed by David S. Miller
parent 1d2514818a
commit f1d54c4750
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/net/phy/mdio-gpio.c
View File

@@ -32,8 +32,8 @@
struct mdio_gpio_info { struct mdio_gpio_info {
struct mdiobb_ctrl ctrl; struct mdiobb_ctrl ctrl;
int mdc, mdio; int mdc, mdio, mdo;
int mdc_active_low, mdio_active_low; int mdc_active_low, mdio_active_low, mdo_active_low;
}; };
static void *mdio_gpio_of_get_data(struct platform_device *pdev) static void *mdio_gpio_of_get_data(struct platform_device *pdev)
@@ -60,6 +60,12 @@ static void *mdio_gpio_of_get_data(struct platform_device *pdev)
pdata->mdio = ret; pdata->mdio = ret;
pdata->mdio_active_low = flags & OF_GPIO_ACTIVE_LOW; 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; return pdata;
} }
@@ -68,6 +74,16 @@ static void mdio_dir(struct mdiobb_ctrl *ctrl, int dir)
struct mdio_gpio_info *bitbang = struct mdio_gpio_info *bitbang =
container_of(ctrl, struct mdio_gpio_info, ctrl); container_of(ctrl, struct mdio_gpio_info, ctrl);
if (bitbang->mdo) {
/* Separate output pin. Always set its value to high
* when changing direction. If direction is input,
* assume the pin serves as pull-up. If direction is
* output, the default value is high.
*/
gpio_set_value(bitbang->mdo, 1 ^ bitbang->mdo_active_low);
return;
}
if (dir) if (dir)
gpio_direction_output(bitbang->mdio, gpio_direction_output(bitbang->mdio,
1 ^ bitbang->mdio_active_low); 1 ^ bitbang->mdio_active_low);
@@ -88,7 +104,10 @@ static void mdio_set(struct mdiobb_ctrl *ctrl, int what)
struct mdio_gpio_info *bitbang = struct mdio_gpio_info *bitbang =
container_of(ctrl, struct mdio_gpio_info, ctrl); container_of(ctrl, struct mdio_gpio_info, ctrl);
gpio_set_value(bitbang->mdio, what ^ bitbang->mdio_active_low); if (bitbang->mdo)
gpio_set_value(bitbang->mdo, what ^ bitbang->mdo_active_low);
else
gpio_set_value(bitbang->mdio, what ^ bitbang->mdio_active_low);
} }
static void mdc_set(struct mdiobb_ctrl *ctrl, int what) static void mdc_set(struct mdiobb_ctrl *ctrl, int what)
@@ -125,6 +144,8 @@ static struct mii_bus *mdio_gpio_bus_init(struct device *dev,
bitbang->mdc_active_low = pdata->mdc_active_low; bitbang->mdc_active_low = pdata->mdc_active_low;
bitbang->mdio = pdata->mdio; bitbang->mdio = pdata->mdio;
bitbang->mdio_active_low = pdata->mdio_active_low; bitbang->mdio_active_low = pdata->mdio_active_low;
bitbang->mdo = pdata->mdo;
bitbang->mdo_active_low = pdata->mdo_active_low;
new_bus = alloc_mdio_bitbang(&bitbang->ctrl); new_bus = alloc_mdio_bitbang(&bitbang->ctrl);
if (!new_bus) if (!new_bus)
@@ -151,6 +172,13 @@ static struct mii_bus *mdio_gpio_bus_init(struct device *dev,
if (devm_gpio_request(dev, bitbang->mdio, "mdio")) if (devm_gpio_request(dev, bitbang->mdio, "mdio"))
goto out_free_bus; goto out_free_bus;
if (bitbang->mdo) {
if (devm_gpio_request(dev, bitbang->mdo, "mdo"))
goto out_free_bus;
gpio_direction_output(bitbang->mdo, 1);
gpio_direction_input(bitbang->mdio);
}
gpio_direction_output(bitbang->mdc, 0); gpio_direction_output(bitbang->mdc, 0);
dev_set_drvdata(dev, new_bus); dev_set_drvdata(dev, new_bus);

2
include/linux/mdio-gpio.h
View File

@@ -17,9 +17,11 @@ struct mdio_gpio_platform_data {
/* GPIO numbers for bus pins */ /* GPIO numbers for bus pins */
unsigned int mdc; unsigned int mdc;
unsigned int mdio; unsigned int mdio;
unsigned int mdo;
bool mdc_active_low; bool mdc_active_low;
bool mdio_active_low; bool mdio_active_low;
bool mdo_active_low;
unsigned int phy_mask; unsigned int phy_mask;
int irqs[PHY_MAX_ADDR]; int irqs[PHY_MAX_ADDR];