From: Oleksij Rempel <o.rempel@pengutronix.de>
To: Woojung Huh <woojung.huh@microchip.com>,
UNGLinuxDriver@microchip.com, Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: Oleksij Rempel <o.rempel@pengutronix.de>,
kernel@pengutronix.de, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org
Subject: [PATCH net-next v3 17/17] net: dsa: microchip: remove IS_9893 flag
Date: Tue, 23 Aug 2022 10:02:31 +0200 [thread overview]
Message-ID: <20220823080231.2466017-18-o.rempel@pengutronix.de> (raw)
In-Reply-To: <20220823080231.2466017-1-o.rempel@pengutronix.de>
Use chip_id as other places of this code do it
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
drivers/net/dsa/microchip/ksz9477.c | 3 ---
drivers/net/dsa/microchip/ksz_common.c | 3 ++-
drivers/net/dsa/microchip/ksz_common.h | 4 ----
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index 1dae75af8e1b9..6f857922eb3e2 100644
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -1165,9 +1165,6 @@ int ksz9477_switch_init(struct ksz_device *dev)
if (ret)
return ret;
- if (dev->chip_id == KSZ9893_CHIP_ID)
- dev->features |= IS_9893;
-
return 0;
}
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index a863d4feb4135..08491a67dc359 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -1865,7 +1865,8 @@ static void ksz_set_xmii(struct ksz_device *dev, int port,
case PHY_INTERFACE_MODE_RGMII_RXID:
data8 |= bitval[P_RGMII_SEL];
/* On KSZ9893, disable RGMII in-band status support */
- if (dev->features & IS_9893)
+ if (dev->chip_id == KSZ9893_CHIP_ID ||
+ dev->chip_id == KSZ8563_CHIP_ID)
data8 &= ~P_MII_MAC_MODE;
break;
default:
diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index 1b327bca1fb88..54c1cba35a9d8 100644
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -118,7 +118,6 @@ struct ksz_device {
unsigned long mib_read_interval;
u16 mirror_rx;
u16 mirror_tx;
- u32 features; /* chip specific features */
u16 port_mask;
};
@@ -541,9 +540,6 @@ static inline int is_lan937x(struct ksz_device *dev)
#define SW_START 0x01
-/* Used with variable features to indicate capabilities. */
-#define IS_9893 BIT(2)
-
/* xMII configuration */
#define P_MII_DUPLEX_M BIT(6)
#define P_MII_100MBIT_M BIT(4)
--
2.30.2
next prev parent reply other threads:[~2022-08-23 8:03 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-23 8:02 [PATCH net-next v3 00/17] net: dsa: microchip: add error handling and register access validation Oleksij Rempel
2022-08-23 8:02 ` [PATCH net-next v3 01/17] net: dsa: microchip: add separate struct ksz_chip_data for KSZ8563 chip Oleksij Rempel
2022-08-23 8:02 ` [PATCH net-next v3 02/17] net: dsa: microchip: do per-port Gbit detection instead of per-chip Oleksij Rempel
2022-08-23 8:02 ` [PATCH net-next v3 03/17] net: dsa: microchip: don't announce extended register support on non Gbit chips Oleksij Rempel
2022-08-23 8:02 ` [PATCH net-next v3 04/17] net: dsa: microchip: allow to pass return values for PHY read/write accesses Oleksij Rempel
2022-08-23 8:02 ` [PATCH net-next v3 05/17] net: dsa: microchip: forward error value on all ksz_pread/ksz_pwrite functions Oleksij Rempel
2022-08-23 8:02 ` [PATCH net-next v3 06/17] net: dsa: microchip: ksz9477: add error handling to ksz9477_r/w_phy Oleksij Rempel
2022-08-23 8:02 ` [PATCH net-next v3 07/17] net: dsa: microchip: ksz8795: add error handling to ksz8_r/w_phy Oleksij Rempel
2022-08-23 8:02 ` [PATCH net-next v3 08/17] net: dsa: microchip: KSZ9893: do not write to not supported Output Clock Control Register Oleksij Rempel
2022-08-23 8:02 ` [PATCH net-next v3 09/17] net: dsa: microchip: add support for regmap_access_tables Oleksij Rempel
2022-08-23 8:02 ` [PATCH net-next v3 10/17] net: dsa: microchip: add regmap_range for KSZ8563 chip Oleksij Rempel
2022-08-23 8:02 ` [PATCH net-next v3 11/17] net: dsa: microchip: ksz9477: remove MII_CTRL1000 check from ksz9477_w_phy() Oleksij Rempel
2022-08-23 8:02 ` [PATCH net-next v3 12/17] net: dsa: microchip: add regmap_range for KSZ9477 chip Oleksij Rempel
2022-08-23 8:02 ` [PATCH net-next v3 13/17] net: dsa: microchip: ksz9477: use internal_phy instead of phy_port_cnt Oleksij Rempel
2022-08-23 8:02 ` [PATCH net-next v3 14/17] net: dsa: microchip: remove unused port phy variable Oleksij Rempel
2022-08-23 8:02 ` [PATCH net-next v3 15/17] net: dsa: microchip: ksz9477: remove unused "on" variable Oleksij Rempel
2022-08-25 20:54 ` Vladimir Oltean
2022-08-26 7:51 ` Oleksij Rempel
2022-08-23 8:02 ` [PATCH net-next v3 16/17] net: dsa: microchip: remove unused sgmii variable Oleksij Rempel
2022-08-23 8:02 ` Oleksij Rempel [this message]
2022-08-25 9:00 ` [PATCH net-next v3 00/17] net: dsa: microchip: add error handling and register access validation Paolo Abeni
2022-08-25 21:44 ` Vladimir Oltean
2022-08-25 22:57 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220823080231.2466017-18-o.rempel@pengutronix.de \
--to=o.rempel@pengutronix.de \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=pabeni@redhat.com \
--cc=vivien.didelot@gmail.com \
--cc=woojung.huh@microchip.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).