[lm-sensors] [PATCH] hwmon: (it87) Drop uart6 condition for vin5&vin6 for IT8783F

[lm-sensors] [PATCH] hwmon: (it87) Drop uart6 condition for vin5&vin6 for IT8783F

[Björn Gerhart]

From: Bjoern Gerhart <oss@extracloud.de>

Drop UART6 condition for IT8783F related to VIN5 and VIN6.
In case UART6 is routed via JP4 to a different set of pins,
VIN5 and VIN6 can be used at the same time.

diff -Naur a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
--- a/drivers/hwmon/it87.c	2012-05-15 16:53:07.156061059 +0200
+++ b/drivers/hwmon/it87.c	2012-05-15 17:19:31.717061875 +0200
@@ -1806,11 +1806,11 @@
 			sio_data->skip_pwm |= (1 << 1);
 
 		/* VIN5 */
-		if ((reg27 & (1 << 0)) || uart6)
+		if (reg27 & (1 << 0))
 			sio_data->skip_in |= (1 << 5); /* No VIN5 */
 
 		/* VIN6 */
-		if ((reg27 & (1 << 1)) || uart6)
+		if (reg27 & (1 << 1))
 			sio_data->skip_in |= (1 << 6); /* No VIN6 */
 
 		/*



_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] [PATCH] hwmon: (it87) Drop uart6 condition for vin5&vin6 for IT8783F

[Jean Delvare]

T24gVHVlLCAxNSBNYXkgMjAxMiAxOToyNTowMyArMDIwMCwgQmrDtnJuIEdlcmhhcnQgd3JvdGU6
Cj4gRnJvbTogQmpvZXJuIEdlcmhhcnQgPG9zc0BleHRyYWNsb3VkLmRlPgo+IAo+IERyb3AgVUFS
VDYgY29uZGl0aW9uIGZvciBJVDg3ODNGIHJlbGF0ZWQgdG8gVklONSBhbmQgVklONi4KPiBJbiBj
YXNlIFVBUlQ2IGlzIHJvdXRlZCB2aWEgSlA0IHRvIGEgZGlmZmVyZW50IHNldCBvZiBwaW5zLAo+
IFZJTjUgYW5kIFZJTjYgY2FuIGJlIHVzZWQgYXQgdGhlIHNhbWUgdGltZS4KPiAKPiBkaWZmIC1O
YXVyIGEvZHJpdmVycy9od21vbi9pdDg3LmMgYi9kcml2ZXJzL2h3bW9uL2l0ODcuYwo+IC0tLSBh
L2RyaXZlcnMvaHdtb24vaXQ4Ny5jCTIwMTItMDUtMTUgMTY6NTM6MDcuMTU2MDYxMDU5ICswMjAw
Cj4gKysrIGIvZHJpdmVycy9od21vbi9pdDg3LmMJMjAxMi0wNS0xNSAxNzoxOTozMS43MTcwNjE4
NzUgKzAyMDAKPiBAQCAtMTgwNiwxMSArMTgwNiwxMSBAQAo+ICAJCQlzaW9fZGF0YS0+c2tpcF9w
d20gfD0gKDEgPDwgMSk7Cj4gIAo+ICAJCS8qIFZJTjUgKi8KPiAtCQlpZiAoKHJlZzI3ICYgKDEg
PDwgMCkpIHx8IHVhcnQ2KQo+ICsJCWlmIChyZWcyNyAmICgxIDw8IDApKQo+ICAJCQlzaW9fZGF0
YS0+c2tpcF9pbiB8PSAoMSA8PCA1KTsgLyogTm8gVklONSAqLwo+ICAKPiAgCQkvKiBWSU42ICov
Cj4gLQkJaWYgKChyZWcyNyAmICgxIDw8IDEpKSB8fCB1YXJ0NikKPiArCQlpZiAocmVnMjcgJiAo
MSA8PCAxKSkKPiAgCQkJc2lvX2RhdGEtPnNraXBfaW4gfD0gKDEgPDwgNik7IC8qIE5vIFZJTjYg
Ki8KPiAgCj4gIAkJLyoKPiAKCldoYXQgYWJvdXQgRkFOM19UQUM/IEFzIEkgcmVhZCB0aGUgZGF0
YXNoZWV0LCBpdCBpcyBhbHNvICJmcmVlZCIgaWYKVUFSVDYgaXMgbW92ZWQgdG8gcGlucyAxMDAt
MTA2LiBTbyBJIHN1c3BlY3Qgd2UgZG9uJ3Qgd2FudCB0byBjaGVjayBmb3IKdWFydDYgYXQgYWxs
IGZvciB0aGUgSVQ4NzgzRi4KClRoaXMgYWxsIHdvdWxkIGJldHRlciBiZSBkb25lIGRpcmVjdGx5
IGluIEd1ZW50ZXIncyBwYXRjaCwgQlRXLCBhcyBpdAppc24ndCB1cHN0cmVhbSB5ZXQuCgotLSAK
SmVhbiBEZWx2YXJlCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fXwpsbS1zZW5zb3JzIG1haWxpbmcgbGlzdApsbS1zZW5zb3JzQGxtLXNlbnNvcnMub3JnCmh0
dHA6Ly9saXN0cy5sbS1zZW5zb3JzLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xtLXNlbnNvcnM

Re: [lm-sensors] [PATCH] hwmon: (it87) Drop uart6 condition for vin5&vin6 for IT8783F

[Björn Gerhart]

Hi Jean,

> What about FAN3_TAC? As I read the datasheet, it is also "freed" if
> UART6 is moved to pins 100-106. So I suspect we don't want to check for
> uart6 at all for the IT8783F.
> 
Yes you're right, following the same logic FAN_TAC3 should get freed likewise.

> This all would better be done directly in Guenter's patch, BTW, as it
> isn't upstream yet.
> 
agreed from my side   ;-)

Björn


_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] [PATCH] hwmon: (it87) Drop uart6 condition for vin5&vin6 for IT8783F

[Guenter Roeck]

T24gVHVlLCAyMDEyLTA1LTE1IGF0IDE0OjIxIC0wNDAwLCBKZWFuIERlbHZhcmUgd3JvdGU6Cj4g
T24gVHVlLCAxNSBNYXkgMjAxMiAxOToyNTowMyArMDIwMCwgQmrDtnJuIEdlcmhhcnQgd3JvdGU6
Cj4gPiBGcm9tOiBCam9lcm4gR2VyaGFydCA8b3NzQGV4dHJhY2xvdWQuZGU+Cj4gPiAKPiA+IERy
b3AgVUFSVDYgY29uZGl0aW9uIGZvciBJVDg3ODNGIHJlbGF0ZWQgdG8gVklONSBhbmQgVklONi4K
PiA+IEluIGNhc2UgVUFSVDYgaXMgcm91dGVkIHZpYSBKUDQgdG8gYSBkaWZmZXJlbnQgc2V0IG9m
IHBpbnMsCj4gPiBWSU41IGFuZCBWSU42IGNhbiBiZSB1c2VkIGF0IHRoZSBzYW1lIHRpbWUuCj4g
PiAKPiA+IGRpZmYgLU5hdXIgYS9kcml2ZXJzL2h3bW9uL2l0ODcuYyBiL2RyaXZlcnMvaHdtb24v
aXQ4Ny5jCj4gPiAtLS0gYS9kcml2ZXJzL2h3bW9uL2l0ODcuYwkyMDEyLTA1LTE1IDE2OjUzOjA3
LjE1NjA2MTA1OSArMDIwMAo+ID4gKysrIGIvZHJpdmVycy9od21vbi9pdDg3LmMJMjAxMi0wNS0x
NSAxNzoxOTozMS43MTcwNjE4NzUgKzAyMDAKPiA+IEBAIC0xODA2LDExICsxODA2LDExIEBACj4g
PiAgCQkJc2lvX2RhdGEtPnNraXBfcHdtIHw9ICgxIDw8IDEpOwo+ID4gIAo+ID4gIAkJLyogVklO
NSAqLwo+ID4gLQkJaWYgKChyZWcyNyAmICgxIDw8IDApKSB8fCB1YXJ0NikKPiA+ICsJCWlmIChy
ZWcyNyAmICgxIDw8IDApKQo+ID4gIAkJCXNpb19kYXRhLT5za2lwX2luIHw9ICgxIDw8IDUpOyAv
KiBObyBWSU41ICovCj4gPiAgCj4gPiAgCQkvKiBWSU42ICovCj4gPiAtCQlpZiAoKHJlZzI3ICYg
KDEgPDwgMSkpIHx8IHVhcnQ2KQo+ID4gKwkJaWYgKHJlZzI3ICYgKDEgPDwgMSkpCj4gPiAgCQkJ
c2lvX2RhdGEtPnNraXBfaW4gfD0gKDEgPDwgNik7IC8qIE5vIFZJTjYgKi8KPiA+ICAKPiA+ICAJ
CS8qCj4gPiAKPiAKPiBXaGF0IGFib3V0IEZBTjNfVEFDPyBBcyBJIHJlYWQgdGhlIGRhdGFzaGVl
dCwgaXQgaXMgYWxzbyAiZnJlZWQiIGlmCj4gVUFSVDYgaXMgbW92ZWQgdG8gcGlucyAxMDAtMTA2
LiBTbyBJIHN1c3BlY3Qgd2UgZG9uJ3Qgd2FudCB0byBjaGVjayBmb3IKPiB1YXJ0NiBhdCBhbGwg
Zm9yIHRoZSBJVDg3ODNGLgo+IAo+IFRoaXMgYWxsIHdvdWxkIGJldHRlciBiZSBkb25lIGRpcmVj
dGx5IGluIEd1ZW50ZXIncyBwYXRjaCwgQlRXLCBhcyBpdAo+IGlzbid0IHVwc3RyZWFtIHlldC4K
PiAKTGV0IG1lIGxvb2sgYXQgaXQgYWdhaW4gdG9uaWdodC4gVGhlIGZhbjMgdGVzdCBpcyAifHwg
IXVhcnQ2Iiwgc28gaXQgaXMKdGhlIG9wcG9zaXRlLiBJIGFtIGdldHRpbmcgbW9yZSBhbmQgbW9y
ZSBjb25mdXNlZCA6KC4gSSdsbCBoYXZlIHRvCnJlLXJlYWQgdGhlIGRhdGEgc2hlZXQgdG8gc2Vl
IHdoYXQgaXMgZ29pbmcgb24uCgpHdWVudGVyCgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fCmxtLXNlbnNvcnMgbWFpbGluZyBsaXN0CmxtLXNlbnNvcnNA
bG0tc2Vuc29ycy5vcmcKaHR0cDovL2xpc3RzLmxtLXNlbnNvcnMub3JnL21haWxtYW4vbGlzdGlu
Zm8vbG0tc2Vuc29ycw=

Re: [lm-sensors] [PATCH] hwmon: (it87) Drop uart6 condition for vin5&vin6 for IT8783F

[Guenter Roeck]

T24gVHVlLCAyMDEyLTA1LTE1IGF0IDE0OjIxIC0wNDAwLCBKZWFuIERlbHZhcmUgd3JvdGU6Cj4g
T24gVHVlLCAxNSBNYXkgMjAxMiAxOToyNTowMyArMDIwMCwgQmrDtnJuIEdlcmhhcnQgd3JvdGU6
Cj4gPiBGcm9tOiBCam9lcm4gR2VyaGFydCA8b3NzQGV4dHJhY2xvdWQuZGU+Cj4gPiAKPiA+IERy
b3AgVUFSVDYgY29uZGl0aW9uIGZvciBJVDg3ODNGIHJlbGF0ZWQgdG8gVklONSBhbmQgVklONi4K
PiA+IEluIGNhc2UgVUFSVDYgaXMgcm91dGVkIHZpYSBKUDQgdG8gYSBkaWZmZXJlbnQgc2V0IG9m
IHBpbnMsCj4gPiBWSU41IGFuZCBWSU42IGNhbiBiZSB1c2VkIGF0IHRoZSBzYW1lIHRpbWUuCj4g
PiAKPiA+IGRpZmYgLU5hdXIgYS9kcml2ZXJzL2h3bW9uL2l0ODcuYyBiL2RyaXZlcnMvaHdtb24v
aXQ4Ny5jCj4gPiAtLS0gYS9kcml2ZXJzL2h3bW9uL2l0ODcuYwkyMDEyLTA1LTE1IDE2OjUzOjA3
LjE1NjA2MTA1OSArMDIwMAo+ID4gKysrIGIvZHJpdmVycy9od21vbi9pdDg3LmMJMjAxMi0wNS0x
NSAxNzoxOTozMS43MTcwNjE4NzUgKzAyMDAKPiA+IEBAIC0xODA2LDExICsxODA2LDExIEBACj4g
PiAgCQkJc2lvX2RhdGEtPnNraXBfcHdtIHw9ICgxIDw8IDEpOwo+ID4gIAo+ID4gIAkJLyogVklO
NSAqLwo+ID4gLQkJaWYgKChyZWcyNyAmICgxIDw8IDApKSB8fCB1YXJ0NikKPiA+ICsJCWlmIChy
ZWcyNyAmICgxIDw8IDApKQo+ID4gIAkJCXNpb19kYXRhLT5za2lwX2luIHw9ICgxIDw8IDUpOyAv
KiBObyBWSU41ICovCj4gPiAgCj4gPiAgCQkvKiBWSU42ICovCj4gPiAtCQlpZiAoKHJlZzI3ICYg
KDEgPDwgMSkpIHx8IHVhcnQ2KQo+ID4gKwkJaWYgKHJlZzI3ICYgKDEgPDwgMSkpCj4gPiAgCQkJ
c2lvX2RhdGEtPnNraXBfaW4gfD0gKDEgPDwgNik7IC8qIE5vIFZJTjYgKi8KPiA+ICAKPiA+ICAJ
CS8qCj4gPiAKPiAKPiBXaGF0IGFib3V0IEZBTjNfVEFDPyBBcyBJIHJlYWQgdGhlIGRhdGFzaGVl
dCwgaXQgaXMgYWxzbyAiZnJlZWQiIGlmCj4gVUFSVDYgaXMgbW92ZWQgdG8gcGlucyAxMDAtMTA2
LiBTbyBJIHN1c3BlY3Qgd2UgZG9uJ3Qgd2FudCB0byBjaGVjayBmb3IKPiB1YXJ0NiBhdCBhbGwg
Zm9yIHRoZSBJVDg3ODNGLgo+IApUaGUgZGF0YSBzaGVldCBzYXlzLCB3aXRoIFJlZ2lzdGVyIDB4
MjcvQml0IDA6CgpGdW5jdGlvbiBTZWxlY3Rpb24gb2YgUGluIDkzIChGU1ApCjA6IFZJTjUvRkFO
X1RBQzMvU0lONgpJZiBiaXQgMiBvZiBpbmRleCAyQ2ggaXMgMSwgRkFOX1RBQzMvU0lONiBpbnB1
dCBpcyBlbmFibGVkOyBvdGhlcndpc2UKc2VsZWN0IFZJTjUgaW5wdXQuCjE6IEdQMzAKCkFzc3Vt
aW5nIHRoZSBhYm92ZSBpcyBjb3JyZWN0LCBJIHRoaW5rIEknbGwgcmVuYW1lICJ1YXJ0NiIgdG8g
ImZhbjMiIGFuZAp1c2UKCglmYW4zID0gcmVnMkMgJiAoMSA8PCAyKTsKLi4uCgkvKiBDaGVjayBp
ZiBmYW4zIGlzIHRoZXJlIG9yIG5vdCAqLwoJaWYgKChyZWcyNyAmICgxIDw8IDApKSB8fCAhZmFu
MykKICAgICAgICAgICAgICAgIHNpb19kYXRhLT5za2lwX2ZhbiB8PSAoMSA8PCAyKTsKLi4uCglp
ZiAoKHJlZzI3ICYgKDEgPDwgMCkpIHx8IGZhbjMpCgkJc2lvX2RhdGEtPnNraXBfaW4gfD0gKDEg
PDwgNSk7IC8qIE5vIFZJTjUgKi8KCkRvZXMgdGhhdCBtYWtlIHNlbnNlID8KClRoYW5rcywKR3Vl
bnRlcgoKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwps
bS1zZW5zb3JzIG1haWxpbmcgbGlzdApsbS1zZW5zb3JzQGxtLXNlbnNvcnMub3JnCmh0dHA6Ly9s
aXN0cy5sbS1zZW5zb3JzLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xtLXNlbnNvcnM

Re: [lm-sensors] [PATCH] hwmon: (it87) Drop uart6 condition for vin5&vin6 for IT8783F

[Jean Delvare]

T24gVHVlLCAxNSBNYXkgMjAxMiAxMjo1MTowOCAtMDcwMCwgR3VlbnRlciBSb2VjayB3cm90ZToK
PiBPbiBUdWUsIDIwMTItMDUtMTUgYXQgMTQ6MjEgLTA0MDAsIEplYW4gRGVsdmFyZSB3cm90ZToK
PiA+IFdoYXQgYWJvdXQgRkFOM19UQUM/IEFzIEkgcmVhZCB0aGUgZGF0YXNoZWV0LCBpdCBpcyBh
bHNvICJmcmVlZCIgaWYKPiA+IFVBUlQ2IGlzIG1vdmVkIHRvIHBpbnMgMTAwLTEwNi4gU28gSSBz
dXNwZWN0IHdlIGRvbid0IHdhbnQgdG8gY2hlY2sgZm9yCj4gPiB1YXJ0NiBhdCBhbGwgZm9yIHRo
ZSBJVDg3ODNGLgo+ID4gCj4gVGhlIGRhdGEgc2hlZXQgc2F5cywgd2l0aCBSZWdpc3RlciAweDI3
L0JpdCAwOgo+IAo+IEZ1bmN0aW9uIFNlbGVjdGlvbiBvZiBQaW4gOTMgKEZTUCkKPiAwOiBWSU41
L0ZBTl9UQUMzL1NJTjYKPiBJZiBiaXQgMiBvZiBpbmRleCAyQ2ggaXMgMSwgRkFOX1RBQzMvU0lO
NiBpbnB1dCBpcyBlbmFibGVkOyBvdGhlcndpc2UKPiBzZWxlY3QgVklONSBpbnB1dC4KPiAxOiBH
UDMwCj4gCj4gQXNzdW1pbmcgdGhlIGFib3ZlIGlzIGNvcnJlY3QsIEkgdGhpbmsgSSdsbCByZW5h
bWUgInVhcnQ2IiB0byAiZmFuMyIgYW5kCj4gdXNlCj4gCj4gCWZhbjMgPSByZWcyQyAmICgxIDw8
IDIpOwo+IC4uLgo+IAkvKiBDaGVjayBpZiBmYW4zIGlzIHRoZXJlIG9yIG5vdCAqLwo+IAlpZiAo
KHJlZzI3ICYgKDEgPDwgMCkpIHx8ICFmYW4zKQo+ICAgICAgICAgICAgICAgICBzaW9fZGF0YS0+
c2tpcF9mYW4gfD0gKDEgPDwgMik7Cj4gLi4uCj4gCWlmICgocmVnMjcgJiAoMSA8PCAwKSkgfHwg
ZmFuMykKPiAJCXNpb19kYXRhLT5za2lwX2luIHw9ICgxIDw8IDUpOyAvKiBObyBWSU41ICovCj4g
Cj4gRG9lcyB0aGF0IG1ha2Ugc2Vuc2UgPwoKVGhhdCdzIHdoYXQgdGhlIGRhdGFzaGVldCBzYXlz
LCBhdCBsZWFzdC4gSSBmaW5kIGl0IHdlaXJkIHRoYXQgZW5hYmxpbmcKVUFSVDYgaGFzIGFuIGVm
ZmVjdCBvbiBWSU41IHZzLiBGQU4zX1RBQywgZXNwZWNpYWxseSB3aGVuIFVBUlQ2IHBpbnMKY2Fu
IGJlIHJlbWFwcGVkIHRvIGEgY29tcGxldGVseSBkaWZmZXJlbnQgbG9jYXRpb24sIGJ1dCBtYXli
ZSB0aGlzIGlzCnJlYWxseSBob3cgdGhlIGNoaXAgd29ya3MuCgpJIHRoaW5rIEkgd291bGRuJ3Qg
aW50cm9kdWNlIHZhcmlhYmxlIGZhbjMsIGFzIGl0IGlzIGtpbmQgb2YgYQptaXNub21lciwgYW5k
IGEgcHJvcGVyIG5hbWUgd291bGQgYmUgb3Zlcmx5IGxvbmcuIEJ1dCB0aGlzIGlzIGFuCmltcGxl
bWVudGF0aW9uIGRldGFpbC4KCkJqw7Zybiwgd2hhdCBpcyB5b3VyIGRlc2lnbiB1c2luZyBwaW4g
OTMgZm9yPwoKLS0gCkplYW4gRGVsdmFyZQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX18KbG0tc2Vuc29ycyBtYWlsaW5nIGxpc3QKbG0tc2Vuc29yc0BsbS1z
ZW5zb3JzLm9yZwpodHRwOi8vbGlzdHMubG0tc2Vuc29ycy5vcmcvbWFpbG1hbi9saXN0aW5mby9s
bS1zZW5zb3Jz

Re: [lm-sensors] [PATCH] hwmon: (it87) Drop uart6 condition for vin5&vin6 for IT8783F

[Jean Delvare]

[-- Attachment #1: Type: text/plain, Size: 1626 bytes --]

On Wed, 16 May 2012 08:52:31 +0200, Jean Delvare wrote:
> On Tue, 15 May 2012 12:51:08 -0700, Guenter Roeck wrote:
> > The data sheet says, with Register 0x27/Bit 0:
> > 
> > Function Selection of Pin 93 (FSP)
> > 0: VIN5/FAN_TAC3/SIN6
> > If bit 2 of index 2Ch is 1, FAN_TAC3/SIN6 input is enabled; otherwise
> > select VIN5 input.
> > 1: GP30
> > 
> > Assuming the above is correct, I think I'll rename "uart6" to "fan3" and
> > use
> > 
> > 	fan3 = reg2C & (1 << 2);
> > ...
> > 	/* Check if fan3 is there or not */
> > 	if ((reg27 & (1 << 0)) || !fan3)
> >                 sio_data->skip_fan |= (1 << 2);
> > ...
> > 	if ((reg27 & (1 << 0)) || fan3)
> > 		sio_data->skip_in |= (1 << 5); /* No VIN5 */
> > 
> > Does that make sense ?
> 
> That's what the datasheet says, at least. I find it weird that enabling
> UART6 has an effect on VIN5 vs. FAN3_TAC, especially when UART6 pins
> can be remapped to a completely different location, but maybe this is
> really how the chip works.
> 
> I think I wouldn't introduce variable fan3, as it is kind of a
> misnomer, and a proper name would be overly long. But this is an
> implementation detail.
> 
> Björn, what is your design using pin 93 for?

I've updated the driver at
http://khali.linux-fr.org/devel/misc/it87/

with Björn's patch updated per the discussion above. Björn, can you
please give it a try and confirm it works for you?

Guenter, I attach the delta between your code and my standalone driver.
This is what could be folded into your previous patches, unless you no
longer want to touch them.

-- 
Jean Delvare

[-- Attachment #2: it87-fix-uart6-on-IT8783.patch --]
[-- Type: text/x-patch, Size: 1238 bytes --]

--- linux-3.4-rc7.orig/drivers/hwmon/it87.c	2012-05-16 08:53:21.000000000 +0200
+++ linux-3.4-rc7/drivers/hwmon/it87.c	2012-05-16 09:36:31.828155337 +0200
@@ -1744,7 +1744,6 @@ static int __init it87_find(unsigned sho
 		sio_data->beep_pin = superio_inb(IT87_SIO_BEEP_PIN_REG) & 0x3f;
 	} else if (sio_data->type == it8783) {
 		int reg25, reg27, reg2A, reg2C, regEF;
-		bool uart6;
 
 		sio_data->skip_vid = 1;	/* No VID */
 
@@ -1756,10 +1755,8 @@ static int __init it87_find(unsigned sho
 		reg2C = superio_inb(IT87_SIO_PINX2_REG);
 		regEF = superio_inb(IT87_SIO_SPI_REG);
 
-		uart6 = reg2C & (1 << 2);
-
 		/* Check if fan3 is there or not */
-		if ((reg27 & (1 << 0)) || !uart6)
+		if ((reg27 & (1 << 0)) || !(reg2C & (1 << 2)))
 			sio_data->skip_fan |= (1 << 2);
 		if ((reg25 & (1 << 4))
 		    || (!(reg2A & (1 << 1)) && (regEF & (1 << 0))))
@@ -1772,11 +1769,11 @@ static int __init it87_find(unsigned sho
 			sio_data->skip_pwm |= (1 << 1);
 
 		/* VIN5 */
-		if ((reg27 & (1 << 0)) || uart6)
+		if ((reg27 & (1 << 0)) || (reg2C & (1 << 2)))
 			sio_data->skip_in |= (1 << 5); /* No VIN5 */
 
 		/* VIN6 */
-		if ((reg27 & (1 << 1)) || uart6)
+		if (reg27 & (1 << 1))
 			sio_data->skip_in |= (1 << 6); /* No VIN6 */
 
 		/*

[-- Attachment #3: Type: text/plain, Size: 153 bytes --]

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] [PATCH] hwmon: (it87) Drop uart6 condition for vin5&vin6 for IT8783F

[Guenter Roeck]

On Wed, May 16, 2012 at 05:23:17AM -0400, Jean Delvare wrote:
> On Wed, 16 May 2012 08:52:31 +0200, Jean Delvare wrote:
> > On Tue, 15 May 2012 12:51:08 -0700, Guenter Roeck wrote:
> > > The data sheet says, with Register 0x27/Bit 0:
> > > 
> > > Function Selection of Pin 93 (FSP)
> > > 0: VIN5/FAN_TAC3/SIN6
> > > If bit 2 of index 2Ch is 1, FAN_TAC3/SIN6 input is enabled; otherwise
> > > select VIN5 input.
> > > 1: GP30
> > > 
> > > Assuming the above is correct, I think I'll rename "uart6" to "fan3" and
> > > use
> > > 
> > > 	fan3 = reg2C & (1 << 2);
> > > ...
> > > 	/* Check if fan3 is there or not */
> > > 	if ((reg27 & (1 << 0)) || !fan3)
> > >                 sio_data->skip_fan |= (1 << 2);
> > > ...
> > > 	if ((reg27 & (1 << 0)) || fan3)
> > > 		sio_data->skip_in |= (1 << 5); /* No VIN5 */
> > > 
> > > Does that make sense ?
> > 
> > That's what the datasheet says, at least. I find it weird that enabling
> > UART6 has an effect on VIN5 vs. FAN3_TAC, especially when UART6 pins
> > can be remapped to a completely different location, but maybe this is
> > really how the chip works.
> > 
> > I think I wouldn't introduce variable fan3, as it is kind of a
> > misnomer, and a proper name would be overly long. But this is an
> > implementation detail.
> > 
> > Björn, what is your design using pin 93 for?
> 
> I've updated the driver at
> http://khali.linux-fr.org/devel/misc/it87/
> 
> with Björn's patch updated per the discussion above. Björn, can you
> please give it a try and confirm it works for you?
> 
> Guenter, I attach the delta between your code and my standalone driver.
> This is what could be folded into your previous patches, unless you no
> longer want to touch them.
> 
Looks good. I'll fold it in. Thanks for taking care of it.

Guenter

> -- 
> Jean Delvare

> --- linux-3.4-rc7.orig/drivers/hwmon/it87.c	2012-05-16 08:53:21.000000000 +0200
> +++ linux-3.4-rc7/drivers/hwmon/it87.c	2012-05-16 09:36:31.828155337 +0200
> @@ -1744,7 +1744,6 @@ static int __init it87_find(unsigned sho
>  		sio_data->beep_pin = superio_inb(IT87_SIO_BEEP_PIN_REG) & 0x3f;
>  	} else if (sio_data->type == it8783) {
>  		int reg25, reg27, reg2A, reg2C, regEF;
> -		bool uart6;
>  
>  		sio_data->skip_vid = 1;	/* No VID */
>  
> @@ -1756,10 +1755,8 @@ static int __init it87_find(unsigned sho
>  		reg2C = superio_inb(IT87_SIO_PINX2_REG);
>  		regEF = superio_inb(IT87_SIO_SPI_REG);
>  
> -		uart6 = reg2C & (1 << 2);
> -
>  		/* Check if fan3 is there or not */
> -		if ((reg27 & (1 << 0)) || !uart6)
> +		if ((reg27 & (1 << 0)) || !(reg2C & (1 << 2)))
>  			sio_data->skip_fan |= (1 << 2);
>  		if ((reg25 & (1 << 4))
>  		    || (!(reg2A & (1 << 1)) && (regEF & (1 << 0))))
> @@ -1772,11 +1769,11 @@ static int __init it87_find(unsigned sho
>  			sio_data->skip_pwm |= (1 << 1);
>  
>  		/* VIN5 */
> -		if ((reg27 & (1 << 0)) || uart6)
> +		if ((reg27 & (1 << 0)) || (reg2C & (1 << 2)))
>  			sio_data->skip_in |= (1 << 5); /* No VIN5 */
>  
>  		/* VIN6 */
> -		if ((reg27 & (1 << 1)) || uart6)
> +		if (reg27 & (1 << 1))
>  			sio_data->skip_in |= (1 << 6); /* No VIN6 */
>  
>  		/*


_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] [PATCH] hwmon: (it87) Drop uart6 condition for vin5&vin6 for IT8783F

[Björn Gerhart]

Hi Jean,

Am 16.05.2012 um 11:23 schrieb Jean Delvare:
> On Wed, 16 May 2012 08:52:31 +0200, Jean Delvare wrote:
>> On Tue, 15 May 2012 12:51:08 -0700, Guenter Roeck wrote:
>>> The data sheet says, with Register 0x27/Bit 0:
>>> 
>>> Function Selection of Pin 93 (FSP)
>>> 0: VIN5/FAN_TAC3/SIN6
>>> If bit 2 of index 2Ch is 1, FAN_TAC3/SIN6 input is enabled; otherwise
>>> select VIN5 input.
>>> 1: GP30
>>> 
>>> Assuming the above is correct, I think I'll rename "uart6" to "fan3" and
>>> use
>>> 
>>> 	fan3 = reg2C & (1 << 2);
>>> ...
>>> 	/* Check if fan3 is there or not */
>>> 	if ((reg27 & (1 << 0)) || !fan3)
>>>                sio_data->skip_fan |= (1 << 2);
>>> ...
>>> 	if ((reg27 & (1 << 0)) || fan3)
>>> 		sio_data->skip_in |= (1 << 5); /* No VIN5 */
>>> 
>>> Does that make sense ?
>> 
>> That's what the datasheet says, at least. I find it weird that enabling
>> UART6 has an effect on VIN5 vs. FAN3_TAC, especially when UART6 pins
>> can be remapped to a completely different location, but maybe this is
>> really how the chip works.
>> 
Yes, our hw developers formerly also had to contact ITE for discussions about different contexts for their hw wiring/implementation.

>> I think I wouldn't introduce variable fan3, as it is kind of a
>> misnomer, and a proper name would be overly long. But this is an
>> implementation detail.
>> 
>> Björn, what is your design using pin 93 for?
> 
As discussed with our hw developers, in our design pin 93 is used for FAN_TAC3. The reason is, that uart6 gets moved. If uart6 would not get moved, then pin 93 would be SIN6. So in turn the decision between FAN_TAC3 and SIN6 is not detectable.
However, maybe the proper design-specific sensors.conf could ignore fan3 if pin 93 is used for SIN6.

> I've updated the driver at
> http://khali.linux-fr.org/devel/misc/it87/
> 
> with Björn's patch updated per the discussion above. Björn, can you
> please give it a try and confirm it works for you?
> 
Thanks for the update! I agree with the logic part you modified.
And yes, it works like expected (tested on IT8783F@kernel 2.6.32, configured as described above)  ;-)

Björn


_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] [PATCH] hwmon: (it87) Drop uart6 condition for vin5&vin6 for IT8783F

[Guenter Roeck]

T24gV2VkLCAyMDEyLTA1LTE2IGF0IDEzOjA3IC0wNDAwLCBCasO2cm4gR2VyaGFydCB3cm90ZToK
PiBIaSBKZWFuLAo+IAo+IEFtIDE2LjA1LjIwMTIgdW0gMTE6MjMgc2NocmllYiBKZWFuIERlbHZh
cmU6Cj4gPiBPbiBXZWQsIDE2IE1heSAyMDEyIDA4OjUyOjMxICswMjAwLCBKZWFuIERlbHZhcmUg
d3JvdGU6Cj4gPj4gT24gVHVlLCAxNSBNYXkgMjAxMiAxMjo1MTowOCAtMDcwMCwgR3VlbnRlciBS
b2VjayB3cm90ZToKPiA+Pj4gVGhlIGRhdGEgc2hlZXQgc2F5cywgd2l0aCBSZWdpc3RlciAweDI3
L0JpdCAwOgo+ID4+PiAKPiA+Pj4gRnVuY3Rpb24gU2VsZWN0aW9uIG9mIFBpbiA5MyAoRlNQKQo+
ID4+PiAwOiBWSU41L0ZBTl9UQUMzL1NJTjYKPiA+Pj4gSWYgYml0IDIgb2YgaW5kZXggMkNoIGlz
IDEsIEZBTl9UQUMzL1NJTjYgaW5wdXQgaXMgZW5hYmxlZDsgb3RoZXJ3aXNlCj4gPj4+IHNlbGVj
dCBWSU41IGlucHV0Lgo+ID4+PiAxOiBHUDMwCj4gPj4+IAo+ID4+PiBBc3N1bWluZyB0aGUgYWJv
dmUgaXMgY29ycmVjdCwgSSB0aGluayBJJ2xsIHJlbmFtZSAidWFydDYiIHRvICJmYW4zIiBhbmQK
PiA+Pj4gdXNlCj4gPj4+IAo+ID4+PiAJZmFuMyA9IHJlZzJDICYgKDEgPDwgMik7Cj4gPj4+IC4u
Lgo+ID4+PiAJLyogQ2hlY2sgaWYgZmFuMyBpcyB0aGVyZSBvciBub3QgKi8KPiA+Pj4gCWlmICgo
cmVnMjcgJiAoMSA8PCAwKSkgfHwgIWZhbjMpCj4gPj4+ICAgICAgICAgICAgICAgIHNpb19kYXRh
LT5za2lwX2ZhbiB8PSAoMSA8PCAyKTsKPiA+Pj4gLi4uCj4gPj4+IAlpZiAoKHJlZzI3ICYgKDEg
PDwgMCkpIHx8IGZhbjMpCj4gPj4+IAkJc2lvX2RhdGEtPnNraXBfaW4gfD0gKDEgPDwgNSk7IC8q
IE5vIFZJTjUgKi8KPiA+Pj4gCj4gPj4+IERvZXMgdGhhdCBtYWtlIHNlbnNlID8KPiA+PiAKPiA+
PiBUaGF0J3Mgd2hhdCB0aGUgZGF0YXNoZWV0IHNheXMsIGF0IGxlYXN0LiBJIGZpbmQgaXQgd2Vp
cmQgdGhhdCBlbmFibGluZwo+ID4+IFVBUlQ2IGhhcyBhbiBlZmZlY3Qgb24gVklONSB2cy4gRkFO
M19UQUMsIGVzcGVjaWFsbHkgd2hlbiBVQVJUNiBwaW5zCj4gPj4gY2FuIGJlIHJlbWFwcGVkIHRv
IGEgY29tcGxldGVseSBkaWZmZXJlbnQgbG9jYXRpb24sIGJ1dCBtYXliZSB0aGlzIGlzCj4gPj4g
cmVhbGx5IGhvdyB0aGUgY2hpcCB3b3Jrcy4KPiA+PiAKPiBZZXMsIG91ciBodyBkZXZlbG9wZXJz
IGZvcm1lcmx5IGFsc28gaGFkIHRvIGNvbnRhY3QgSVRFIGZvciBkaXNjdXNzaW9ucyBhYm91dCBk
aWZmZXJlbnQgY29udGV4dHMgZm9yIHRoZWlyIGh3IHdpcmluZy9pbXBsZW1lbnRhdGlvbi4KPiAK
PiA+PiBJIHRoaW5rIEkgd291bGRuJ3QgaW50cm9kdWNlIHZhcmlhYmxlIGZhbjMsIGFzIGl0IGlz
IGtpbmQgb2YgYQo+ID4+IG1pc25vbWVyLCBhbmQgYSBwcm9wZXIgbmFtZSB3b3VsZCBiZSBvdmVy
bHkgbG9uZy4gQnV0IHRoaXMgaXMgYW4KPiA+PiBpbXBsZW1lbnRhdGlvbiBkZXRhaWwuCj4gPj4g
Cj4gPj4gQmrDtnJuLCB3aGF0IGlzIHlvdXIgZGVzaWduIHVzaW5nIHBpbiA5MyBmb3I/Cj4gPiAK
PiBBcyBkaXNjdXNzZWQgd2l0aCBvdXIgaHcgZGV2ZWxvcGVycywgaW4gb3VyIGRlc2lnbiBwaW4g
OTMgaXMgdXNlZCBmb3IgRkFOX1RBQzMuIFRoZSByZWFzb24gaXMsIHRoYXQgdWFydDYgZ2V0cyBt
b3ZlZC4gSWYgdWFydDYgd291bGQgbm90IGdldCBtb3ZlZCwgdGhlbiBwaW4gOTMgd291bGQgYmUg
U0lONi4gU28gaW4gdHVybiB0aGUgZGVjaXNpb24gYmV0d2VlbiBGQU5fVEFDMyBhbmQgU0lONiBp
cyBub3QgZGV0ZWN0YWJsZS4KPiBIb3dldmVyLCBtYXliZSB0aGUgcHJvcGVyIGRlc2lnbi1zcGVj
aWZpYyBzZW5zb3JzLmNvbmYgY291bGQgaWdub3JlIGZhbjMgaWYgcGluIDkzIGlzIHVzZWQgZm9y
IFNJTjYuCj4gCj4gPiBJJ3ZlIHVwZGF0ZWQgdGhlIGRyaXZlciBhdAo+ID4gaHR0cDovL2toYWxp
LmxpbnV4LWZyLm9yZy9kZXZlbC9taXNjL2l0ODcvCj4gPiAKPiA+IHdpdGggQmrDtnJuJ3MgcGF0
Y2ggdXBkYXRlZCBwZXIgdGhlIGRpc2N1c3Npb24gYWJvdmUuIEJqw7ZybiwgY2FuIHlvdQo+ID4g
cGxlYXNlIGdpdmUgaXQgYSB0cnkgYW5kIGNvbmZpcm0gaXQgd29ya3MgZm9yIHlvdT8KPiA+IAo+
IFRoYW5rcyBmb3IgdGhlIHVwZGF0ZSEgSSBhZ3JlZSB3aXRoIHRoZSBsb2dpYyBwYXJ0IHlvdSBt
b2RpZmllZC4KPiBBbmQgeWVzLCBpdCB3b3JrcyBsaWtlIGV4cGVjdGVkICh0ZXN0ZWQgb24gSVQ4
NzgzRkBrZXJuZWwgMi42LjMyLCBjb25maWd1cmVkIGFzIGRlc2NyaWJlZCBhYm92ZSkgIDstKQo+
IApFeGNlbGxlbnQuIEkgYWxyZWFkeSBtZXJnZWQgSmVhbidzIGNoYW5nZXMgd2l0aCBteSBwZW5k
aW5nIHBhdGNoIHNldCwgc28KaG9wZWZ1bGx5IGV2ZXJ5dGhpbmcgaXMgb2sgbm93LgoKVGhhbmtz
IGEgbG90IGZvciB5b3VyIGhlbHAhCgpHdWVudGVyCgoKCl9fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fCmxtLXNlbnNvcnMgbWFpbGluZyBsaXN0CmxtLXNlbnNv
cnNAbG0tc2Vuc29ycy5vcmcKaHR0cDovL2xpc3RzLmxtLXNlbnNvcnMub3JnL21haWxtYW4vbGlz
dGluZm8vbG0tc2Vuc29ycw=