4 files changed, 15 insertions, 6 deletions

diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index 1e528b539a07..79f4bce061bd 100644
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -143,10 +143,12 @@ static int ptp_clock_adjtime(struct posix_clock *pc, struct timex *tx)
                 kt = timespec_to_ktime(ts);
                 delta = ktime_to_ns(kt);
                 err = ops->adjtime(ops, delta);
-
         } else if (tx->modes & ADJ_FREQUENCY) {
-
                 err = ops->adjfreq(ops, scaled_ppm_to_ppb(tx->freq));
+                ptp->dialed_frequency = tx->freq;
+        } else if (tx->modes == 0) {
+                tx->freq = ptp->dialed_frequency;
+                err = 0;
         }
 
         return err;
@@ -180,7 +182,8 @@ static void delete_ptp_clock(struct posix_clock *pc)
 
 /* public interface */
 
-struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info)
+struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
+                                     struct device *parent)
 {
         struct ptp_clock *ptp;
         int err = 0, index, major = MAJOR(ptp_devt);
@@ -213,7 +216,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info)
         init_waitqueue_head(&ptp->tsev_wq);
 
         /* Create a new device in our class. */
-        ptp->dev = device_create(ptp_class, NULL, ptp->devid, ptp,
+        ptp->dev = device_create(ptp_class, parent, ptp->devid, ptp,
                                  "ptp%d", ptp->index);
         if (IS_ERR(ptp->dev))
                 goto no_device;
@@ -300,6 +303,11 @@ void ptp_clock_event(struct ptp_clock *ptp, struct ptp_clock_event *event)
                 pps_get_ts(&evt);
                 pps_event(ptp->pps_source, &evt, PTP_PPS_EVENT, NULL);
                 break;
+
+        case PTP_CLOCK_PPSUSR:
+                pps_event(ptp->pps_source, &event->pps_times,
+                          PTP_PPS_EVENT, NULL);
+                break;
         }
 }
 EXPORT_SYMBOL(ptp_clock_event);
diff --git a/drivers/ptp/ptp_ixp46x.c b/drivers/ptp/ptp_ixp46x.c
index e03c40692b00..d49b85164fd2 100644
--- a/drivers/ptp/ptp_ixp46x.c
+++ b/drivers/ptp/ptp_ixp46x.c
@@ -298,7 +298,7 @@ static int __init ptp_ixp_init(void)
 
         ixp_clock.caps = ptp_ixp_caps;
 
-        ixp_clock.ptp_clock = ptp_clock_register(&ixp_clock.caps);
+        ixp_clock.ptp_clock = ptp_clock_register(&ixp_clock.caps, NULL);
 
         if (IS_ERR(ixp_clock.ptp_clock))
                 return PTR_ERR(ixp_clock.ptp_clock);
diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c
index 3a9c17eced10..e624e4dd2abb 100644
--- a/drivers/ptp/ptp_pch.c
+++ b/drivers/ptp/ptp_pch.c
@@ -627,7 +627,7 @@ pch_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         }
 
         chip->caps = ptp_pch_caps;
-        chip->ptp_clock = ptp_clock_register(&chip->caps);
+        chip->ptp_clock = ptp_clock_register(&chip->caps, &pdev->dev);
 
         if (IS_ERR(chip->ptp_clock))
                 return PTR_ERR(chip->ptp_clock);
diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
index 4d5b5082c3b1..69d32070cc65 100644
--- a/drivers/ptp/ptp_private.h
+++ b/drivers/ptp/ptp_private.h
@@ -45,6 +45,7 @@ struct ptp_clock {
         dev_t devid;
         int index; /* index into clocks.map */
         struct pps_device *pps_source;
+        long dialed_frequency; /* remembers the frequency adjustment */
         struct timestamp_event_queue tsevq; /* simple fifo for time stamps */
         struct mutex tsevq_mux; /* one process at a time reading the fifo */
         wait_queue_head_t tsev_wq;