diff options
author | Sean Paul <seanpaul@chromium.org> | 2018-02-16 23:47:43 +0300 |
---|---|---|
committer | Sean Paul <seanpaul@chromium.org> | 2018-02-16 23:47:43 +0300 |
commit | d4da404f36b24b089d20db1fb27d8f99cb66f409 (patch) | |
tree | 349c4b792281826652eb9e6d7a46ed6622dc90de /Documentation/devicetree/bindings/net/fsl-fec.txt | |
parent | fa4127c5eb8def998fd8a471d51a4f2560dea0a2 (diff) | |
parent | 933519a5a269d8460450545adefcb5caec622cac (diff) | |
download | linux-d4da404f36b24b089d20db1fb27d8f99cb66f409.tar.xz |
Merge airlied/drm-next into drm-misc-next
Backmerge 4.15 and hdcp topic branch
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'Documentation/devicetree/bindings/net/fsl-fec.txt')
-rw-r--r-- | Documentation/devicetree/bindings/net/fsl-fec.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/net/fsl-fec.txt b/Documentation/devicetree/bindings/net/fsl-fec.txt index f0dc94409107..2d41fb96ce0a 100644 --- a/Documentation/devicetree/bindings/net/fsl-fec.txt +++ b/Documentation/devicetree/bindings/net/fsl-fec.txt @@ -59,7 +59,7 @@ ethernet@83fec000 { reg = <0x83fec000 0x4000>; interrupts = <87>; phy-mode = "mii"; - phy-reset-gpios = <&gpio2 14 0>; /* GPIO2_14 */ + phy-reset-gpios = <&gpio2 14 GPIO_ACTIVE_LOW>; /* GPIO2_14 */ local-mac-address = [00 04 9F 01 1B B9]; phy-supply = <®_fec_supply>; }; @@ -71,7 +71,7 @@ ethernet@83fec000 { reg = <0x83fec000 0x4000>; interrupts = <87>; phy-mode = "mii"; - phy-reset-gpios = <&gpio2 14 0>; /* GPIO2_14 */ + phy-reset-gpios = <&gpio2 14 GPIO_ACTIVE_LOW>; /* GPIO2_14 */ local-mac-address = [00 04 9F 01 1B B9]; phy-supply = <®_fec_supply>; phy-handle = <ðphy>; |