diff options
-rw-r--r-- | Documentation/ABI/testing/sysfs-ptp | 6 | ||||
-rw-r--r-- | include/linux/ptp_clock_kernel.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/ABI/testing/sysfs-ptp b/Documentation/ABI/testing/sysfs-ptp index d40d2b550502..05aeedf17794 100644 --- a/Documentation/ABI/testing/sysfs-ptp +++ b/Documentation/ABI/testing/sysfs-ptp | |||
@@ -19,7 +19,11 @@ Date: September 2010 | |||
19 | Contact: Richard Cochran <richardcochran@gmail.com> | 19 | Contact: Richard Cochran <richardcochran@gmail.com> |
20 | Description: | 20 | Description: |
21 | This file contains the name of the PTP hardware clock | 21 | This file contains the name of the PTP hardware clock |
22 | as a human readable string. | 22 | as a human readable string. The purpose of this |
23 | attribute is to provide the user with a "friendly | ||
24 | name" and to help distinguish PHY based devices from | ||
25 | MAC based ones. The string does not necessarily have | ||
26 | to be any kind of unique id. | ||
23 | 27 | ||
24 | What: /sys/class/ptp/ptpN/max_adjustment | 28 | What: /sys/class/ptp/ptpN/max_adjustment |
25 | Date: September 2010 | 29 | Date: September 2010 |
diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h index 56c71b27112e..f2dc6d8fc680 100644 --- a/include/linux/ptp_clock_kernel.h +++ b/include/linux/ptp_clock_kernel.h | |||
@@ -42,7 +42,9 @@ struct ptp_clock_request { | |||
42 | * struct ptp_clock_info - decribes a PTP hardware clock | 42 | * struct ptp_clock_info - decribes a PTP hardware clock |
43 | * | 43 | * |
44 | * @owner: The clock driver should set to THIS_MODULE. | 44 | * @owner: The clock driver should set to THIS_MODULE. |
45 | * @name: A short name to identify the clock. | 45 | * @name: A short "friendly name" to identify the clock and to |
46 | * help distinguish PHY based devices from MAC based ones. | ||
47 | * The string is not meant to be a unique id. | ||
46 | * @max_adj: The maximum possible frequency adjustment, in parts per billon. | 48 | * @max_adj: The maximum possible frequency adjustment, in parts per billon. |
47 | * @n_alarm: The number of programmable alarms. | 49 | * @n_alarm: The number of programmable alarms. |
48 | * @n_ext_ts: The number of external time stamp channels. | 50 | * @n_ext_ts: The number of external time stamp channels. |