UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ptp_qoriq: make ptp operations global 

This patch is to make functions of ptp operations global,
so that ENETC PTP driver which is a PCI driver for same
1588 timer IP block could reuse them.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yangbo Lu 2019-02-12 12:23:57 +08:00 committed by David S. Miller
parent 1e562c815e
commit 73356e4ea8
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/ptp/ptp_qoriq.c
View File

@ -22,7 +22,6 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/hrtimer.h> #include <linux/hrtimer.h>
#include <linux/interrupt.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
@ -135,7 +134,7 @@ static int extts_clean_up(struct ptp_qoriq *ptp_qoriq, int index,
* Interrupt service routine * Interrupt service routine
*/ */
static irqreturn_t isr(int irq, void *priv) irqreturn_t ptp_qoriq_isr(int irq, void *priv)
{ {
struct ptp_qoriq *ptp_qoriq = priv; struct ptp_qoriq *ptp_qoriq = priv;
struct ptp_qoriq_registers *regs = &ptp_qoriq->regs; struct ptp_qoriq_registers *regs = &ptp_qoriq->regs;
@ -200,12 +199,13 @@ static irqreturn_t isr(int irq, void *priv)
} else } else
return IRQ_NONE; return IRQ_NONE;
} }
EXPORT_SYMBOL_GPL(ptp_qoriq_isr);
/* /*
* PTP clock operations * PTP clock operations
*/ */
static int ptp_qoriq_adjfine(struct ptp_clock_info *ptp, long scaled_ppm) int ptp_qoriq_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)
{ {
u64 adj, diff; u64 adj, diff;
u32 tmr_add; u32 tmr_add;
@ -233,8 +233,9 @@ static int ptp_qoriq_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(ptp_qoriq_adjfine);
static int ptp_qoriq_adjtime(struct ptp_clock_info *ptp, s64 delta) int ptp_qoriq_adjtime(struct ptp_clock_info *ptp, s64 delta)
{ {
s64 now; s64 now;
unsigned long flags; unsigned long flags;
@ -251,9 +252,9 @@ static int ptp_qoriq_adjtime(struct ptp_clock_info *ptp, s64 delta)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(ptp_qoriq_adjtime);
static int ptp_qoriq_gettime(struct ptp_clock_info *ptp, int ptp_qoriq_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
struct timespec64 *ts)
{ {
u64 ns; u64 ns;
unsigned long flags; unsigned long flags;
@ -269,8 +270,9 @@ static int ptp_qoriq_gettime(struct ptp_clock_info *ptp,
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(ptp_qoriq_gettime);
static int ptp_qoriq_settime(struct ptp_clock_info *ptp, int ptp_qoriq_settime(struct ptp_clock_info *ptp,
const struct timespec64 *ts) const struct timespec64 *ts)
{ {
u64 ns; u64 ns;
@ -288,8 +290,9 @@ static int ptp_qoriq_settime(struct ptp_clock_info *ptp,
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(ptp_qoriq_settime);
static int ptp_qoriq_enable(struct ptp_clock_info *ptp, int ptp_qoriq_enable(struct ptp_clock_info *ptp,
struct ptp_clock_request *rq, int on) struct ptp_clock_request *rq, int on)
{ {
struct ptp_qoriq *ptp_qoriq = container_of(ptp, struct ptp_qoriq, caps); struct ptp_qoriq *ptp_qoriq = container_of(ptp, struct ptp_qoriq, caps);
@ -336,6 +339,7 @@ static int ptp_qoriq_enable(struct ptp_clock_info *ptp,
spin_unlock_irqrestore(&ptp_qoriq->lock, flags); spin_unlock_irqrestore(&ptp_qoriq->lock, flags);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(ptp_qoriq_enable);
static const struct ptp_clock_info ptp_qoriq_caps = { static const struct ptp_clock_info ptp_qoriq_caps = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
@ -508,7 +512,8 @@ static int ptp_qoriq_probe(struct platform_device *dev)
pr_err("irq not in device tree\n"); pr_err("irq not in device tree\n");
goto no_node; goto no_node;
} }
if (request_irq(ptp_qoriq->irq, isr, IRQF_SHARED, DRIVER, ptp_qoriq)) { if (request_irq(ptp_qoriq->irq, ptp_qoriq_isr, IRQF_SHARED,
DRIVER, ptp_qoriq)) {
pr_err("request_irq failed\n"); pr_err("request_irq failed\n");
goto no_node; goto no_node;
} }

9
include/linux/fsl/ptp_qoriq.h
View File

@ -7,6 +7,7 @@
#define __PTP_QORIQ_H__ #define __PTP_QORIQ_H__
#include <linux/io.h> #include <linux/io.h>
#include <linux/interrupt.h>
#include <linux/ptp_clock_kernel.h> #include <linux/ptp_clock_kernel.h>
/* /*
@ -171,6 +172,14 @@ static inline void qoriq_write(unsigned __iomem *addr, u32 val)
iowrite32be(val, addr); iowrite32be(val, addr);
} }
irqreturn_t ptp_qoriq_isr(int irq, void *priv);
int ptp_qoriq_adjfine(struct ptp_clock_info *ptp, long scaled_ppm);
int ptp_qoriq_adjtime(struct ptp_clock_info *ptp, s64 delta);
int ptp_qoriq_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts);
int ptp_qoriq_settime(struct ptp_clock_info *ptp,
const struct timespec64 *ts);
int ptp_qoriq_enable(struct ptp_clock_info *ptp,
struct ptp_clock_request *rq, int on);
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
void ptp_qoriq_create_debugfs(struct ptp_qoriq *ptp_qoriq); void ptp_qoriq_create_debugfs(struct ptp_qoriq *ptp_qoriq);
void ptp_qoriq_remove_debugfs(struct ptp_qoriq *ptp_qoriq); void ptp_qoriq_remove_debugfs(struct ptp_qoriq *ptp_qoriq);