aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/am33xx.dtsi
diff options
context:
space:
mode:
authorMugunthan V N <mugunthanvnm@ti.com>2013-03-11 19:16:35 -0400
committerDavid S. Miller <davem@davemloft.net>2013-03-13 04:38:19 -0400
commite86ac13b031cf71d8f40ff513e627aac80e6b765 (patch)
tree8f0027221533ef8b9ad028504f406505cd2ba205 /arch/arm/boot/dts/am33xx.dtsi
parent470d147428563aba9c2eb7c019383335249c6110 (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 'arch/arm/boot/dts/am33xx.dtsi')
-rw-r--r--arch/arm/boot/dts/am33xx.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 0957645b73af..91fe4f148f80 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -349,7 +349,7 @@
349 rx_descs = <64>; 349 rx_descs = <64>;
350 mac_control = <0x20>; 350 mac_control = <0x20>;
351 slaves = <2>; 351 slaves = <2>;
352 cpts_active_slave = <0>; 352 active_slave = <0>;
353 cpts_clock_mult = <0x80000000>; 353 cpts_clock_mult = <0x80000000>;
354 cpts_clock_shift = <29>; 354 cpts_clock_shift = <29>;
355 reg = <0x4a100000 0x800 355 reg = <0x4a100000 0x800