Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1668521
| From | Vivien Didelot <vivien.didelot@savoirfairelinux.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH net-next 08/10] net: dsa: mv88e6xxx: prefix Global 2 Switch MAC macros |
| Date | 2017-06-18 05:20 +0200 |
| Message-ID | <tTyUN-8aj-9@gated-at.bofh.it> (permalink) |
| References | <tTyL7-86n-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Prefix and document the Global 2 Switch MAC registers macros.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
---
drivers/net/dsa/mv88e6xxx/global2.c | 2 +-
drivers/net/dsa/mv88e6xxx/global2.h | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/net/dsa/mv88e6xxx/global2.c b/drivers/net/dsa/mv88e6xxx/global2.c
index 8621f5893406..0977ba1697a6 100644
--- a/drivers/net/dsa/mv88e6xxx/global2.c
+++ b/drivers/net/dsa/mv88e6xxx/global2.c
@@ -235,7 +235,7 @@ static int mv88e6xxx_g2_switch_mac_write(struct mv88e6xxx_chip *chip,
{
u16 val = (pointer << 8) | data;
- return mv88e6xxx_g2_update(chip, GLOBAL2_SWITCH_MAC, val);
+ return mv88e6xxx_g2_update(chip, MV88E6XXX_G2_SWITCH_MAC, val);
}
int mv88e6xxx_g2_set_switch_mac(struct mv88e6xxx_chip *chip, u8 *addr)
diff --git a/drivers/net/dsa/mv88e6xxx/global2.h b/drivers/net/dsa/mv88e6xxx/global2.h
index dab6a7ff7d0f..b3561a9fac2d 100644
--- a/drivers/net/dsa/mv88e6xxx/global2.h
+++ b/drivers/net/dsa/mv88e6xxx/global2.h
@@ -92,7 +92,12 @@
#define MV88E6XXX_G2_PVT_DATA 0x0c
#define MV88E6XXX_G2_PVT_DATA_MASK 0x7f
-#define GLOBAL2_SWITCH_MAC 0x0d
+/* Offset 0x0D: Switch MAC/WoL/WoF Register */
+#define MV88E6XXX_G2_SWITCH_MAC 0x0d
+#define MV88E6XXX_G2_SWITCH_MAC_UPDATE 0x8000
+#define MV88E6XXX_G2_SWITCH_MAC_PTR_MASK 0x1f00
+#define MV88E6XXX_G2_SWITCH_MAC_DATA_MASK 0x00ff
+
#define GLOBAL2_ATU_STATS 0x0e
#define GLOBAL2_PRIO_OVERRIDE 0x0f
#define GLOBAL2_PRIO_OVERRIDE_FORCE_SNOOP BIT(7)
--
2.13.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH net-next 00/10] net: dsa: Global 2 cosmetics Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-06-18 05:20 +0200 [PATCH net-next 10/10] net: dsa: mv88e6xxx: prefix Global 2 remaining macros Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-06-18 05:20 +0200 [PATCH net-next 08/10] net: dsa: mv88e6xxx: prefix Global 2 Switch MAC macros Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-06-18 05:20 +0200 [PATCH net-next 07/10] net: dsa: mv88e6xxx: prefix Global 2 EEPROM macros Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-06-18 05:20 +0200 [PATCH net-next 05/10] net: dsa: mv88e6xxx: prefix Global 2 MGMT macros Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-06-18 05:20 +0200
csiph-web