tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 359ee4f4 10b4b67a

+12 -1
+1 -1
drivers/hwmon/Kconfig
··· 960 960 961 961 config SENSORS_LTQ_CPUTEMP 962 962 bool "Lantiq cpu temperature sensor driver" 963 - depends on LANTIQ 963 + depends on SOC_XWAY 964 964 help 965 965 If you say yes here you get support for the temperature 966 966 sensor inside your CPU.
+11
drivers/hwmon/tmp401.c
··· 708 708 return 0; 709 709 } 710 710 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 + 711 721 static struct i2c_driver tmp401_driver = { 712 722 .class = I2C_CLASS_HWMON, 713 723 .driver = { 714 724 .name = "tmp401", 725 + .of_match_table = of_match_ptr(tmp4xx_of_match), 715 726 }, 716 727 .probe_new = tmp401_probe, 717 728 .id_table = tmp401_id,