Commit fbd12de4 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: dsa: mv88e6xxx: remove unused support for PPS event capture 



mv88e6352_config_eventcap() is documented as handling both EXTTS and
PPS capture modes, but nothing ever calls it for PPS capture. Remove
the unused PPS capture mode support, and the now unused
MV88E6XXX_TAI_EVENT_STATUS_CAP_TRIG definition.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1uwep9-00000004ikJ-2FeF@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ae4c9498

drivers/net/dsa/mv88e6xxx/ptp.c

+3 −18
Original line number Diff line number Diff line
@@ -167,16 +167,13 @@ static u64 mv88e6165_ptp_clock_read(struct cyclecounter *cc) 
}



/* mv88e6352_config_eventcap - configure TAI event capture

 * @event: PTP_CLOCK_PPS (internal) or PTP_CLOCK_EXTTS (external)

 * @rising: zero for falling-edge trigger, else rising-edge trigger

 *

 * This will also reset the capture sequence counter.

 */

static int mv88e6352_config_eventcap(struct mv88e6xxx_chip *chip, int event,

				     int rising)

static int mv88e6352_config_eventcap(struct mv88e6xxx_chip *chip, int rising)

{

	u16 evcap_config;

	u16 cap_config;

	int err;



	evcap_config = MV88E6XXX_TAI_CFG_CAP_OVERWRITE |
@@ -188,20 +185,8 @@ static int mv88e6352_config_eventcap(struct mv88e6xxx_chip *chip, int event, 
	if (err)

		return err;



	if (event == PTP_CLOCK_PPS) {

		cap_config = MV88E6XXX_TAI_EVENT_STATUS_CAP_TRIG;

	} else if (event == PTP_CLOCK_EXTTS) {

		/* if STATUS_CAP_TRIG is unset we capture PTP_EVREQ events */

		cap_config = 0;

	} else {

		return -EINVAL;

	}



	/* Write the capture config; this also clears the capture counter */

	err = mv88e6xxx_tai_write(chip, MV88E6XXX_TAI_EVENT_STATUS,

				  cap_config);



	return err;

	return mv88e6xxx_tai_write(chip, MV88E6XXX_TAI_EVENT_STATUS, 0);

}



static void mv88e6352_tai_event_work(struct work_struct *ugly)
@@ -354,7 +339,7 @@ static int mv88e6352_ptp_enable_extts(struct mv88e6xxx_chip *chip, 
		schedule_delayed_work(&chip->tai_event_work,

				      TAI_EVENT_WORK_INTERVAL);



		err = mv88e6352_config_eventcap(chip, PTP_CLOCK_EXTTS, rising);

		err = mv88e6352_config_eventcap(chip, rising);

	} else {

		func = MV88E6352_G2_SCRATCH_GPIO_PCTL_GPIO;

drivers/net/dsa/mv88e6xxx/ptp.h

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 


/* Offset 0x09: Event Status */

#define MV88E6XXX_TAI_EVENT_STATUS		0x09

#define MV88E6XXX_TAI_EVENT_STATUS_CAP_TRIG	0x4000

#define MV88E6XXX_TAI_EVENT_STATUS_ERROR	0x0200

#define MV88E6XXX_TAI_EVENT_STATUS_VALID	0x0100

#define MV88E6XXX_TAI_EVENT_STATUS_CTR_MASK	0x00ff