Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ptp: ocp: add .init function for sma_op vector

Browse Source 
Create an .init function for the op vector, and a corresponding
wrapper function, for different sma mapping setups.

Add a default_fcn to the sma information, and use it when displaying
information for pins which have fixed functions.

Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jonathan Lemon 2022-05-19 14:21:51 -07:00 committed by Jakub Kicinski
parent caab82cdbf
commit ee4cd7250c
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/ptp/ptp_ocp.c
View File

@ -243,6 +243,7 @@ struct ptp_ocp_sma_connector {
bool fixed_fcn; bool fixed_fcn;
bool fixed_dir; bool fixed_dir;
bool disabled; bool disabled;
u8 default_fcn;
}; };
struct ocp_attr_group { struct ocp_attr_group {
@ -702,11 +703,18 @@ static const struct ocp_selector ptp_ocp_sma_out[] = {
struct ocp_sma_op { struct ocp_sma_op {
const struct ocp_selector *tbl[2]; const struct ocp_selector *tbl[2];
void (*init)(struct ptp_ocp *bp);
u32 (*get)(struct ptp_ocp *bp, int sma_nr); u32 (*get)(struct ptp_ocp *bp, int sma_nr);
int (*set_inputs)(struct ptp_ocp *bp, int sma_nr, u32 val); int (*set_inputs)(struct ptp_ocp *bp, int sma_nr, u32 val);
int (*set_output)(struct ptp_ocp *bp, int sma_nr, u32 val); int (*set_output)(struct ptp_ocp *bp, int sma_nr, u32 val);
}; };
static void
ptp_ocp_sma_init(struct ptp_ocp *bp)
{
return bp->sma_op->init(bp);
}
static u32 static u32
ptp_ocp_sma_get(struct ptp_ocp *bp, int sma_nr) ptp_ocp_sma_get(struct ptp_ocp *bp, int sma_nr)
{ {
@ -2023,15 +2031,8 @@ ptp_ocp_sma_fb_set_inputs(struct ptp_ocp *bp, int sma_nr, u32 val)
return 0; return 0;
} }
static const struct ocp_sma_op ocp_fb_sma_op = {
.tbl = { ptp_ocp_sma_in, ptp_ocp_sma_out },
.get = ptp_ocp_sma_fb_get,
.set_inputs = ptp_ocp_sma_fb_set_inputs,
.set_output = ptp_ocp_sma_fb_set_output,
};
static void static void
ptp_ocp_sma_init(struct ptp_ocp *bp) ptp_ocp_sma_fb_init(struct ptp_ocp *bp)
{ {
u32 reg; u32 reg;
int i; int i;
@ -2041,6 +2042,8 @@ ptp_ocp_sma_init(struct ptp_ocp *bp)
bp->sma[1].mode = SMA_MODE_IN; bp->sma[1].mode = SMA_MODE_IN;
bp->sma[2].mode = SMA_MODE_OUT; bp->sma[2].mode = SMA_MODE_OUT;
bp->sma[3].mode = SMA_MODE_OUT; bp->sma[3].mode = SMA_MODE_OUT;
for (i = 0; i < 4; i++)
bp->sma[i].default_fcn = i & 1;
/* If no SMA1 map, the pin functions and directions are fixed. */ /* If no SMA1 map, the pin functions and directions are fixed. */
if (!bp->sma_map1) { if (!bp->sma_map1) {
@ -2069,6 +2072,14 @@ ptp_ocp_sma_init(struct ptp_ocp *bp)
} }
} }
static const struct ocp_sma_op ocp_fb_sma_op = {
.tbl = { ptp_ocp_sma_in, ptp_ocp_sma_out },
.init = ptp_ocp_sma_fb_init,
.get = ptp_ocp_sma_fb_get,
.set_inputs = ptp_ocp_sma_fb_set_inputs,
.set_output = ptp_ocp_sma_fb_set_output,
};
static int static int
ptp_ocp_fb_set_pins(struct ptp_ocp *bp) ptp_ocp_fb_set_pins(struct ptp_ocp *bp)
{ {
@ -2330,7 +2341,7 @@ ptp_ocp_sma_store(struct ptp_ocp *bp, const char *buf, int sma_nr)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (sma->fixed_fcn) { if (sma->fixed_fcn) {
if (val != ((sma_nr - 1) & 1)) if (val != sma->default_fcn)
return -EOPNOTSUPP; return -EOPNOTSUPP;
return 0; return 0;
} }