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

net: mscc: ocelot: move ocelot_regs.c into ocelot_vsc7514.c 



ocelot_regs.c actually shouldn't be part of the common library. It
describes the register map of the VSC7514 switch. The way ocelot
switches work, they'll have highly optimized register maps, so another
SoC will likely have the same registers but laid out completely
different in memory (so there's little room for reusing this structure).
So move it to ocelot_vsc7514.c instead.

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

drivers/net/ethernet/mscc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ obj-$(CONFIG_MSCC_OCELOT_SWITCH_LIB) += mscc_ocelot_switch_lib.o 
mscc_ocelot_switch_lib-y := \

	ocelot.o \

	ocelot_io.o \

	ocelot_regs.o \

	ocelot_tc.o \

	ocelot_police.o \

	ocelot_ace.o \

drivers/net/ethernet/mscc/ocelot.h

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ void ocelot_port_writel(struct ocelot_port *port, u32 val, u32 reg); 
#define ocelot_field_write(ocelot, reg, val) regmap_field_write((ocelot)->regfields[(reg)], (val))

#define ocelot_field_read(ocelot, reg, val) regmap_field_read((ocelot)->regfields[(reg)], (val))



int ocelot_chip_init(struct ocelot *ocelot, const struct ocelot_ops *ops);

int ocelot_probe_port(struct ocelot *ocelot, u8 port,

		      void __iomem *regs,

		      struct phy_device *phy);

drivers/net/ethernet/mscc/ocelot_regs.c

deleted100644 → 0
+0 −450

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/mscc/ocelot_vsc7514.c

+442 −0

File changed.

Preview size limit exceeded, changes collapsed.