]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: pse-pd: tps23881: Fix the device ID check
authorKyle Swenson <kyle.swenson@est.tech>
Wed, 31 Jul 2024 15:42:14 +0000 (15:42 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Aug 2024 13:34:02 +0000 (15:34 +0200)
[ Upstream commit 89108cb5c28527c1882df2987394e5c261a1f4aa ]

The DEVID register contains two pieces of information: the device ID in
the upper nibble, and the silicon revision number in the lower nibble.
The driver should work fine with any silicon revision, so let's mask
that out in the device ID check.

Fixes: 20e6d190ffe1 ("net: pse-pd: Add TI TPS23881 PSE controller driver")
Signed-off-by: Kyle Swenson <kyle.swenson@est.tech>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Acked-by: Oleksij Rempel <o.rempel@pengutronix.de>
Link: https://patch.msgid.link/20240731154152.4020668-1-kyle.swenson@est.tech
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/pse-pd/tps23881.c

index 98ffbb1bbf13c7cbbdbeb8180366bc16ffe73a90..e95109c1130dc2b7077bbbebbfe6182dad4f544e 100644 (file)
@@ -29,6 +29,8 @@
 #define TPS23881_REG_TPON      BIT(0)
 #define TPS23881_REG_FWREV     0x41
 #define TPS23881_REG_DEVID     0x43
+#define TPS23881_REG_DEVID_MASK        0xF0
+#define TPS23881_DEVICE_ID     0x02
 #define TPS23881_REG_SRAM_CTRL 0x60
 #define TPS23881_REG_SRAM_DATA 0x61
 
@@ -750,7 +752,7 @@ static int tps23881_i2c_probe(struct i2c_client *client)
        if (ret < 0)
                return ret;
 
-       if (ret != 0x22) {
+       if (FIELD_GET(TPS23881_REG_DEVID_MASK, ret) != TPS23881_DEVICE_ID) {
                dev_err(dev, "Wrong device ID\n");
                return -ENXIO;
        }