net: dsa: microchip: move REG_SW_MAC_ADDR to dev->info->regs[]

Defining macros which have the same name but different values is bad
practice, because it makes it hard to avoid code duplication. The same
code does different things, depending on the file it's placed in.
Case in point, we want to access REG_SW_MAC_ADDR from ksz_common.c, but
currently we can't, because we don't know which kszXXXX_reg.h to include
from the common code.

Remove the REG_SW_MAC_ADDR_{0..5} macros from ksz8795_reg.h and
ksz9477_reg.h, and re-add this register offset to the dev->info->regs[]
array.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/dsa/microchip/ksz8795_reg.h b/drivers/net/dsa/microchip/ksz8795_reg.h
index d33db4f86c642e300098de9cc23e59c0d6482781..3c9dae53e4d8c75eefb55ca2a932d77ac8dcdad9 100644 (file)
--- a/drivers/net/dsa/microchip/ksz8795_reg.h
+++ b/drivers/net/dsa/microchip/ksz8795_reg.h
@@ -323,13 +323,6 @@
        ((addr) + REG_PORT_1_CTRL_0 + (port) *  \
                (REG_PORT_2_CTRL_0 - REG_PORT_1_CTRL_0))
 
-#define REG_SW_MAC_ADDR_0              0x68
-#define REG_SW_MAC_ADDR_1              0x69
-#define REG_SW_MAC_ADDR_2              0x6A
-#define REG_SW_MAC_ADDR_3              0x6B
-#define REG_SW_MAC_ADDR_4              0x6C
-#define REG_SW_MAC_ADDR_5              0x6D
-
 #define TABLE_EXT_SELECT_S             5
 #define TABLE_EEE_V                    1
 #define TABLE_ACL_V                    2

diff --git a/drivers/net/dsa/microchip/ksz9477_reg.h b/drivers/net/dsa/microchip/ksz9477_reg.h
index 504e085aab52261e7339a35b96782da6a7f736fb..f3a205ee483f2133bcd79602941255842053784c 100644 (file)
--- a/drivers/net/dsa/microchip/ksz9477_reg.h
+++ b/drivers/net/dsa/microchip/ksz9477_reg.h
@@ -153,13 +153,6 @@
 #define SW_DOUBLE_TAG                  BIT(7)
 #define SW_RESET                       BIT(1)
 
-#define REG_SW_MAC_ADDR_0              0x0302
-#define REG_SW_MAC_ADDR_1              0x0303
-#define REG_SW_MAC_ADDR_2              0x0304
-#define REG_SW_MAC_ADDR_3              0x0305
-#define REG_SW_MAC_ADDR_4              0x0306
-#define REG_SW_MAC_ADDR_5              0x0307
-
 #define REG_SW_MTU__2                  0x0308
 #define REG_SW_MTU_MASK                        GENMASK(13, 0)
 

diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 173ad8f04671061063e67a1db85a677577c46a27..6c31d51410e38a682e64178b6fbe592c8f98ce3c 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -364,6 +364,7 @@ static const struct ksz_dev_ops lan937x_dev_ops = {
 };
 
 static const u16 ksz8795_regs[] = {
+       [REG_SW_MAC_ADDR]               = 0x68,
        [REG_IND_CTRL_0]                = 0x6E,
        [REG_IND_DATA_8]                = 0x70,
        [REG_IND_DATA_CHECK]            = 0x72,
@@ -492,6 +493,7 @@ static u8 ksz8863_shifts[] = {
 };
 
 static const u16 ksz9477_regs[] = {
+       [REG_SW_MAC_ADDR]               = 0x0302,
        [P_STP_CTRL]                    = 0x0B04,
        [S_START_CTRL]                  = 0x0300,
        [S_BROADCAST_CTRL]              = 0x0332,

diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index d180c8a34e2757266802b9d9dffb3352e04a5534..07c7723dbc371a9870d65e393e0a4a5976ff3c3d 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -212,6 +212,7 @@ enum ksz_chip_id {
 };
 
 enum ksz_regs {
+       REG_SW_MAC_ADDR,
        REG_IND_CTRL_0,
        REG_IND_DATA_8,
        REG_IND_DATA_CHECK,