]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
regulator: da9121: Use subvariant ids in the I2C table
authorPengpeng Hou <pengpeng@iscas.ac.cn>
Wed, 24 Jun 2026 06:00:24 +0000 (14:00 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 24 Jun 2026 11:56:37 +0000 (12:56 +0100)
da9121_i2c_probe() stores i2c_get_match_data() in chip->subvariant_id
and da9121_assign_chip_model() switches on DA9121_SUBTYPE_* values.  The
OF table provides those subvariant values, but the I2C id table
currently provides DA9121_TYPE_* values.

Make the I2C id table use the same subvariant namespace as the OF table
so non-DT I2C matches feed the expected data type into the model
assignment code.

Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn>
Link: https://patch.msgid.link/20260624060024.61300-1-pengpeng@iscas.ac.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/da9121-regulator.c

index 2b150bb4d47125c671c9dfbe4f7fc34181b6b672..36a52f707602eba1ee32c63bcc7337e902b7fe19 100644 (file)
@@ -1195,15 +1195,15 @@ static void da9121_i2c_remove(struct i2c_client *i2c)
 }
 
 static const struct i2c_device_id da9121_i2c_id[] = {
-       {"da9121", DA9121_TYPE_DA9121_DA9130},
-       {"da9130", DA9121_TYPE_DA9121_DA9130},
-       {"da9217", DA9121_TYPE_DA9217},
-       {"da9122", DA9121_TYPE_DA9122_DA9131},
-       {"da9131", DA9121_TYPE_DA9122_DA9131},
-       {"da9220", DA9121_TYPE_DA9220_DA9132},
-       {"da9132", DA9121_TYPE_DA9220_DA9132},
-       {"da9141", DA9121_TYPE_DA9141},
-       {"da9142", DA9121_TYPE_DA9142},
+       {"da9121", DA9121_SUBTYPE_DA9121},
+       {"da9130", DA9121_SUBTYPE_DA9130},
+       {"da9217", DA9121_SUBTYPE_DA9217},
+       {"da9122", DA9121_SUBTYPE_DA9122},
+       {"da9131", DA9121_SUBTYPE_DA9131},
+       {"da9220", DA9121_SUBTYPE_DA9220},
+       {"da9132", DA9121_SUBTYPE_DA9132},
+       {"da9141", DA9121_SUBTYPE_DA9141},
+       {"da9142", DA9121_SUBTYPE_DA9142},
        {},
 };
 MODULE_DEVICE_TABLE(i2c, da9121_i2c_id);