diff for duplicates of <20131009151744.GA7787@roeck-us.net> diff --git a/a/1.txt b/N1/1.txt index 2bfd152..cd4d03e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,9 +3,9 @@ On Wed, Oct 09, 2013 at 01:40:48PM +0800, Wei Ni 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> -Reviewed-by: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org> +Reviewed-by: Guenter Roeck <linux@roeck-us.net> Jean, I assume you'll take this one ? Otherwise, please let me know. @@ -32,7 +32,7 @@ Guenter > + 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..e9a5e30 100644 @@ -95,72 +95,72 @@ Guenter > 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,19 @@ 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 (address = 0x4C +> + && man_id = 0x55) { /* Texas Instruments */ > + int local_ext; > + > + local_ext = i2c_smbus_read_byte_data(client, > + TMP451_REG_R_LOCAL_TEMPL); > + -> + if (chip_id == 0x00 /* TMP451 */ -> + && (config1 & 0x1B) == 0x00 +> + if (chip_id = 0x00 /* TMP451 */ +> + && (config1 & 0x1B) = 0x00 > + && convrate <= 0x09 -> + && (local_ext & 0x0F) == 0x00) +> + && (local_ext & 0x0F) = 0x00) > + name = "tmp451"; > } > @@ -169,12 +169,17 @@ Guenter > 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; > } > -- > 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 d607270..be68d10 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01381297248-13375-1-git-send-email-wni@nvidia.com\0" "ref\01381297248-13375-1-git-send-email-wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org\0" - "From\0Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>\0" - "Subject\0Re: [PATCH v2] hwmon: (lm90) Add support for TI TMP451\0" - "Date\0Wed, 9 Oct 2013 08:17:44 -0700\0" + "From\0Guenter Roeck <linux@roeck-us.net>\0" + "Subject\0Re: [lm-sensors] [PATCH v2] hwmon: (lm90) Add support for TI TMP451\0" + "Date\0Wed, 09 Oct 2013 15:17:44 +0000\0" "To\0Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\0" "Cc\0khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org" lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org @@ -14,9 +14,9 @@ "> 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" - "Reviewed-by: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>\n" + "Reviewed-by: Guenter Roeck <linux@roeck-us.net>\n" "\n" "Jean, I assume you'll take this one ? Otherwise, please let me know.\n" "\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..e9a5e30 100644\n" @@ -106,72 +106,72 @@ "> \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,19 @@ 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" + "> +\tif (address = 0x4C\n" + "> +\t && man_id = 0x55) { /* Texas Instruments */\n" "> +\t\tint local_ext;\n" "> +\n" "> +\t\tlocal_ext = i2c_smbus_read_byte_data(client,\n" "> +\t\t\t\t\t\t TMP451_REG_R_LOCAL_TEMPL);\n" "> +\n" - "> +\t\tif (chip_id == 0x00 /* TMP451 */\n" - "> +\t\t && (config1 & 0x1B) == 0x00\n" + "> +\t\tif (chip_id = 0x00 /* TMP451 */\n" + "> +\t\t && (config1 & 0x1B) = 0x00\n" "> +\t\t && convrate <= 0x09\n" - "> +\t\t && (local_ext & 0x0F) == 0x00)\n" + "> +\t\t && (local_ext & 0x0F) = 0x00)\n" "> +\t\t\tname = \"tmp451\";\n" "> \t}\n" "> \n" @@ -180,14 +180,19 @@ "> \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" + "lm-sensors mailing list\n" + "lm-sensors@lm-sensors.org\n" + http://lists.lm-sensors.org/mailman/listinfo/lm-sensors -2fafafcd35ddd342b0774b61d56131bbae3c73b08cfbb08eb3d69120ca8b925e +65cfbe636b95ee30d9323c64d2bc7cea79cff924d6084148580f84d5ee20033d
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.