Commit be5c13f2 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: mscc: ocelot: harmonize names of SYS_COUNT_TX_AGING and OCELOT_STAT_TX_AGED 



The hardware counter is called C_TX_AGED, so rename SYS_COUNT_TX_AGING
to SYS_COUNT_TX_AGED. This will become important since we want to
minimize the way in which we declare struct ocelot_stat_layout elements,
using the C preprocessor.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e32036e1

drivers/net/dsa/ocelot/felix_vsc9959.c

+2 −2
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static const u32 vsc9959_sys_regmap[] = { 
	REG(SYS_COUNT_TX_GREEN_PRIO_5,		0x00026c),

	REG(SYS_COUNT_TX_GREEN_PRIO_6,		0x000270),

	REG(SYS_COUNT_TX_GREEN_PRIO_7,		0x000274),

	REG(SYS_COUNT_TX_AGING,			0x000278),

	REG(SYS_COUNT_TX_AGED,			0x000278),

	REG(SYS_COUNT_DROP_LOCAL,		0x000400),

	REG(SYS_COUNT_DROP_TAIL,		0x000404),

	REG(SYS_COUNT_DROP_YELLOW_PRIO_0,	0x000408),
@@ -921,7 +921,7 @@ static const struct ocelot_stat_layout vsc9959_stats_layout[OCELOT_NUM_STATS] = 
	},

	[OCELOT_STAT_TX_AGED] = {

		.name = "tx_aged",

		.reg = SYS_COUNT_TX_AGING,

		.reg = SYS_COUNT_TX_AGED,

	},

	[OCELOT_STAT_DROP_LOCAL] = {

		.name = "drop_local",

drivers/net/dsa/ocelot/seville_vsc9953.c

+2 −2
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static const u32 vsc9953_sys_regmap[] = { 
	REG(SYS_COUNT_TX_GREEN_PRIO_5,		0x00016c),

	REG(SYS_COUNT_TX_GREEN_PRIO_6,		0x000170),

	REG(SYS_COUNT_TX_GREEN_PRIO_7,		0x000174),

	REG(SYS_COUNT_TX_AGING,			0x000178),

	REG(SYS_COUNT_TX_AGED,			0x000178),

	REG(SYS_COUNT_DROP_LOCAL,		0x000200),

	REG(SYS_COUNT_DROP_TAIL,		0x000204),

	REG(SYS_COUNT_DROP_YELLOW_PRIO_0,	0x000208),
@@ -912,7 +912,7 @@ static const struct ocelot_stat_layout vsc9953_stats_layout[OCELOT_NUM_STATS] = 
	},

	[OCELOT_STAT_TX_AGED] = {

		.name = "tx_aged",

		.reg = SYS_COUNT_TX_AGING,

		.reg = SYS_COUNT_TX_AGED,

	},

	[OCELOT_STAT_DROP_LOCAL] = {

		.name = "drop_local",

drivers/net/ethernet/mscc/ocelot_vsc7514.c

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static const struct ocelot_stat_layout ocelot_stats_layout[OCELOT_NUM_STATS] = { 
	},

	[OCELOT_STAT_TX_AGED] = {

		.name = "tx_aged",

		.reg = SYS_COUNT_TX_AGING,

		.reg = SYS_COUNT_TX_AGED,

	},

	[OCELOT_STAT_DROP_LOCAL] = {

		.name = "drop_local",

drivers/net/ethernet/mscc/vsc7514_regs.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ const u32 vsc7514_sys_regmap[] = { 
	REG(SYS_COUNT_TX_GREEN_PRIO_5,			0x00016c),

	REG(SYS_COUNT_TX_GREEN_PRIO_6,			0x000170),

	REG(SYS_COUNT_TX_GREEN_PRIO_7,			0x000174),

	REG(SYS_COUNT_TX_AGING,				0x000178),

	REG(SYS_COUNT_TX_AGED,				0x000178),

	REG(SYS_COUNT_DROP_LOCAL,			0x000200),

	REG(SYS_COUNT_DROP_TAIL,			0x000204),

	REG(SYS_COUNT_DROP_YELLOW_PRIO_0,		0x000208),

include/soc/mscc/ocelot.h

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ enum ocelot_reg { 
	SYS_COUNT_TX_GREEN_PRIO_5,

	SYS_COUNT_TX_GREEN_PRIO_6,

	SYS_COUNT_TX_GREEN_PRIO_7,

	SYS_COUNT_TX_AGING,

	SYS_COUNT_TX_AGED,

	SYS_COUNT_DROP_LOCAL,

	SYS_COUNT_DROP_TAIL,

	SYS_COUNT_DROP_YELLOW_PRIO_0,