diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-13 04:38:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-13 04:38:27 -0400 |
| commit | 99eee14a14ec8bf36c0705a038fa8d00917fb679 (patch) | |
| tree | 2c18692aae9f239b5748e5e973d0d71815e5286b /include | |
| parent | c1ad32af5ec281bf30d2ca4fa20415bd2edef181 (diff) | |
| parent | 11f2c988382b880e602a005c26436043c5d2c274 (diff) | |
Merge branch 'cpsw'
Mugunthan V N says:
====================
This patch serires implements the following features in CPSW driver
* get/set phy link settings
* interrupt pacing
* get phy id via ioctl cmd SIOCGMIIPHY
Changes from initial version
* Made active-slave common for cpts, ethtool and SIOCGMIIPHY ioctl
* Cleaned CPSW DT binding documentation by seperating slave nodes
under sub-section
* implemented get phy id via ioctl cmd SIOCGMIIPHY
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/cpsw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/platform_data/cpsw.h b/include/linux/platform_data/cpsw.h index 798fb80b024b..bb3cd58d71e3 100644 --- a/include/linux/platform_data/cpsw.h +++ b/include/linux/platform_data/cpsw.h @@ -30,7 +30,7 @@ struct cpsw_platform_data { u32 channels; /* number of cpdma channels (symmetric) */ u32 slaves; /* number of slave cpgmac ports */ struct cpsw_slave_data *slave_data; - u32 cpts_active_slave; /* time stamping slave */ + u32 active_slave; /* time stamping, ethtool and SIOCGMIIPHY slave */ u32 cpts_clock_mult; /* convert input clock ticks to nanoseconds */ u32 cpts_clock_shift; /* convert input clock ticks to nanoseconds */ u32 ale_entries; /* ale table size */ |