The series makes a few updates on fec driver to make it work better
for device tree boot.
Shawn Guo (3):
net: fec: reset phy after pinctrl setup
net: fec: enable regulator for fec phy
net: fec: add phy-reset-interval for device tree probe
Documentation/devicetree/bindings/net/fsl-fec.txt | 5 ++++-
drivers/net/ethernet/freescale/fec.c | 21 ++++++++++++++++++---
2 files changed, 22 insertions(+), 4 deletions(-)
--
1.7.5.4
In case that bootloader or platform initialization does not set up
fec pins, the fec_reset_phy will not be able to succeed, because
fec_reset_phy is currently called before devm_pinctrl_get_select_default.
Move fec_reset_phy call to the place between devm_pinctrl_get_select_default
and fec_enet_init to have above case be taken care.
Signed-off-by: Shawn Guo <redacted>
---
drivers/net/ethernet/freescale/fec.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
If bootloader or platform initialization code does not enable the
power supply to fec phy, we need to do it in fec driver before calling
fec_reset_phy to have the phy powered on.
Signed-off-by: Shawn Guo <redacted>
---
drivers/net/ethernet/freescale/fec.c | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
Different boards may require different phy reset interval time. Add
property phy-reset-interval for device tree probe, so that the boards
that need a longer interval time can specify it in their device tree.
Along with the update to phy related stuff, it also makes a minor fix
on phy-reset-gpios in binding document to have it be optional to match
the driver code.
Signed-off-by: Shawn Guo <redacted>
---
Documentation/devicetree/bindings/net/fsl-fec.txt | 5 ++++-
drivers/net/ethernet/freescale/fec.c | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
@@ -7,10 +7,13 @@ Required properties: - phy-mode : String, operation mode of the PHY interface. Supported values are: "mii", "gmii", "sgmii", "tbi", "rmii", "rgmii", "rgmii-id", "rgmii-rxid", "rgmii-txid", "rtbi", "smii".-- phy-reset-gpios : Should specify the gpio for phy reset Optional properties: - local-mac-address : 6 bytes, mac address+- phy-reset-gpios : Should specify the gpio for phy reset+- phy-reset-interval : Reset interval time in milliseconds. Should present+ only if property "phy-reset-gpios" is available. When "phy-reset-gpios"+ is available, missing the property will have the interval be 1 millisecond. Example:
Different boards may require different phy reset interval time. Add
property phy-reset-interval for device tree probe, so that the boards
that need a longer interval time can specify it in their device tree.
'phy-reset-duration' would be a more appropriate name.
Lothar Waßmann
--
___________________________________________________________
Ka-Ro electronics GmbH | Pascalstraße 22 | D - 52076 Aachen
Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10
Geschäftsführer: Matthias Kaussen
Handelsregistereintrag: Amtsgericht Aachen, HRB 4996
www.karo-electronics.de | info@karo-electronics.de
___________________________________________________________
On Tue, Jun 26, 2012 at 11:11:35AM +0200, Lothar Waßmann wrote:
Hi,
Shawn Guo writes:
quoted
Different boards may require different phy reset interval time. Add
property phy-reset-interval for device tree probe, so that the boards
that need a longer interval time can specify it in their device tree.
'phy-reset-duration' would be a more appropriate name.
Hi,
On Tuesday 26 June 2012 16:45:08 Shawn Guo wrote:
quoted hunk
Different boards may require different phy reset interval time. Add
property phy-reset-interval for device tree probe, so that the boards
that need a longer interval time can specify it in their device tree.
Along with the update to phy related stuff, it also makes a minor fix
on phy-reset-gpios in binding document to have it be optional to match
the driver code.
Signed-off-by: Shawn Guo <redacted>
---
Documentation/devicetree/bindings/net/fsl-fec.txt | 5 ++++-
drivers/net/ethernet/freescale/fec.c | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
@@ -7,10 +7,13 @@ Required properties: - phy-mode : String, operation mode of the PHY interface. Supported values are: "mii", "gmii", "sgmii", "tbi", "rmii", "rgmii", "rgmii-id", "rgmii-rxid", "rgmii-txid", "rtbi", "smii".-- phy-reset-gpios : Should specify the gpio for phy reset Optional properties: - local-mac-address : 6 bytes, mac address+- phy-reset-gpios : Should specify the gpio for phy reset+- phy-reset-interval : Reset interval time in milliseconds. Should present+ only if property "phy-reset-gpios" is available. When "phy-reset-gpios"+ is available, missing the property will have the interval be 1
@@ -1507,18 +1507,20 @@ static int __devinit fec_get_phy_mode_dt(struct
platform_device *pdev)
static void __devinit fec_reset_phy(struct platform_device *pdev)
{
int err, phy_reset;
+ int msec = 1;
struct device_node *np = pdev->dev.of_node;
if (!np)
return;
+ of_property_read_u32(np, "phy-reset-interval", &msec);
phy_reset = of_get_named_gpio(np, "phy-reset-gpios", 0);
err = gpio_request_one(phy_reset, GPIOF_OUT_INIT_LOW, "phy-reset");
if (err) {
pr_debug("FEC: failed to get gpio phy-reset: %d\n", err);
return;
}
- msleep(1);
+ msleep(msec);
You might want to check the value of the property here to make sure it is in
the msleep() acceptable range.
gpio_set_value(phy_reset, 1);
}
#else /* CONFIG_OF */
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html