diff options
| author | Mugunthan V N <mugunthanvnm@ti.com> | 2013-03-11 23:16:35 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-13 04:38:19 -0400 |
| commit | e86ac13b031cf71d8f40ff513e627aac80e6b765 (patch) | |
| tree | 8f0027221533ef8b9ad028504f406505cd2ba205 /arch/arm/boot | |
| parent | 470d147428563aba9c2eb7c019383335249c6110 (diff) | |
| download | op-kernel-dev-e86ac13b031cf71d8f40ff513e627aac80e6b765.zip op-kernel-dev-e86ac13b031cf71d8f40ff513e627aac80e6b765.tar.gz | |
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 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/am33xx.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index 0957645..91fe4f1 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -349,7 +349,7 @@ rx_descs = <64>; mac_control = <0x20>; slaves = <2>; - cpts_active_slave = <0>; + active_slave = <0>; cpts_clock_mult = <0x80000000>; cpts_clock_shift = <29>; reg = <0x4a100000 0x800 |
