From ad08ac189758c4e34cf10616fcfccb4069b271e2 Mon Sep 17 00:00:00 2001 From: Arun Ramadoss Date: Wed, 22 Jun 2022 14:34:19 +0530 Subject: [PATCH] net: dsa: microchip: move start of switch to ksz_setup This patch move the setting the start bit from the individual switch configuration to ksz_setup Signed-off-by: Arun Ramadoss Signed-off-by: David S. Miller --- drivers/net/dsa/microchip/ksz8795_reg.h | 1 - drivers/net/dsa/microchip/ksz9477.c | 3 --- drivers/net/dsa/microchip/ksz9477_reg.h | 1 - drivers/net/dsa/microchip/ksz_common.c | 17 +++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 3 +++ 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8795_reg.h b/drivers/net/dsa/microchip/ksz8795_reg.h index f2b0399..32d9852 100644 --- a/drivers/net/dsa/microchip/ksz8795_reg.h +++ b/drivers/net/dsa/microchip/ksz8795_reg.h @@ -16,7 +16,6 @@ #define SW_REVISION_M 0x0E #define SW_REVISION_S 1 -#define SW_START 0x01 #define KSZ8863_REG_SW_RESET 0x43 diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c index 827e62b..5fa5b3d 100644 --- a/drivers/net/dsa/microchip/ksz9477.c +++ b/drivers/net/dsa/microchip/ksz9477.c @@ -1287,9 +1287,6 @@ static int ksz9477_setup(struct dsa_switch *ds) /* enable global MIB counter freeze function */ ksz_cfg(dev, REG_SW_MAC_CTRL_6, SW_MIB_COUNTER_FREEZE, true); - /* start switch */ - ksz_cfg(dev, REG_SW_OPERATION, SW_START, true); - return 0; } diff --git a/drivers/net/dsa/microchip/ksz9477_reg.h b/drivers/net/dsa/microchip/ksz9477_reg.h index 57e03df..c0ad837 100644 --- a/drivers/net/dsa/microchip/ksz9477_reg.h +++ b/drivers/net/dsa/microchip/ksz9477_reg.h @@ -165,7 +165,6 @@ #define SW_DOUBLE_TAG BIT(7) #define SW_RESET BIT(1) -#define SW_START BIT(0) #define REG_SW_MAC_ADDR_0 0x0302 #define REG_SW_MAC_ADDR_1 0x0303 diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index 719fa1b..6da4df5 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -155,6 +155,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .stp_ctrl_reg = 0x02, .broadcast_ctrl_reg = 0x06, .multicast_ctrl_reg = 0x04, + .start_ctrl_reg = 0x01, .supports_mii = {false, false, false, false, true}, .supports_rmii = {false, false, false, false, true}, .supports_rgmii = {false, false, false, false, true}, @@ -190,6 +191,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .stp_ctrl_reg = 0x02, .broadcast_ctrl_reg = 0x06, .multicast_ctrl_reg = 0x04, + .start_ctrl_reg = 0x01, .supports_mii = {false, false, false, false, true}, .supports_rmii = {false, false, false, false, true}, .supports_rgmii = {false, false, false, false, true}, @@ -211,6 +213,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .stp_ctrl_reg = 0x02, .broadcast_ctrl_reg = 0x06, .multicast_ctrl_reg = 0x04, + .start_ctrl_reg = 0x01, .supports_mii = {false, false, false, false, true}, .supports_rmii = {false, false, false, false, true}, .supports_rgmii = {false, false, false, false, true}, @@ -231,6 +234,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .stp_ctrl_reg = 0x02, .broadcast_ctrl_reg = 0x06, .multicast_ctrl_reg = 0x04, + .start_ctrl_reg = 0x01, .supports_mii = {false, false, true}, .supports_rmii = {false, false, true}, .internal_phy = {true, true, false}, @@ -251,6 +255,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .stp_ctrl_reg = 0x0B04, .broadcast_ctrl_reg = 0x0332, .multicast_ctrl_reg = 0x0331, + .start_ctrl_reg = 0x0300, .supports_mii = {false, false, false, false, false, true, false}, .supports_rmii = {false, false, false, false, @@ -276,6 +281,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .stp_ctrl_reg = 0x0B04, .broadcast_ctrl_reg = 0x0332, .multicast_ctrl_reg = 0x0331, + .start_ctrl_reg = 0x0300, .supports_mii = {false, false, false, false, false, true, true}, .supports_rmii = {false, false, false, false, @@ -300,6 +306,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .stp_ctrl_reg = 0x0B04, .broadcast_ctrl_reg = 0x0332, .multicast_ctrl_reg = 0x0331, + .start_ctrl_reg = 0x0300, .supports_mii = {false, false, true}, .supports_rmii = {false, false, true}, .supports_rgmii = {false, false, true}, @@ -321,6 +328,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .stp_ctrl_reg = 0x0B04, .broadcast_ctrl_reg = 0x0332, .multicast_ctrl_reg = 0x0331, + .start_ctrl_reg = 0x0300, .supports_mii = {false, false, false, false, false, true, true}, .supports_rmii = {false, false, false, false, @@ -345,6 +353,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .stp_ctrl_reg = 0x0B04, .broadcast_ctrl_reg = 0x0332, .multicast_ctrl_reg = 0x0331, + .start_ctrl_reg = 0x0300, .supports_mii = {false, false, false, false, true}, .supports_rmii = {false, false, false, false, true}, .supports_rgmii = {false, false, false, false, true}, @@ -365,6 +374,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .stp_ctrl_reg = 0x0B04, .broadcast_ctrl_reg = 0x0332, .multicast_ctrl_reg = 0x0331, + .start_ctrl_reg = 0x0300, .supports_mii = {false, false, false, false, true, true}, .supports_rmii = {false, false, false, false, true, true}, .supports_rgmii = {false, false, false, false, true, true}, @@ -385,6 +395,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .stp_ctrl_reg = 0x0B04, .broadcast_ctrl_reg = 0x0332, .multicast_ctrl_reg = 0x0331, + .start_ctrl_reg = 0x0300, .supports_mii = {false, false, false, false, true, true, false, false}, .supports_rmii = {false, false, false, false, @@ -409,6 +420,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .stp_ctrl_reg = 0x0B04, .broadcast_ctrl_reg = 0x0332, .multicast_ctrl_reg = 0x0331, + .start_ctrl_reg = 0x0300, .supports_mii = {false, false, false, false, true, true, false, false}, .supports_rmii = {false, false, false, false, @@ -433,6 +445,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .stp_ctrl_reg = 0x0B04, .broadcast_ctrl_reg = 0x0332, .multicast_ctrl_reg = 0x0331, + .start_ctrl_reg = 0x0300, .supports_mii = {false, false, false, false, true, true, false, false}, .supports_rmii = {false, false, false, false, @@ -672,6 +685,10 @@ int ksz_setup(struct dsa_switch *ds) return ret; } + /* start switch */ + regmap_update_bits(dev->regmap[0], dev->info->start_ctrl_reg, + SW_START, SW_START); + return 0; } EXPORT_SYMBOL_GPL(ksz_setup); diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h index 35d734e..2cf8474 100644 --- a/drivers/net/dsa/microchip/ksz_common.h +++ b/drivers/net/dsa/microchip/ksz_common.h @@ -49,6 +49,7 @@ struct ksz_chip_data { int stp_ctrl_reg; int broadcast_ctrl_reg; int multicast_ctrl_reg; + int start_ctrl_reg; bool supports_mii[KSZ_MAX_NUM_PORTS]; bool supports_rmii[KSZ_MAX_NUM_PORTS]; bool supports_rgmii[KSZ_MAX_NUM_PORTS]; @@ -429,6 +430,8 @@ static inline void ksz_regmap_unlock(void *__mtx) #define MULTICAST_STORM_DISABLE BIT(6) +#define SW_START 0x01 + /* Regmap tables generation */ #define KSZ_SPI_OP_RD 3 #define KSZ_SPI_OP_WR 2 -- 2.7.4