From: David S. Miller <davem@davemloft.net>
Date: Wed, 21 Oct 2015 13:41:51 +0000 (-0700)
Subject: Merge branch 'smsc-energy-detect'
X-Git-Tag: firefly_0821_release~176^2~865^2~53
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=f3c9f95056acab715328ee63a80ddf5fd32c0a28;p=firefly-linux-kernel-4.4.55.git

Merge branch 'smsc-energy-detect'

Heiko Schocher says:

====================
net, phy, smsc: add posibility to disable energy detect mode

On some boards the energy enable detect mode leads in
trouble with some switches, so make the enabling of
this mode configurable through DT.
Therefore the property "smsc,disable-energy-detect" is
introduced.

Patch 1 introduces phy-handle support for the ti,cpsw
driver. This is needed now for the smsc phy.

Patch 2 adds the disable energy mode functionality
to the smsc phy

Changes in v2:
- add comments from Florian Fainelli
  - I did not change disable property name into enable
    because I fear to break existing behaviour
  - add smsc vendor prefix
  - remove CONFIG_OF and use __maybe_unused
  - introduce "phy-handle" ability into ti,cpsw
    driver, so I can remove bogus:
      if (!of_node && dev->parent->of_node)
          of_node = dev->parent->of_node;
    construct. Therefore new patch for the ti,cpsw
    driver is necessary.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

f3c9f95056acab715328ee63a80ddf5fd32c0a28