diff for duplicates of <20100702092011.0acd753f@hyperion.delvare> diff --git a/a/1.txt b/N1/1.txt index 4bb62b5..048b34e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -99,21 +99,21 @@ value by including the register addresses here. > * Conversions > @@ -1343,22 +1355,35 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev) > /* 627EHG and 627EHF have 10 voltage inputs; 627DHG and 667HG have 9 */ -> data->in_num = (sio_data->kind = w83627ehf) ? 10 : 9; +> data->in_num = (sio_data->kind == w83627ehf) ? 10 : 9; > /* 667HG has 3 pwms */ -> - data->pwm_num = (sio_data->kind = w83667hg) ? 3 : 4; -> + data->pwm_num = (sio_data->kind = w83667hg -> + || sio_data->kind = w83667hg_b) ? 3 : 4; +> - data->pwm_num = (sio_data->kind == w83667hg) ? 3 : 4; +> + data->pwm_num = (sio_data->kind == w83667hg +> + || sio_data->kind == w83667hg_b) ? 3 : 4; > > /* Check temp3 configuration bit for 667HG */ -> - if (sio_data->kind = w83667hg) { -> + if (sio_data->kind = w83667hg || sio_data->kind = w83667hg_b) { +> - if (sio_data->kind == w83667hg) { +> + if (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) { > data->temp3_disable = w83627ehf_read_value(data, > W83627EHF_REG_TEMP_CONFIG[1]) & 0x01; > data->in6_skip = !data->temp3_disable; > } > -> + if (sio_data->kind = w83667hg_b) { +> + if (sio_data->kind == w83667hg_b) { > + W83627EHF_REG_FAN_MAX_OUTPUT > + = W83627EHF_REG_FAN_MAX_OUTPUT_W83667_B; > + W83627EHF_REG_FAN_STEP_OUTPUT @@ -140,8 +140,8 @@ But as said above, the easier is probably to just drop them. > data->vrm = vid_which_vrm(); > superio_enter(sio_data->sioreg); > /* Read VID value */ -> - if (sio_data->kind = w83667hg) { -> + if (sio_data->kind = w83667hg || sio_data->kind = w83667hg_b) { +> - if (sio_data->kind == w83667hg) { +> + if (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) { > /* W83667HG has different pins for VID input and output, so > we can get the VID input values directly at logical device D > 0xe3. */ @@ -149,8 +149,8 @@ But as said above, the easier is probably to just drop them. > } > > /* fan4 and fan5 share some pins with the GPIO and serial flash */ -> - if (sio_data->kind = w83667hg) { -> + if (sio_data->kind = w83667hg || sio_data->kind = w83667hg_b) { +> - if (sio_data->kind == w83667hg) { +> + if (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) { > fan5pin = superio_inb(sio_data->sioreg, 0x27) & 0x20; > fan4pin = superio_inb(sio_data->sioreg, 0x27) & 0x40; > } else { @@ -177,8 +177,3 @@ But as said above, the easier is probably to just drop them. -- Jean Delvare - -_______________________________________________ -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 9077761..d1ed844 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01278021735-21188-1-git-send-email-guenter.roeck@ericsson.com\0" "From\0Jean Delvare <khali@linux-fr.org>\0" - "Subject\0Re: [lm-sensors] [PATCH/RFC] hwmon: Add support for W83667HG-B\0" - "Date\0Fri, 02 Jul 2010 07:20:11 +0000\0" + "Subject\0Re: [PATCH/RFC] hwmon: Add support for W83667HG-B\0" + "Date\0Fri, 2 Jul 2010 09:20:11 +0200\0" "To\0Guenter Roeck <guenter.roeck@ericsson.com>\0" "Cc\0Jim Cromie <jim.cromie@gmail.com>" H Hartley Sweeten <hsweeten@visionengravers.com> @@ -116,21 +116,21 @@ "> * Conversions\n" "> @@ -1343,22 +1355,35 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)\n" "> \t/* 627EHG and 627EHF have 10 voltage inputs; 627DHG and 667HG have 9 */\n" - "> \tdata->in_num = (sio_data->kind = w83627ehf) ? 10 : 9;\n" + "> \tdata->in_num = (sio_data->kind == w83627ehf) ? 10 : 9;\n" "> \t/* 667HG has 3 pwms */\n" - "> -\tdata->pwm_num = (sio_data->kind = w83667hg) ? 3 : 4;\n" - "> +\tdata->pwm_num = (sio_data->kind = w83667hg\n" - "> +\t\t\t || sio_data->kind = w83667hg_b) ? 3 : 4;\n" + "> -\tdata->pwm_num = (sio_data->kind == w83667hg) ? 3 : 4;\n" + "> +\tdata->pwm_num = (sio_data->kind == w83667hg\n" + "> +\t\t\t || sio_data->kind == w83667hg_b) ? 3 : 4;\n" "> \n" "> \t/* Check temp3 configuration bit for 667HG */\n" - "> -\tif (sio_data->kind = w83667hg) {\n" - "> +\tif (sio_data->kind = w83667hg || sio_data->kind = w83667hg_b) {\n" + "> -\tif (sio_data->kind == w83667hg) {\n" + "> +\tif (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) {\n" "> \t\tdata->temp3_disable = w83627ehf_read_value(data,\n" "> \t\t\t\t\tW83627EHF_REG_TEMP_CONFIG[1]) & 0x01;\n" "> \t\tdata->in6_skip = !data->temp3_disable;\n" "> \t}\n" "> \n" - "> +\tif (sio_data->kind = w83667hg_b) {\n" + "> +\tif (sio_data->kind == w83667hg_b) {\n" "> +\t\tW83627EHF_REG_FAN_MAX_OUTPUT\n" "> +\t\t = W83627EHF_REG_FAN_MAX_OUTPUT_W83667_B;\n" "> +\t\tW83627EHF_REG_FAN_STEP_OUTPUT\n" @@ -157,8 +157,8 @@ "> \tdata->vrm = vid_which_vrm();\n" "> \tsuperio_enter(sio_data->sioreg);\n" "> \t/* Read VID value */\n" - "> -\tif (sio_data->kind = w83667hg) {\n" - "> +\tif (sio_data->kind = w83667hg || sio_data->kind = w83667hg_b) {\n" + "> -\tif (sio_data->kind == w83667hg) {\n" + "> +\tif (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) {\n" "> \t\t/* W83667HG has different pins for VID input and output, so\n" "> \t\twe can get the VID input values directly at logical device D\n" "> \t\t0xe3. */\n" @@ -166,8 +166,8 @@ "> \t}\n" "> \n" "> \t/* fan4 and fan5 share some pins with the GPIO and serial flash */\n" - "> -\tif (sio_data->kind = w83667hg) {\n" - "> +\tif (sio_data->kind = w83667hg || sio_data->kind = w83667hg_b) {\n" + "> -\tif (sio_data->kind == w83667hg) {\n" + "> +\tif (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) {\n" "> \t\tfan5pin = superio_inb(sio_data->sioreg, 0x27) & 0x20;\n" "> \t\tfan4pin = superio_inb(sio_data->sioreg, 0x27) & 0x40;\n" "> \t} else {\n" @@ -193,11 +193,6 @@ "\n" "\n" "-- \n" - "Jean Delvare\n" - "\n" - "_______________________________________________\n" - "lm-sensors mailing list\n" - "lm-sensors@lm-sensors.org\n" - http://lists.lm-sensors.org/mailman/listinfo/lm-sensors + Jean Delvare -34f2e9533df492b191d54dd9938f5368ff1d9f211e0ad04d73c0cbce0982ecdb +26fbb820eddcf79b15e14634a9364c6e6de5c67c75390e5db57736d0dcf835e3
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.