From 899805a638937d2ed715a1a7fca5dc1991b2c64e Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Wed, 27 Jun 2012 03:45:23 +0000 Subject: [PATCH] --- yaml --- r: 314683 b: refs/heads/master c: c9040af264de8a425b0efabfcc18a6ce47d0f21f h: refs/heads/master i: 314681: a62a290c6c6912b226777b179ee9bb31471be86b 314679: ed65172097a68ac5f5a3c85869f4e582c9b84f04 v: v3 --- [refs] | 2 +- trunk/Documentation/devicetree/bindings/net/fsl-fec.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1cf5a26e5622..1037b0a588ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 119fc007766fc6ec6cff0f696d73cebb6f2cbe58 +refs/heads/master: c9040af264de8a425b0efabfcc18a6ce47d0f21f diff --git a/trunk/Documentation/devicetree/bindings/net/fsl-fec.txt b/trunk/Documentation/devicetree/bindings/net/fsl-fec.txt index 7ab9e1a2d8be..0428920aacc7 100644 --- a/trunk/Documentation/devicetree/bindings/net/fsl-fec.txt +++ b/trunk/Documentation/devicetree/bindings/net/fsl-fec.txt @@ -7,10 +7,10 @@ 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 Example: