On 05/16/2016 11:52 AM, Alexander Graf wrote:
> If you compile without OF_MDIO support in an RGMII configuration, we fail
> to configure the dp83867 phy today by writing garbage into its configuration
> registers.
>
> On the other hand if you do compile with OF_MDIO and the phy gets loaded via
> device tree, you have to have the properties set in the device tree, otherwise
> we fail to load the driver and don't even attach the generic phy driver to
> the interface anymore.
>
> To make things slightly more consistent, make the rgmii configuration
> properties
> optional and allow a user to omit them in their device tree.
>
> Signed-off-by: Alexander Graf <ag...@suse.de>
> ---
> drivers/net/phy/dp83867.c | 31 ++++++++++++++++++++++++++++---
> 1 file changed, 28 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
> index 94cc278..1b01680 100644
> --- a/drivers/net/phy/dp83867.c
> +++ b/drivers/net/phy/dp83867.c
> @@ -65,6 +65,7 @@ struct dp83867_private {
> int rx_id_delay;
> int tx_id_delay;
> int fifo_depth;
> + int values_are_sane;
This could be a boolean type.
> };
>
> static int dp83867_ack_interrupt(struct phy_device *phydev)
> @@ -113,15 +114,30 @@ static int dp83867_of_init(struct phy_device *phydev)
> ret = of_property_read_u32(of_node, "ti,rx-internal-delay",
> &dp83867->rx_id_delay);
> if (ret)
> - return ret;
> + goto invalid_dt;
>
> ret = of_property_read_u32(of_node, "ti,tx-internal-delay",
> &dp83867->tx_id_delay);
> if (ret)
> - return ret;
> + goto invalid_dt;
>
> - return of_property_read_u32(of_node, "ti,fifo-depth",
> + ret = of_property_read_u32(of_node, "ti,fifo-depth",
> &dp83867->fifo_depth);
> + if (ret)
> + goto invalid_dt;
> +
> + dp83867->values_are_sane = 1;
> +
> + return 0;
> +
> +invalid_dt:
> + phydev_err(phydev, "missing properties in device tree");
phydev_warn() maybe?
Other than that, this looks okay to me.
--
Florian
