Commit 359ee4f4 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'hwmon-for-v5.18-rc7' of...

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
parents 10b4b67a 151d6dcb
...@@ -960,7 +960,7 @@ config SENSORS_LTC4261 ...@@ -960,7 +960,7 @@ config SENSORS_LTC4261
config SENSORS_LTQ_CPUTEMP config SENSORS_LTQ_CPUTEMP
bool "Lantiq cpu temperature sensor driver" bool "Lantiq cpu temperature sensor driver"
depends on LANTIQ depends on SOC_XWAY
help help
If you say yes here you get support for the temperature If you say yes here you get support for the temperature
sensor inside your CPU. sensor inside your CPU.
......
...@@ -708,10 +708,21 @@ static int tmp401_probe(struct i2c_client *client) ...@@ -708,10 +708,21 @@ static int tmp401_probe(struct i2c_client *client)
return 0; return 0;
} }
static const struct of_device_id __maybe_unused tmp4xx_of_match[] = {
{ .compatible = "ti,tmp401", },
{ .compatible = "ti,tmp411", },
{ .compatible = "ti,tmp431", },
{ .compatible = "ti,tmp432", },
{ .compatible = "ti,tmp435", },
{ },
};
MODULE_DEVICE_TABLE(of, tmp4xx_of_match);
static struct i2c_driver tmp401_driver = { static struct i2c_driver tmp401_driver = {
.class = I2C_CLASS_HWMON, .class = I2C_CLASS_HWMON,
.driver = { .driver = {
.name = "tmp401", .name = "tmp401",
.of_match_table = of_match_ptr(tmp4xx_of_match),
}, },
.probe_new = tmp401_probe, .probe_new = tmp401_probe,
.id_table = tmp401_id, .id_table = tmp401_id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment