diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-08-22 04:04:15 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-08-22 04:04:15 -0400 |
commit | 80b304fd00e8b667775ff791121b61ecd7cd0c03 (patch) | |
tree | b4f2ec59fe062c43343ee4c2f10a6bcd0e4dcd1b /Documentation/devicetree/bindings/phy/phy-bindings.txt | |
parent | fb21b84e7f809ef04b1e5aed5d463cf0d4866638 (diff) | |
parent | 6a7519e81321343165f89abb8b616df186d3e57a (diff) |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent
Pull EFI fixes from Matt Fleming:
* WARN_ON(!spin_is_locked()) always triggers on non-SMP machines.
Swap it for the more canonical lockdep_assert_held() which always
does the right thing - Guenter Roeck
* Assign the correct value to efi.runtime_version on arm64 so that all
the runtime services can be invoked - Semen Protsenko
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/phy/phy-bindings.txt')
-rw-r--r-- | Documentation/devicetree/bindings/phy/phy-bindings.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/phy/phy-bindings.txt b/Documentation/devicetree/bindings/phy/phy-bindings.txt index 8ae844fc0c60..2aa1840200ed 100644 --- a/Documentation/devicetree/bindings/phy/phy-bindings.txt +++ b/Documentation/devicetree/bindings/phy/phy-bindings.txt | |||
@@ -10,6 +10,10 @@ Required Properties: | |||
10 | provider can use the values in cells to find the appropriate | 10 | provider can use the values in cells to find the appropriate |
11 | PHY. | 11 | PHY. |
12 | 12 | ||
13 | Optional Properties: | ||
14 | phy-supply: Phandle to a regulator that provides power to the PHY. This | ||
15 | regulator will be managed during the PHY power on/off sequence. | ||
16 | |||
13 | For example: | 17 | For example: |
14 | 18 | ||
15 | phys: phy { | 19 | phys: phy { |