Commit c0d982bf authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fec-ptp-fixes' 



Joakim Zhang says:

====================
net: fixes for fec ptp

Small fixes for fec ptp.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 56b786d8 d2376564

drivers/net/ethernet/freescale/fec_ptp.c

+5 −3
Original line number Diff line number Diff line
@@ -215,15 +215,13 @@ static u64 fec_ptp_read(const struct cyclecounter *cc) 
{

	struct fec_enet_private *fep =

		container_of(cc, struct fec_enet_private, cc);

	const struct platform_device_id *id_entry =

		platform_get_device_id(fep->pdev);

	u32 tempval;



	tempval = readl(fep->hwp + FEC_ATIME_CTRL);

	tempval |= FEC_T_CTRL_CAPTURE;

	writel(tempval, fep->hwp + FEC_ATIME_CTRL);



	if (id_entry->driver_data & FEC_QUIRK_BUG_CAPTURE)

	if (fep->quirks & FEC_QUIRK_BUG_CAPTURE)

		udelay(1);



	return readl(fep->hwp + FEC_ATIME);
@@ -604,6 +602,10 @@ void fec_ptp_init(struct platform_device *pdev, int irq_idx) 
	fep->ptp_caps.enable = fec_ptp_enable;



	fep->cycle_speed = clk_get_rate(fep->clk_ptp);

	if (!fep->cycle_speed) {

		fep->cycle_speed = NSEC_PER_SEC;

		dev_err(&fep->pdev->dev, "clk_ptp clock rate is zero\n");

	}

	fep->ptp_inc = NSEC_PER_SEC / fep->cycle_speed;



	spin_lock_init(&fep->tmreg_lock);