Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hwmon: (ntc_thermistor) Fix OF device ID mapping

Browse source 
The mapping from OF device IDs to platform device IDs is wrong.
TYPE_NCPXXWB473 is 0, TYPE_NCPXXWL333 is 1, so
ntc_thermistor_id[TYPE_NCPXXWB473] is { "ncp15wb473", TYPE_NCPXXWB473 }
while
ntc_thermistor_id[TYPE_NCPXXWL333] is { "ncp18wb473", TYPE_NCPXXWB473 }.

So the name is wrong for all but the "ntc,ncp15wb473" entry, and the
type is wrong for the "ntc,ncp15wl333" entry.

So map the entries by index, it is neither elegant nor robust but at
least it is correct.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Fixes: 9e8269de hwmon: (ntc_thermistor) Add DT with IIO support to NTC thermistor driver
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Cc: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
Cc: Doug Anderson <dianders@chromium.org>
This commit is contained in:
Jean Delvare 2014-05-25 17:23:08 +02:00
parent 59cf4243e5
commit ead82d6792
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/hwmon/ntc_thermistor.c
View file

@ -44,6 +44,7 @@ struct ntc_compensation {
unsigned int ohm; unsigned int ohm;
}; };
/* Order matters, ntc_match references the entries by index */
static const struct platform_device_id ntc_thermistor_id[] = { static const struct platform_device_id ntc_thermistor_id[] = {
{ "ncp15wb473", TYPE_NCPXXWB473 }, { "ncp15wb473", TYPE_NCPXXWB473 },
{ "ncp18wb473", TYPE_NCPXXWB473 }, { "ncp18wb473", TYPE_NCPXXWB473 },
@ -163,15 +164,15 @@ static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata)
static const struct of_device_id ntc_match[] = { static const struct of_device_id ntc_match[] = {
{ .compatible = "ntc,ncp15wb473", { .compatible = "ntc,ncp15wb473",
.data = &ntc_thermistor_id[TYPE_NCPXXWB473] }, .data = &ntc_thermistor_id[0] },
{ .compatible = "ntc,ncp18wb473", { .compatible = "ntc,ncp18wb473",
.data = &ntc_thermistor_id[TYPE_NCPXXWB473] }, .data = &ntc_thermistor_id[1] },
{ .compatible = "ntc,ncp21wb473", { .compatible = "ntc,ncp21wb473",
.data = &ntc_thermistor_id[TYPE_NCPXXWB473] }, .data = &ntc_thermistor_id[2] },
{ .compatible = "ntc,ncp03wb473", { .compatible = "ntc,ncp03wb473",
.data = &ntc_thermistor_id[TYPE_NCPXXWB473] }, .data = &ntc_thermistor_id[3] },
{ .compatible = "ntc,ncp15wl333", { .compatible = "ntc,ncp15wl333",
.data = &ntc_thermistor_id[TYPE_NCPXXWL333] }, .data = &ntc_thermistor_id[4] },
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, ntc_match); MODULE_DEVICE_TABLE(of, ntc_match);