diff options
| author | Mugunthan V N <mugunthanvnm@ti.com> | 2013-03-11 19:16:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-13 04:38:19 -0400 |
| commit | e86ac13b031cf71d8f40ff513e627aac80e6b765 (patch) | |
| tree | 8f0027221533ef8b9ad028504f406505cd2ba205 /Documentation | |
| parent | 470d147428563aba9c2eb7c019383335249c6110 (diff) | |
drivers: net: ethernet: cpsw: change cpts_active_slave to active_slave
Change cpts_active_slave to active_slave so that the same DT property
can be used to ethtool and SIOCGMIIPHY.
CC: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/net/cpsw.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt index 8e49c4200928..4f2ca6b4a182 100644 --- a/Documentation/devicetree/bindings/net/cpsw.txt +++ b/Documentation/devicetree/bindings/net/cpsw.txt | |||
| @@ -15,7 +15,8 @@ Required properties: | |||
| 15 | - mac_control : Specifies Default MAC control register content | 15 | - mac_control : Specifies Default MAC control register content |
| 16 | for the specific platform | 16 | for the specific platform |
| 17 | - slaves : Specifies number for slaves | 17 | - slaves : Specifies number for slaves |
| 18 | - cpts_active_slave : Specifies the slave to use for time stamping | 18 | - active_slave : Specifies the slave to use for time stamping, |
| 19 | ethtool and SIOCGMIIPHY | ||
| 19 | - cpts_clock_mult : Numerator to convert input clock ticks into nanoseconds | 20 | - cpts_clock_mult : Numerator to convert input clock ticks into nanoseconds |
| 20 | - cpts_clock_shift : Denominator to convert input clock ticks into nanoseconds | 21 | - cpts_clock_shift : Denominator to convert input clock ticks into nanoseconds |
| 21 | 22 | ||
| @@ -52,7 +53,7 @@ Examples: | |||
| 52 | rx_descs = <64>; | 53 | rx_descs = <64>; |
| 53 | mac_control = <0x20>; | 54 | mac_control = <0x20>; |
| 54 | slaves = <2>; | 55 | slaves = <2>; |
| 55 | cpts_active_slave = <0>; | 56 | active_slave = <0>; |
| 56 | cpts_clock_mult = <0x80000000>; | 57 | cpts_clock_mult = <0x80000000>; |
| 57 | cpts_clock_shift = <29>; | 58 | cpts_clock_shift = <29>; |
| 58 | cpsw_emac0: slave@0 { | 59 | cpsw_emac0: slave@0 { |
| @@ -78,7 +79,7 @@ Examples: | |||
| 78 | rx_descs = <64>; | 79 | rx_descs = <64>; |
| 79 | mac_control = <0x20>; | 80 | mac_control = <0x20>; |
| 80 | slaves = <2>; | 81 | slaves = <2>; |
| 81 | cpts_active_slave = <0>; | 82 | active_slave = <0>; |
| 82 | cpts_clock_mult = <0x80000000>; | 83 | cpts_clock_mult = <0x80000000>; |
| 83 | cpts_clock_shift = <29>; | 84 | cpts_clock_shift = <29>; |
| 84 | cpsw_emac0: slave@0 { | 85 | cpsw_emac0: slave@0 { |