Commit f4d680e5 authored by Sergey Shtylyov's avatar Sergey Shtylyov Committed by Jakub Kicinski
Browse files

ravb: remove APSR_DM 



According to the R-Car Series, 3rd Generation User's Manual: Hardware,
Rev. 1.50, there's no APSR.DM field, instead there are 2 independent
RX/TX clock internal delay bits. Follow the suit: remove #define APSR_DM
and rename #define's APSR_DM_{R|T}DM to APSR_{R|T}DM.

While at it, do several more things to the declaration of *enum* APSR_BIT:
- remove superfluous indentation;
- annotate APSR_MEMS as undocumented;
- annotate APSR as R-Car Gen3 only.

Signed-off-by: default avatarSergey Shtylyov <s.shtylyov@omprussia.ru>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 833d22f2

drivers/net/ethernet/renesas/ravb.h

+5 −6
Original line number Diff line number Diff line
@@ -241,13 +241,12 @@ enum ESR_BIT { 
	ESR_EIL		= 0x00001000,

};



/* APSR */

/* APSR (R-Car Gen3 only) */

enum APSR_BIT {

	APSR_MEMS		= 0x00000002,

	APSR_MEMS	= 0x00000002,	/* Undocumented */

	APSR_CMSW	= 0x00000010,

	APSR_DM			= 0x00006000,	/* Undocumented? */

	APSR_DM_RDM		= 0x00002000,

	APSR_DM_TDM		= 0x00004000,

	APSR_RDM	= 0x00002000,

	APSR_TDM	= 0x00004000,

};



/* RCR */

drivers/net/ethernet/renesas/ravb_main.c

+3 −3
Original line number Diff line number Diff line
@@ -2034,10 +2034,10 @@ static void ravb_set_delay_mode(struct net_device *ndev) 
	u32 set = 0;



	if (priv->rxcidm)

		set |= APSR_DM_RDM;

		set |= APSR_RDM;

	if (priv->txcidm)

		set |= APSR_DM_TDM;

	ravb_modify(ndev, APSR, APSR_DM, set);

		set |= APSR_TDM;

	ravb_modify(ndev, APSR, APSR_RDM | APSR_TDM, set);

}



static int ravb_probe(struct platform_device *pdev)