Skip to content

Commit 359ee4f

Browse files
committed
Merge tag 'hwmon-for-v5.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck: - Restrict ltq-cputemp to SOC_XWAY to fix build failure - Add OF device ID table to tmp401 driver to enable auto-load * tag 'hwmon-for-v5.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (ltq-cputemp) restrict it to SOC_XWAY hwmon: (tmp401) Add OF device ID table
2 parents 10b4b67 + 151d6dc commit 359ee4f

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

drivers/hwmon/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ config SENSORS_LTC4261
960960

961961
config SENSORS_LTQ_CPUTEMP
962962
bool "Lantiq cpu temperature sensor driver"
963-
depends on LANTIQ
963+
depends on SOC_XWAY
964964
help
965965
If you say yes here you get support for the temperature
966966
sensor inside your CPU.

drivers/hwmon/tmp401.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -708,10 +708,21 @@ static int tmp401_probe(struct i2c_client *client)
708708
return 0;
709709
}
710710

711+
static const struct of_device_id __maybe_unused tmp4xx_of_match[] = {
712+
{ .compatible = "ti,tmp401", },
713+
{ .compatible = "ti,tmp411", },
714+
{ .compatible = "ti,tmp431", },
715+
{ .compatible = "ti,tmp432", },
716+
{ .compatible = "ti,tmp435", },
717+
{ },
718+
};
719+
MODULE_DEVICE_TABLE(of, tmp4xx_of_match);
720+
711721
static struct i2c_driver tmp401_driver = {
712722
.class = I2C_CLASS_HWMON,
713723
.driver = {
714724
.name = "tmp401",
725+
.of_match_table = of_match_ptr(tmp4xx_of_match),
715726
},
716727
.probe_new = tmp401_probe,
717728
.id_table = tmp401_id,

0 commit comments

Comments
 (0)