of/net/mdio-gpio: Fix pdev->id issue when using devicetrees.
When the mdio-gpio driver is probed via device trees, the platform device id is set as -1, However the pdev->id is re-used as bus-id for while creating mdio gpio bus. So For device tree case the mdio-gpio bus name appears as "gpio-ffffffff" where as for non-device tree case the bus name appears as "gpio-<bus-num>" Which means the bus_id is fixed in device tree case, so we can't have two mdio gpio buses via device trees. Assigning a logical bus number via device tree solves the problem and the bus name is much consistent with non-device tree bus name. Without this patch 1. we can't support two mdio-gpio buses via device trees. 2. we should always pass gpio-ffffffff as bus name to phy_connect, very different to non-device tree bus name. So, setting up the bus_id via aliases from device tree is the right solution and other drivers do similar thing. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
8495c0da20
commit
3272dd9b0f
|
@ -8,9 +8,16 @@ gpios property as described in section VIII.1 in the following order:
|
||||||
|
|
||||||
MDC, MDIO.
|
MDC, MDIO.
|
||||||
|
|
||||||
|
Note: Each gpio-mdio bus should have an alias correctly numbered in "aliases"
|
||||||
|
node.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
mdio {
|
aliases {
|
||||||
|
mdio-gpio0 = <&mdio0>;
|
||||||
|
};
|
||||||
|
|
||||||
|
mdio0: mdio {
|
||||||
compatible = "virtual,mdio-gpio";
|
compatible = "virtual,mdio-gpio";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
|
|
|
@ -185,17 +185,20 @@ static int __devinit mdio_gpio_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct mdio_gpio_platform_data *pdata;
|
struct mdio_gpio_platform_data *pdata;
|
||||||
struct mii_bus *new_bus;
|
struct mii_bus *new_bus;
|
||||||
int ret;
|
int ret, bus_id;
|
||||||
|
|
||||||
if (pdev->dev.of_node)
|
if (pdev->dev.of_node) {
|
||||||
pdata = mdio_gpio_of_get_data(pdev);
|
pdata = mdio_gpio_of_get_data(pdev);
|
||||||
else
|
bus_id = of_alias_get_id(pdev->dev.of_node, "mdio-gpio");
|
||||||
|
} else {
|
||||||
pdata = pdev->dev.platform_data;
|
pdata = pdev->dev.platform_data;
|
||||||
|
bus_id = pdev->id;
|
||||||
|
}
|
||||||
|
|
||||||
if (!pdata)
|
if (!pdata)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
new_bus = mdio_gpio_bus_init(&pdev->dev, pdata, pdev->id);
|
new_bus = mdio_gpio_bus_init(&pdev->dev, pdata, bus_id);
|
||||||
if (!new_bus)
|
if (!new_bus)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue