diff for duplicates of <5254BFAF.8080702@nvidia.com> diff --git a/a/1.txt b/N1/1.txt index 7a37e7b..8dc20b5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,7 +4,7 @@ On 10/08/2013 11:25 PM, Guenter Roeck wrote: >> local temperature low byte and max conversion rate. >> Add support to the LM90 driver. >> ->> Signed-off-by: Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> +>> Signed-off-by: Wei Ni <wni@nvidia.com> >> --- >> Documentation/hwmon/lm90 | 6 ++++++ >> drivers/hwmon/lm90.c | 37 +++++++++++++++++++++++++++++-------- @@ -31,7 +31,7 @@ Oh, will change it. >> + http://www.ti.com/litv/pdf/sbos686 >> + >> ->> Author: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> +>> Author: Jean Delvare <khali@linux-fr.org> >> >> diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c >> index 82a1ca15..81a7bf6 100644 @@ -103,64 +103,64 @@ Got it. >> struct lm90_data *data = lm90_update_device(dev); >> int temp; >> ->> - if (data->kind == adt7461) ->> + if (data->kind == adt7461 || data->kind == tmp451) +>> - if (data->kind = adt7461) +>> + if (data->kind = adt7461 || data->kind = tmp451) >> temp = temp_from_u8_adt7461(data, data->temp8[index]); ->> else if (data->kind == max6646) +>> else if (data->kind = max6646) >> temp = temp_from_u8(data->temp8[index]); >> @@ -762,7 +778,7 @@ static int write_temp8(struct device *dev, int index, long val) >> val -= 16000; >> >> mutex_lock(&data->update_lock); ->> - if (data->kind == adt7461) ->> + if (data->kind == adt7461 || data->kind == tmp451) +>> - if (data->kind = adt7461) +>> + if (data->kind = adt7461 || data->kind = tmp451) >> data->temp8[index] = temp_to_u8_adt7461(data, val); ->> else if (data->kind == max6646) +>> else if (data->kind = max6646) >> data->temp8[index] = temp_to_u8(val); >> @@ -803,7 +819,7 @@ static int read_temp11(struct device *dev, int index) >> struct lm90_data *data = lm90_update_device(dev); >> int temp; >> ->> - if (data->kind == adt7461) ->> + if (data->kind == adt7461 || data->kind == tmp451) +>> - if (data->kind = adt7461) +>> + if (data->kind = adt7461 || data->kind = tmp451) >> temp = temp_from_u16_adt7461(data, data->temp11[index]); ->> else if (data->kind == max6646) +>> else if (data->kind = max6646) >> temp = temp_from_u16(data->temp11[index]); >> @@ -848,7 +864,7 @@ static int write_temp11(struct device *dev, int nr, int index, long val) >> val -= 16000; >> >> mutex_lock(&data->update_lock); ->> - if (data->kind == adt7461) ->> + if (data->kind == adt7461 || data->kind == tmp451) +>> - if (data->kind = adt7461) +>> + if (data->kind = adt7461 || data->kind = tmp451) >> data->temp11[index] = temp_to_u16_adt7461(data, val); ->> else if (data->kind == max6646) +>> else if (data->kind = max6646) >> data->temp11[index] = temp_to_u8(val) << 8; >> @@ -912,7 +928,7 @@ static ssize_t show_temphyst(struct device *dev, >> struct lm90_data *data = lm90_update_device(dev); >> int temp; >> ->> - if (data->kind == adt7461) ->> + if (data->kind == adt7461 || data->kind == tmp451) +>> - if (data->kind = adt7461) +>> + if (data->kind = adt7461 || data->kind = tmp451) >> temp = temp_from_u8_adt7461(data, data->temp8[attr->index]); ->> else if (data->kind == max6646) +>> else if (data->kind = max6646) >> temp = temp_from_u8(data->temp8[attr->index]); >> @@ -940,7 +956,7 @@ static ssize_t set_temphyst(struct device *dev, struct device_attribute *dummy, >> return err; >> >> mutex_lock(&data->update_lock); ->> - if (data->kind == adt7461) ->> + if (data->kind == adt7461 || data->kind == tmp451) +>> - if (data->kind = adt7461) +>> + if (data->kind = adt7461 || data->kind = tmp451) >> temp = temp_from_u8_adt7461(data, data->temp8[2]); ->> else if (data->kind == max6646) +>> else if (data->kind = max6646) >> temp = temp_from_u8(data->temp8[2]); >> @@ -1368,6 +1384,11 @@ static int lm90_detect(struct i2c_client *client, ->> && (config1 & 0x3F) == 0x00 +>> && (config1 & 0x3F) = 0x00 >> && convrate <= 0x08) >> name = "g781"; >> + } else ->> + if (address == 0x4C ->> + && man_id == 0x55) { /* Texas Instruments */ ->> + if (chip_id == 0x00) +>> + if (address = 0x4C +>> + && man_id = 0x55) { /* Texas Instruments */ +>> + if (chip_id = 0x00) >> + name = "tmp451"; > > Chip ID register is not defined for TMP451. Even if it is readable, not sure if @@ -180,8 +180,8 @@ Yes, you are right, I will do it. >> data->config_orig = config; >> >> /* Check Temperature Range Select */ ->> - if (data->kind == adt7461) { ->> + if (data->kind == adt7461 || data->kind == tmp451) { +>> - if (data->kind = adt7461) { +>> + if (data->kind = adt7461 || data->kind = tmp451) { >> if (config & 0x04) >> data->flags |= LM90_FLAG_ADT7461_EXT; >> } @@ -189,3 +189,9 @@ Yes, you are right, I will do it. >> 1.7.9.5 >> >> + + +_______________________________________________ +lm-sensors mailing list +lm-sensors@lm-sensors.org +http://lists.lm-sensors.org/mailman/listinfo/lm-sensors diff --git a/a/content_digest b/N1/content_digest index 9f0e8a7..ca0f3bb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\01381224457-21858-1-git-send-email-wni@nvidia.com\0" "ref\020131008152550.GA18402@roeck-us.net\0" "ref\020131008152550.GA18402-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org\0" - "From\0Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\0" - "Subject\0Re: [PATCH] hwmon: (lm90) Add support for TI TMP451\0" - "Date\0Wed, 9 Oct 2013 10:30:07 +0800\0" + "From\0Wei Ni <wni@nvidia.com>\0" + "Subject\0Re: [lm-sensors] [PATCH] hwmon: (lm90) Add support for TI TMP451\0" + "Date\0Wed, 09 Oct 2013 02:30:07 +0000\0" "To\0Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>\0" "Cc\0khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>" lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org <lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org> @@ -16,7 +16,7 @@ ">> local temperature low byte and max conversion rate.\n" ">> Add support to the LM90 driver.\n" ">>\n" - ">> Signed-off-by: Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\n" + ">> Signed-off-by: Wei Ni <wni@nvidia.com>\n" ">> ---\n" ">> Documentation/hwmon/lm90 | 6 ++++++\n" ">> drivers/hwmon/lm90.c | 37 +++++++++++++++++++++++++++++--------\n" @@ -43,7 +43,7 @@ ">> + http://www.ti.com/litv/pdf/sbos686\n" ">> +\n" ">> \n" - ">> Author: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>\n" + ">> Author: Jean Delvare <khali@linux-fr.org>\n" ">> \n" ">> diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c\n" ">> index 82a1ca15..81a7bf6 100644\n" @@ -115,64 +115,64 @@ ">> \tstruct lm90_data *data = lm90_update_device(dev);\n" ">> \tint temp;\n" ">> \n" - ">> -\tif (data->kind == adt7461)\n" - ">> +\tif (data->kind == adt7461 || data->kind == tmp451)\n" + ">> -\tif (data->kind = adt7461)\n" + ">> +\tif (data->kind = adt7461 || data->kind = tmp451)\n" ">> \t\ttemp = temp_from_u8_adt7461(data, data->temp8[index]);\n" - ">> \telse if (data->kind == max6646)\n" + ">> \telse if (data->kind = max6646)\n" ">> \t\ttemp = temp_from_u8(data->temp8[index]);\n" ">> @@ -762,7 +778,7 @@ static int write_temp8(struct device *dev, int index, long val)\n" ">> \t\tval -= 16000;\n" ">> \n" ">> \tmutex_lock(&data->update_lock);\n" - ">> -\tif (data->kind == adt7461)\n" - ">> +\tif (data->kind == adt7461 || data->kind == tmp451)\n" + ">> -\tif (data->kind = adt7461)\n" + ">> +\tif (data->kind = adt7461 || data->kind = tmp451)\n" ">> \t\tdata->temp8[index] = temp_to_u8_adt7461(data, val);\n" - ">> \telse if (data->kind == max6646)\n" + ">> \telse if (data->kind = max6646)\n" ">> \t\tdata->temp8[index] = temp_to_u8(val);\n" ">> @@ -803,7 +819,7 @@ static int read_temp11(struct device *dev, int index)\n" ">> \tstruct lm90_data *data = lm90_update_device(dev);\n" ">> \tint temp;\n" ">> \n" - ">> -\tif (data->kind == adt7461)\n" - ">> +\tif (data->kind == adt7461 || data->kind == tmp451)\n" + ">> -\tif (data->kind = adt7461)\n" + ">> +\tif (data->kind = adt7461 || data->kind = tmp451)\n" ">> \t\ttemp = temp_from_u16_adt7461(data, data->temp11[index]);\n" - ">> \telse if (data->kind == max6646)\n" + ">> \telse if (data->kind = max6646)\n" ">> \t\ttemp = temp_from_u16(data->temp11[index]);\n" ">> @@ -848,7 +864,7 @@ static int write_temp11(struct device *dev, int nr, int index, long val)\n" ">> \t\tval -= 16000;\n" ">> \n" ">> \tmutex_lock(&data->update_lock);\n" - ">> -\tif (data->kind == adt7461)\n" - ">> +\tif (data->kind == adt7461 || data->kind == tmp451)\n" + ">> -\tif (data->kind = adt7461)\n" + ">> +\tif (data->kind = adt7461 || data->kind = tmp451)\n" ">> \t\tdata->temp11[index] = temp_to_u16_adt7461(data, val);\n" - ">> \telse if (data->kind == max6646)\n" + ">> \telse if (data->kind = max6646)\n" ">> \t\tdata->temp11[index] = temp_to_u8(val) << 8;\n" ">> @@ -912,7 +928,7 @@ static ssize_t show_temphyst(struct device *dev,\n" ">> \tstruct lm90_data *data = lm90_update_device(dev);\n" ">> \tint temp;\n" ">> \n" - ">> -\tif (data->kind == adt7461)\n" - ">> +\tif (data->kind == adt7461 || data->kind == tmp451)\n" + ">> -\tif (data->kind = adt7461)\n" + ">> +\tif (data->kind = adt7461 || data->kind = tmp451)\n" ">> \t\ttemp = temp_from_u8_adt7461(data, data->temp8[attr->index]);\n" - ">> \telse if (data->kind == max6646)\n" + ">> \telse if (data->kind = max6646)\n" ">> \t\ttemp = temp_from_u8(data->temp8[attr->index]);\n" ">> @@ -940,7 +956,7 @@ static ssize_t set_temphyst(struct device *dev, struct device_attribute *dummy,\n" ">> \t\treturn err;\n" ">> \n" ">> \tmutex_lock(&data->update_lock);\n" - ">> -\tif (data->kind == adt7461)\n" - ">> +\tif (data->kind == adt7461 || data->kind == tmp451)\n" + ">> -\tif (data->kind = adt7461)\n" + ">> +\tif (data->kind = adt7461 || data->kind = tmp451)\n" ">> \t\ttemp = temp_from_u8_adt7461(data, data->temp8[2]);\n" - ">> \telse if (data->kind == max6646)\n" + ">> \telse if (data->kind = max6646)\n" ">> \t\ttemp = temp_from_u8(data->temp8[2]);\n" ">> @@ -1368,6 +1384,11 @@ static int lm90_detect(struct i2c_client *client,\n" - ">> \t\t && (config1 & 0x3F) == 0x00\n" + ">> \t\t && (config1 & 0x3F) = 0x00\n" ">> \t\t && convrate <= 0x08)\n" ">> \t\t\tname = \"g781\";\n" ">> +\t} else\n" - ">> +\tif (address == 0x4C\n" - ">> +\t && man_id == 0x55) { /* Texas Instruments */\n" - ">> +\t\tif (chip_id == 0x00)\n" + ">> +\tif (address = 0x4C\n" + ">> +\t && man_id = 0x55) { /* Texas Instruments */\n" + ">> +\t\tif (chip_id = 0x00)\n" ">> +\t\t\tname = \"tmp451\";\n" "> \n" "> Chip ID register is not defined for TMP451. Even if it is readable, not sure if\n" @@ -192,14 +192,20 @@ ">> \tdata->config_orig = config;\n" ">> \n" ">> \t/* Check Temperature Range Select */\n" - ">> -\tif (data->kind == adt7461) {\n" - ">> +\tif (data->kind == adt7461 || data->kind == tmp451) {\n" + ">> -\tif (data->kind = adt7461) {\n" + ">> +\tif (data->kind = adt7461 || data->kind = tmp451) {\n" ">> \t\tif (config & 0x04)\n" ">> \t\t\tdata->flags |= LM90_FLAG_ADT7461_EXT;\n" ">> \t}\n" ">> -- \n" ">> 1.7.9.5\n" ">>\n" - >> + ">>\n" + "\n" + "\n" + "_______________________________________________\n" + "lm-sensors mailing list\n" + "lm-sensors@lm-sensors.org\n" + http://lists.lm-sensors.org/mailman/listinfo/lm-sensors -1b4ca4a970f2ed63550fe70fed24dc644aa45eb2219db97201b969af58ca3d37 +795264e81145817e726cd2ba3cc4abcca9f24cd4dfca73bc2a42ae0cbeada07e
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.