diff options
| author |   Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2016-02-06 17:46:35 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-02-16 14:52:59 -0500 |
| commit | d0c5f45ae3ede897114dea204fbaaa4dd18fa9cb (patch) | |
| tree | e57cf101c2708856e41fdf5fbe8e62ec107767f1 /drivers/net/ethernet/renesas/ravb_main.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf (diff) | |
| download | linux-dev-d0c5f45ae3ede897114dea204fbaaa4dd18fa9cb.tar.xz linux-dev-d0c5f45ae3ede897114dea204fbaaa4dd18fa9cb.zip | |
ravb: kill duplicate setting of CCC.CSEL
When adding support for the R-Car gen3 gPTP active in configuration mode,
the code setting the CCC.CSEL field was duplicated due to an oversight.
For R-Car gen 2 it's just redundant and for R-Car gen3 the write at this
time is probably ignored due to CCC.GAC bit being already set...
Fixes: f5d7837f96e5 ("ravb: ptp: Add CONFIG mode support")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/renesas/ravb_main.c')
| -rw-r--r-- | drivers/net/ethernet/renesas/ravb_main.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index ac43ed914fcf..6ccef24dfd25 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -1814,10 +1814,6 @@ static int ravb_probe(struct platform_device *pdev) CCC_OPC_CONFIG | CCC_GAC | CCC_CSEL_HPB, CCC); } - /* Set CSEL value */ - ravb_write(ndev, (ravb_read(ndev, CCC) & ~CCC_CSEL) | CCC_CSEL_HPB, - CCC); - /* Set GTI value */ error = ravb_set_gti(ndev); if (error) |