pps-aesthetic-tweaks-to-pps-related-content.patch removed from -mm tree
The patch titled
Subject: drivers/pps: aesthetic tweaks to PPS-related content
has been removed from the -mm tree. Its filename was
pps-aesthetic-tweaks-to-pps-related-content.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: "Robert P. J. Day" <[email protected]>
Subject: drivers/pps: aesthetic tweaks to PPS-related content
Collection of aesthetic adjustments to various PPS-related files, directories and Documentation, some quite minor just for the sake of consistency, including:
* Updated example of pps device tree node (courtesy Rodolfo G.)
* "PPS-API" -> "PPS API"
* "pps_source_info_s" -> "pps_source_info"
* "ktimer driver" -> "pps-ktimer driver"
* "ppstest /dev/pps0" -> "ppstest /dev/pps1" to match example
* Add missing PPS-related entries to MAINTAINERS file
* Other trivialities
Signed-off-by Robert P. J. Day <[email protected]>
Acked-by Rodolfo Giometti <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
Documentation/devicetree/bindings/pps/pps-gpio.txt | 8 +- Documentation/pps/pps.txt | 44 +++++------ MAINTAINERS | 3 include/linux/pps-gpio.h | 2 include/linux/pps_kernel.h | 16 +--- include/uapi/linux/pps.h | 4 - kernel/time/timekeeping.c | 2 7 files changed, 43 insertions(+), 36 deletions(-)
Documentation/devicetree/bindings/pps/pps-gpio.txt renamed from Documentation/devicetree/bindings/pps/pps-gpio.txt~pps-aesthetic-tweaks-to-pps-related-content +6 -2
@@ -13,8 +13,12 @@ Optional properties: Example: pps { - compatible = "pps-gpio"; - gpios = <&gpio2 6 0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pps>; + gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>; assert-falling-edge; + + compatible = "pps-gpio"; + status = "okay"; };
Documentation/pps/pps.txt renamed from Documentation/pps/pps.txt~pps-aesthetic-tweaks-to-pps-related-content +23 -21
108 lines not on this page · raw message
MAINTAINERS renamed from MAINTAINERS~pps-aesthetic-tweaks-to-pps-related-content +3 -0
@@ -10725,8 +10725,11 @@ W: http://wiki.enneenne.com/index.php/Li L: [email protected] (subscribers-only) S: Maintained F: Documentation/pps/ +F: Documentation/devicetree/bindings/pps/pps-gpio.txt +F: Documentation/ABI/testing/sysfs-pps F: drivers/pps/ F: include/linux/pps*.h +F: include/uapi/linux/pps.h PPTP DRIVER M: Dmitry Kozlov <[email protected]>
include/linux/pps-gpio.h renamed from include/linux/pps-gpio.h~pps-aesthetic-tweaks-to-pps-related-content +1 -1
@@ -29,4 +29,4 @@ struct pps_gpio_platform_data { const char *gpio_label; }; -#endif +#endif /* _PPS_GPIO_H */
include/linux/pps_kernel.h renamed from include/linux/pps_kernel.h~pps-aesthetic-tweaks-to-pps-related-content +7 -9
@@ -22,7 +22,6 @@#define LINUX_PPS_KERNEL_H #include <linux/pps.h> -#include <linux/cdev.h> #include <linux/device.h> #include <linux/time.h>
@@ -35,9 +34,9 @@ struct pps_device;/* The specific PPS source info */ struct pps_source_info { -char name[PPS_MAX_NAME_LEN ];/* simbolic name */ +char name[PPS_MAX_NAME_LEN ];/* symbolic name */ char path[PPS_MAX_NAME_LEN ];/* path of connected device */ -int mode;/* PPS's allowed mode */ +int mode;/* PPS allowed mode */ void (*echo)(struct pps_device *pps,int event,void *data);/* PPS echo function */
@@ -57,10 +56,10 @@ struct pps_event_time {struct pps_device {struct pps_source_info info;/* PSS source info */ -struct pps_kparams params;/* PPS's current params */ +struct pps_kparams params;/* PPS current params */ -__u32 assert_sequence;/* PPS' assert event seq # */ -__u32 clear_sequence;/* PPS' clear event seq # */ +__u32 assert_sequence;/* PPS assert event seq # */ +__u32 clear_sequence;/* PPS clear event seq # */ struct pps_ktime assert_tu;struct pps_ktime clear_tu;int current_mode;/* PPS mode at event time */
@@ -69,7 +68,7 @@ struct pps_device {wait_queue_head_t queue;/* PPS event queue */ unsigned int id;/* PPS source unique ID */ -void const *lookup_cookie;/* pps_lookup_dev only */ +void const *lookup_cookie;/* For pps_lookup_dev() only */ struct cdev cdev;struct device *dev;struct fasync_struct *async_queue;/* fasync method */
@@ -101,7 +100,7 @@ extern struct pps_device *pps_register_sextern void pps_unregister_source (struct pps_device *pps);extern void pps_event (struct pps_device *pps,struct pps_event_time *ts,int event,void *data); -/* Look up a pps device by magic cookie */ +/* Look up a pps_device by magic cookie */ struct pps_device *pps_lookup_dev (void const *cookie); static inline void timespec_to_pps_ktime(struct pps_ktime *kt,
@@ -132,4 +131,3 @@ static inline void pps_sub_ts(struct pps }#endif /* LINUX_PPS_KERNEL_H */ -
include/uapi/linux/pps.h renamed from include/uapi/linux/pps.h~pps-aesthetic-tweaks-to-pps-related-content +2 -2
@@ -95,8 +95,8 @@ struct pps_kparams {#define PPS_CAPTURECLEAR 0x02/* capture clear events */ #define PPS_CAPTUREBOTH 0x03/* capture assert and clear events */ -#define PPS_OFFSETASSERT 0x10/* apply compensation for assert ev. */ -#define PPS_OFFSETCLEAR 0x20/* apply compensation for clear ev. */ +#define PPS_OFFSETASSERT 0x10/* apply compensation for assert event */ +#define PPS_OFFSETCLEAR 0x20/* apply compensation for clear event */ #define PPS_CANWAIT 0x100/* can we wait for an event? */ #define PPS_CANPOLL 0x200/* bit reserved for future use */
kernel/time/timekeeping.c renamed from kernel/time/timekeeping.c~pps-aesthetic-tweaks-to-pps-related-content +1 -1
@@ -2316,7 +2316,7 @@ void hardpps(const struct timespec64 *ph raw_spin_unlock_irqrestore(&timekeeper_lock, flags); }EXPORT_SYMBOL (hardpps); -#endif +#endif /* CONFIG_NTP_PPS */ /** * xtime_update() - advances the timekeeping infrastructure
_
Patches currently in -mm which might be from [email protected] are