diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-22 03:44:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-22 03:44:59 -0400 |
| commit | 8fd90bb889635fa1e7f80a3950948cc2e74c1446 (patch) | |
| tree | 1490343b5ad9f88b9333e53fa9457c00cbf6c2d1 /Documentation/devicetree | |
| parent | 1bb4238b17b5de6cdc120970a9d00dd8a44f40df (diff) | |
| parent | 15ba2236f3556fc01b9ca91394465152b5ea74b6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/infiniband/hw/cxgb4/device.c
The cxgb4 conflict was simply overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt b/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt index f055515d2b62..366690cb86a3 100644 --- a/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt +++ b/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt | |||
| @@ -8,10 +8,12 @@ Both required and optional properties listed below must be defined | |||
| 8 | under node /cpus/cpu@0. | 8 | under node /cpus/cpu@0. |
| 9 | 9 | ||
| 10 | Required properties: | 10 | Required properties: |
| 11 | - operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt | 11 | - None |
| 12 | for details | ||
| 13 | 12 | ||
| 14 | Optional properties: | 13 | Optional properties: |
| 14 | - operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt for | ||
| 15 | details. OPPs *must* be supplied either via DT, i.e. this property, or | ||
| 16 | populated at runtime. | ||
| 15 | - clock-latency: Specify the possible maximum transition latency for clock, | 17 | - clock-latency: Specify the possible maximum transition latency for clock, |
| 16 | in unit of nanoseconds. | 18 | in unit of nanoseconds. |
| 17 | - voltage-tolerance: Specify the CPU voltage tolerance in percentage. | 19 | - voltage-tolerance: Specify the CPU voltage tolerance in percentage. |