Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a935c052 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: add global1 helpers 



The Global (1) internal SMI device is an extended set of registers
containing ATU, PPU, VTU, STU, etc.

It is present on every switches, usually at SMI address 0x1B. But old
models such as 88E6060 access it at address 0xF, thus using REG_GLOBAL
is erroneous.

Add a global1_addr info member used by mv88e6xxx_g1_{read,write} and
mv88e6xxx_g1_wait helpers in a new global1.c file.

This patch finally removes _mv88e6xxx_reg_{read,write}, in favor on the
appropriate helpers. No functional changes here.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 31fbe81f

drivers/net/dsa/mv88e6xxx/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o

mv88e6xxx-objs := chip.o

mv88e6xxx-objs += global1.o

mv88e6xxx-$(CONFIG_NET_DSA_MV88E6XXX_GLOBAL2) += global2.o

drivers/net/dsa/mv88e6xxx/chip.c

+247 −258

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/dsa/mv88e6xxx/global1.c

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * Marvell 88E6xxx Switch Global (1) Registers support

 *

 * Copyright (c) 2008 Marvell Semiconductor

 *

 * Copyright (c) 2016 Vivien Didelot <vivien.didelot@savoirfairelinux.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#include "mv88e6xxx.h"

#include "global1.h"



int mv88e6xxx_g1_read(struct mv88e6xxx_chip *chip, int reg, u16 *val)

{

	int addr = chip->info->global1_addr;



	return mv88e6xxx_read(chip, addr, reg, val);

}



int mv88e6xxx_g1_write(struct mv88e6xxx_chip *chip, int reg, u16 val)

{

	int addr = chip->info->global1_addr;



	return mv88e6xxx_write(chip, addr, reg, val);

}



int mv88e6xxx_g1_wait(struct mv88e6xxx_chip *chip, int reg, u16 mask)

{

	return mv88e6xxx_wait(chip, chip->info->global1_addr, reg, mask);

}

drivers/net/dsa/mv88e6xxx/global1.h

0 → 100644
+23 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/net/dsa/mv88e6xxx/mv88e6xxx.h

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.