From mboxrd@z Thu Jan 1 00:00:00 1970 From: greg@kroah.com (Greg KH) Date: Thu, 19 May 2005 06:24:18 +0000 Subject: [PATCH] i2c driver fixes for 2.6.0-test5 Message-Id: <10642734262038@kroah.com> List-Id: In-Reply-To: <10642734251033@kroah.com> References: <1064273416272@kroah.com> In-Reply-To: <1064273416272@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset="macroman" Content-Transfer-Encoding: base64 To: linux-kernel@vger.kernel.org, sensors@stimpy.netroedge.com Q2hhbmdlU2V0IDEuMTMxNS4xLjE5LCAyMDAzLzA5LzIyIDEzOjM2OjUyLTA3OjAwLCBncmVnQGty b2FoLmNvbQoKW1BBVENIXSBJMkM6IG1vdmUgaTJjLWVsdi5jIGRyaXZlciB0byBkcml2ZXJzL2ky Yy9idXNzZXMKCgogZHJpdmVycy9pMmMvaTJjLWVsdi5jICAgICAgICB8ICAxNzYgLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9pMmMvS2NvbmZpZyAg ICAgICAgICB8ICAgMTAgLS0KIGRyaXZlcnMvaTJjL01ha2VmaWxlICAgICAgICAgfCAgICAxIAog ZHJpdmVycy9pMmMvYnVzc2VzL0tjb25maWcgICB8ICAgMTAgKysKIGRyaXZlcnMvaTJjL2J1c3Nl cy9NYWtlZmlsZSAgfCAgICAxIAogZHJpdmVycy9pMmMvYnVzc2VzL2kyYy1lbHYuYyB8ICAxNzYg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogNiBmaWxlcyBjaGFu Z2VkLCAxODcgaW5zZXJ0aW9ucygrKSwgMTg3IGRlbGV0aW9ucygtKQoKCmRpZmYgLU5ydSBhL2Ry aXZlcnMvaTJjL0tjb25maWcgYi9kcml2ZXJzL2kyYy9LY29uZmlnCi0tLSBhL2RyaXZlcnMvaTJj L0tjb25maWcJTW9uIFNlcCAyMiAxNjoxMjo1NiAyMDAzCisrKyBiL2RyaXZlcnMvaTJjL0tjb25m aWcJTW9uIFNlcCAyMiAxNjoxMjo1NiAyMDAzCkBAIC00OCwxNiArNDgsNiBAQAogCSAgVGhpcyBz dXBwb3J0IGlzIGFsc28gYXZhaWxhYmxlIGFzIGEgbW9kdWxlLiAgSWYgc28sIHRoZSBtb2R1bGUg CiAJICB3aWxsIGJlIGNhbGxlZCBpMmMtYWxnby1iaXQuCiAKLWNvbmZpZyBJMkNfRUxWCi0JdHJp c3RhdGUgIkVMViBhZGFwdGVyIgotCWRlcGVuZHMgb24gSTJDX0FMR09CSVQgJiYgSVNBCi0JaGVs cAotCSAgVGhpcyBzdXBwb3J0cyBwYXJhbGxlbC1wb3J0IEkyQyBhZGFwdGVycyBjYWxsZWQgRUxW LiAgU2F5IFkgaWYgeW91Ci0JICBvd24gc3VjaCBhbiBhZGFwdGVyLgotCi0JICBUaGlzIHN1cHBv cnQgaXMgYWxzbyBhdmFpbGFibGUgYXMgYSBtb2R1bGUuICBJZiBzbywgdGhlIG1vZHVsZSAKLQkg IHdpbGwgYmUgY2FsbGVkIGkyYy1lbHYuCi0KIGNvbmZpZyBJMkNfVkVMTEVNQU4KIAl0cmlzdGF0 ZSAiVmVsbGVtYW4gSzkwMDAgYWRhcHRlciIKIAlkZXBlbmRzIG9uIEkyQ19BTEdPQklUICYmIElT QQpkaWZmIC1OcnUgYS9kcml2ZXJzL2kyYy9NYWtlZmlsZSBiL2RyaXZlcnMvaTJjL01ha2VmaWxl Ci0tLSBhL2RyaXZlcnMvaTJjL01ha2VmaWxlCU1vbiBTZXAgMjIgMTY6MTI6NTYgMjAwMworKysg Yi9kcml2ZXJzL2kyYy9NYWtlZmlsZQlNb24gU2VwIDIyIDE2OjEyOjU2IDIwMDMKQEAgLTUsNyAr NSw2IEBACiBvYmotJChDT05GSUdfSTJDKQkJKz0gaTJjLWNvcmUubwogb2JqLSQoQ09ORklHX0ky Q19DSEFSREVWKQkrPSBpMmMtZGV2Lm8KIG9iai0kKENPTkZJR19JMkNfQUxHT0JJVCkJKz0gaTJj LWFsZ28tYml0Lm8KLW9iai0kKENPTkZJR19JMkNfRUxWKQkJKz0gaTJjLWVsdi5vCiBvYmotJChD T05GSUdfSTJDX1ZFTExFTUFOKQkrPSBpMmMtdmVsbGVtYW4ubwogb2JqLSQoQ09ORklHX0kyQ19B TEdPUENGKQkrPSBpMmMtYWxnby1wY2Yubwogb2JqLSQoQ09ORklHX0kyQ19FTEVLVE9SKQkrPSBp MmMtZWxla3Rvci5vCmRpZmYgLU5ydSBhL2RyaXZlcnMvaTJjL2J1c3Nlcy9LY29uZmlnIGIvZHJp dmVycy9pMmMvYnVzc2VzL0tjb25maWcKLS0tIGEvZHJpdmVycy9pMmMvYnVzc2VzL0tjb25maWcJ TW9uIFNlcCAyMiAxNjoxMjo1NiAyMDAzCisrKyBiL2RyaXZlcnMvaTJjL2J1c3Nlcy9LY29uZmln CU1vbiBTZXAgMjIgMTY6MTI6NTYgMjAwMwpAQCAtNDYsNiArNDYsMTYgQEAKIAkgIFRoaXMgZHJp dmVyIGNhbiBhbHNvIGJlIGJ1aWx0IGFzIGEgbW9kdWxlLiAgSWYgc28sIHRoZSBtb2R1bGUKIAkg IHdpbGwgYmUgY2FsbGVkIGkyYy1hbWQ4MTExLgogCitjb25maWcgSTJDX0VMVgorCXRyaXN0YXRl ICJFTFYgYWRhcHRlciIKKwlkZXBlbmRzIG9uIEkyQ19BTEdPQklUICYmIElTQQorCWhlbHAKKwkg IFRoaXMgc3VwcG9ydHMgcGFyYWxsZWwtcG9ydCBJMkMgYWRhcHRlcnMgY2FsbGVkIEVMVi4gIFNh eSBZIGlmIHlvdQorCSAgb3duIHN1Y2ggYW4gYWRhcHRlci4KKworCSAgVGhpcyBzdXBwb3J0IGlz IGFsc28gYXZhaWxhYmxlIGFzIGEgbW9kdWxlLiAgSWYgc28sIHRoZSBtb2R1bGUgCisJICB3aWxs IGJlIGNhbGxlZCBpMmMtZWx2LgorCiBjb25maWcgSTJDX0k4MDEKIAl0cmlzdGF0ZSAiSW50ZWwg ODAxIgogCWRlcGVuZHMgb24gSTJDICYmIFBDSSAmJiBFWFBFUklNRU5UQUwKZGlmZiAtTnJ1IGEv ZHJpdmVycy9pMmMvYnVzc2VzL01ha2VmaWxlIGIvZHJpdmVycy9pMmMvYnVzc2VzL01ha2VmaWxl Ci0tLSBhL2RyaXZlcnMvaTJjL2J1c3Nlcy9NYWtlZmlsZQlNb24gU2VwIDIyIDE2OjEyOjU2IDIw MDMKKysrIGIvZHJpdmVycy9pMmMvYnVzc2VzL01ha2VmaWxlCU1vbiBTZXAgMjIgMTY6MTI6NTYg MjAwMwpAQCAtNiw2ICs2LDcgQEAKIG9iai0kKENPTkZJR19JMkNfQUxJMTVYMykJKz0gaTJjLWFs aTE1eDMubwogb2JqLSQoQ09ORklHX0kyQ19BTUQ3NTYpCSs9IGkyYy1hbWQ3NTYubwogb2JqLSQo Q09ORklHX0kyQ19BTUQ4MTExKQkrPSBpMmMtYW1kODExMS5vCitvYmotJChDT05GSUdfSTJDX0VM VikJCSs9IGkyYy1lbHYubwogb2JqLSQoQ09ORklHX0kyQ19JODAxKQkJKz0gaTJjLWk4MDEubwog b2JqLSQoQ09ORklHX0kyQ19JODEwKQkJKz0gaTJjLWk4MTAubwogb2JqLSQoQ09ORklHX0kyQ19J U0EpCQkrPSBpMmMtaXNhLm8KZGlmZiAtTnJ1IGEvZHJpdmVycy9pMmMvYnVzc2VzL2kyYy1lbHYu YyBiL2RyaXZlcnMvaTJjL2J1c3Nlcy9pMmMtZWx2LmMKLS0tIC9kZXYvbnVsbAlXZWQgRGVjIDMx IDE2OjAwOjAwIDE5NjkKKysrIGIvZHJpdmVycy9pMmMvYnVzc2VzL2kyYy1lbHYuYwlNb24gU2Vw IDIyIDE2OjEyOjU2IDIwMDMKQEAgLTAsMCArMSwxNzYgQEAKKy8qIC0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0g Ki8KKy8qIGkyYy1lbHYuYyBpMmMtaHcgYWNjZXNzIGZvciBwaGlsaXBzIHN0eWxlIHBhcmFsbGVs IHBvcnQgYWRhcHRlcnMJICAgICAqLworLyogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSAqLworLyogICBDb3B5 cmlnaHQgKEMpIDE5OTUtMjAwMCBTaW1vbiBHLiBWb2dsCisKKyAgICBUaGlzIHByb2dyYW0gaXMg ZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeQorICAg IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgYXMg cHVibGlzaGVkIGJ5CisgICAgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyIHZl cnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3IKKyAgICAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRl ciB2ZXJzaW9uLgorCisgICAgVGhpcyBwcm9ncmFtIGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3Bl IHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisgICAgYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3 aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyAgICBNRVJDSEFOVEFCSUxJVFkg b3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlCisgICAgR05VIEdl bmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKworICAgIFlvdSBzaG91bGQg aGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCisg ICAgYWxvbmcgd2l0aCB0aGlzIHByb2dyYW07IGlmIG5vdCwgd3JpdGUgdG8gdGhlIEZyZWUgU29m dHdhcmUKKyAgICBGb3VuZGF0aW9uLCBJbmMuLCA2NzUgTWFzcyBBdmUsIENhbWJyaWRnZSwgTUEg MDIxMzksIFVTQS4JCSAgICAgKi8KKy8qIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gKi8KKworLyogV2l0aCBz b21lIGNoYW5nZXMgZnJvbSBLeT9zdGkgTT9sa2tpIDxrbWFsa2tpQGNjLmh1dC5maT4gYW5kIGV2 ZW4KKyAgIEZyb2RvIExvb2lqYWFyZCA8ZnJvZG9sQGRkcy5ubD4gKi8KKworLyogJElkOiBpMmMt ZWx2LmMsdiAxLjI3IDIwMDMvMDEvMjEgMDg6MDg6MTYga21hbGtraSBFeHAgJCAqLworCisjaW5j bHVkZSA8bGludXgva2VybmVsLmg+CisjaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+CisjaW5jbHVk ZSA8bGludXgvZGVsYXkuaD4KKyNpbmNsdWRlIDxsaW51eC9zbGFiLmg+CisjaW5jbHVkZSA8bGlu dXgvaW5pdC5oPgorI2luY2x1ZGUgPGxpbnV4L2lvcG9ydC5oPgorI2luY2x1ZGUgPGxpbnV4L2Vy cm5vLmg+CisjaW5jbHVkZSA8bGludXgvaTJjLmg+CisjaW5jbHVkZSA8bGludXgvaTJjLWFsZ28t Yml0Lmg+CisjaW5jbHVkZSA8YXNtL2lvLmg+CisKKyNkZWZpbmUgREVGQVVMVF9CQVNFIDB4Mzc4 CitzdGF0aWMgaW50IGJhc2U9MDsKK3N0YXRpYyB1bnNpZ25lZCBjaGFyIFBvcnREYXRhID0gMDsK KworLyogLS0tLS0gZ2xvYmFsIGRlZmluZXMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0JKi8KKyNkZWZpbmUgREVCKHgpCQkvKiBzaG91bGQgYmUgcmVhc29u YWJsZSBvcGVuLCBjbG9zZSAmYy4gCSovCisjZGVmaW5lIERFQjIoeCkgCS8qIGxvdyBsZXZlbCBk ZWJ1Z2dpbmcgLSB2ZXJ5IHNsb3cgCQkqLworI2RlZmluZSBERUJFKHgpCXgJLyogZXJyb3IgbWVz c2FnZXMgCQkJCSovCisjZGVmaW5lIERFQklOSVQoeCkgeAkvKiBkZXRlY3Rpb24gc3RhdHVzIG1l c3NhZ2VzCQkJKi8KKworLyogLS0tIENvbnZlbmllbmNlIGRlZmluZXMgZm9yIHRoZSBwYXJhbGxl bCBwb3J0OgkJCSovCisjZGVmaW5lIEJBU0UJKHVuc2lnbmVkIGludCkoZGF0YSkKKyNkZWZpbmUg REFUQQlCQVNFCQkJLyogQ2VudHJvbmljcyBkYXRhIHBvcnQJCSovCisjZGVmaW5lIFNUQVQJKEJB U0UrMSkJCS8qIENlbnRyb25pY3Mgc3RhdHVzIHBvcnQJKi8KKyNkZWZpbmUgQ1RSTAkoQkFTRSsy KQkJLyogQ2VudHJvbmljcyBjb250cm9sIHBvcnQJKi8KKworCisvKiAtLS0tLSBsb2NhbCBmdW5j dGlvbnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQkqLwor CisKK3N0YXRpYyB2b2lkIGJpdF9lbHZfc2V0c2NsKHZvaWQgKmRhdGEsIGludCBzdGF0ZSkKK3sK KwlpZiAoc3RhdGUpIHsKKwkJUG9ydERhdGEgJj0gMHhmZTsKKwl9IGVsc2UgeworCQlQb3J0RGF0 YSB8PTE7CisJfQorCW91dGIoUG9ydERhdGEsIERBVEEpOworfQorCitzdGF0aWMgdm9pZCBiaXRf ZWx2X3NldHNkYSh2b2lkICpkYXRhLCBpbnQgc3RhdGUpCit7CisJaWYgKHN0YXRlKSB7CisJCVBv cnREYXRhICY9MHhmZDsKKwl9IGVsc2UgeworCQlQb3J0RGF0YSB8PTI7CisJfQorCW91dGIoUG9y dERhdGEsIERBVEEpOworfSAKKworc3RhdGljIGludCBiaXRfZWx2X2dldHNjbCh2b2lkICpkYXRh KQoreworCXJldHVybiAoIDAgPSAoIChpbmJfcChTVEFUKSkgJiAweDA4ICkgKTsKK30KKworc3Rh dGljIGludCBiaXRfZWx2X2dldHNkYSh2b2lkICpkYXRhKQoreworCXJldHVybiAoIDAgPSAoIChp bmJfcChTVEFUKSkgJiAweDQwICkgKTsKK30KKworc3RhdGljIGludCBiaXRfZWx2X2luaXQodm9p ZCkKK3sKKwlpZiAoIXJlcXVlc3RfcmVnaW9uKGJhc2UsIChiYXNlID0gMHgzYmMpID8gMyA6IDgs CisJCQkJImkyYyAoRUxWIGFkYXB0ZXIpIikpCisJCXJldHVybiAtRU5PREVWOworCisJaWYgKGlu YihiYXNlKzEpICYgMHg4MCkgewkvKiBCVVNZIHNob3VsZCBiZSBoaWdoCSovCisJCURFQklOSVQo cHJpbnRrKEtFUk5fREVCVUcgImkyYy1lbHYubzogQnVzeSB3YXMgbG93LlxuIikpOworCQlnb3Rv IGZhaWw7CisJfSAKKworCW91dGIoMHgwYyxiYXNlKzIpOwkvKiBTTENUIGF1ZiBsb3cJCSovCisJ dWRlbGF5KDQwMCk7CisJaWYgKCEoaW5iKGJhc2UrMSkgJiYgMHgxMCkpIHsKKwkJb3V0YigweDA0 LGJhc2UrMik7CisJCURFQklOSVQocHJpbnRrKEtFUk5fREVCVUcgImkyYy1lbHYubzogU2VsZWN0 IHdhcyBoaWdoLlxuIikpOworCQlnb3RvIGZhaWw7CisJfQorCisJUG9ydERhdGEgPSAwOworCWJp dF9lbHZfc2V0c2RhKCh2b2lkKiliYXNlLDEpOworCWJpdF9lbHZfc2V0c2NsKCh2b2lkKiliYXNl LDEpOworCXJldHVybiAwOworCitmYWlsOgorCXJlbGVhc2VfcmVnaW9uKGJhc2UgLCAoYmFzZSA9 IDB4M2JjKSA/IDMgOiA4KTsKKwlyZXR1cm4gLUVOT0RFVjsKK30KKworLyogLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCisgKiBFbmNhcHN1bGF0ZSB0aGUgYWJvdmUgZnVuY3Rpb25zIGluIHRoZSBjb3JyZWN0IG9w ZXJhdGlvbnMgc3RydWN0dXJlLgorICogVGhpcyBpcyBvbmx5IGRvbmUgd2hlbiBtb3JlIHRoYW4g b25lIGhhcmR3YXJlIGFkYXB0ZXIgaXMgc3VwcG9ydGVkLgorICovCitzdGF0aWMgc3RydWN0IGky Y19hbGdvX2JpdF9kYXRhIGJpdF9lbHZfZGF0YSA9IHsKKwkuc2V0c2RhCQk9IGJpdF9lbHZfc2V0 c2RhLAorCS5zZXRzY2wJCT0gYml0X2Vsdl9zZXRzY2wsCisJLmdldHNkYQkJPSBiaXRfZWx2X2dl dHNkYSwKKwkuZ2V0c2NsCQk9IGJpdF9lbHZfZ2V0c2NsLAorCS51ZGVsYXkJCT0gODAsCisJLm1k ZWxheQkJPSA4MCwKKwkudGltZW91dAk9IEhaCit9OworCitzdGF0aWMgc3RydWN0IGkyY19hZGFw dGVyIGJpdF9lbHZfb3BzID0geworCS5vd25lcgkJPSBUSElTX01PRFVMRSwKKwkuaWQJCT0gSTJD X0hXX0JfRUxWLAorCS5hbGdvX2RhdGEJPSAmYml0X2Vsdl9kYXRhLAorCS5uYW1lCQk9ICJFTFYg UGFyYWxsZWwgcG9ydCBhZGFwdG9yIiwKK307CisKK3N0YXRpYyBpbnQgX19pbml0IGkyY19iaXRl bHZfaW5pdCh2b2lkKQoreworCXByaW50ayhLRVJOX0lORk8gImkyYy1lbHYubzogaTJjIEVMViBw YXJhbGxlbCBwb3J0IGFkYXB0ZXIgbW9kdWxlIHZlcnNpb24gJXMgKCVzKVxuIiwgSTJDX1ZFUlNJ T04sIEkyQ19EQVRFKTsKKwlpZiAoYmFzZT0wKSB7CisJCS8qIHByb2JlIHNvbWUgdmFsdWVzICov CisJCWJhc2XeRkFVTFRfQkFTRTsKKwkJYml0X2Vsdl9kYXRhLmRhdGE9KHZvaWQqKURFRkFVTFRf QkFTRTsKKwkJaWYgKGJpdF9lbHZfaW5pdCgpPTApIHsKKwkJCWlmKGkyY19iaXRfYWRkX2J1cygm Yml0X2Vsdl9vcHMpIDwgMCkKKwkJCQlyZXR1cm4gLUVOT0RFVjsKKwkJfSBlbHNlIHsKKwkJCXJl dHVybiAtRU5PREVWOworCQl9CisJfSBlbHNlIHsKKwkJaTJjX3NldF9hZGFwZGF0YSgmYml0X2Vs dl9vcHMsICh2b2lkICopYmFzZSk7CisJCWlmIChiaXRfZWx2X2luaXQoKT0wKSB7CisJCQlpZihp MmNfYml0X2FkZF9idXMoJmJpdF9lbHZfb3BzKSA8IDApCisJCQkJcmV0dXJuIC1FTk9ERVY7CisJ CX0gZWxzZSB7CisJCQlyZXR1cm4gLUVOT0RFVjsKKwkJfQorCX0KKwlwcmludGsoS0VSTl9ERUJV RyAiaTJjLWVsdi5vOiBmb3VuZCBkZXZpY2UgYXQgJSN4LlxuIixiYXNlKTsKKwlyZXR1cm4gMDsK K30KKworc3RhdGljIHZvaWQgX19leGl0IGkyY19iaXRlbHZfZXhpdCh2b2lkKQoreworCWkyY19i aXRfZGVsX2J1cygmYml0X2Vsdl9vcHMpOworCXJlbGVhc2VfcmVnaW9uKGJhc2UgLCAoYmFzZSA9 IDB4M2JjKSA/IDMgOiA4KTsKK30KKworTU9EVUxFX0FVVEhPUigiU2ltb24gRy4gVm9nbCA8c2lt b25AdGsudW5pLWxpbnouYWMuYXQ+Iik7CitNT0RVTEVfREVTQ1JJUFRJT04oIkkyQy1CdXMgYWRh cHRlciByb3V0aW5lcyBmb3IgRUxWIHBhcmFsbGVsIHBvcnQgYWRhcHRlciIpOworTU9EVUxFX0xJ Q0VOU0UoIkdQTCIpOworCitNT0RVTEVfUEFSTShiYXNlLCAiaSIpOworCittb2R1bGVfaW5pdChp MmNfYml0ZWx2X2luaXQpOworbW9kdWxlX2V4aXQoaTJjX2JpdGVsdl9leGl0KTsKZGlmZiAtTnJ1 IGEvZHJpdmVycy9pMmMvaTJjLWVsdi5jIGIvZHJpdmVycy9pMmMvaTJjLWVsdi5jCi0tLSBhL2Ry aXZlcnMvaTJjL2kyYy1lbHYuYwlNb24gU2VwIDIyIDE2OjEyOjU2IDIwMDMKKysrIC9kZXYvbnVs bAlXZWQgRGVjIDMxIDE2OjAwOjAwIDE5NjkKQEAgLTEsMTc2ICswLDAgQEAKLS8qIC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0gKi8KLS8qIGkyYy1lbHYuYyBpMmMtaHcgYWNjZXNzIGZvciBwaGlsaXBzIHN0eWxl IHBhcmFsbGVsIHBvcnQgYWRhcHRlcnMJICAgICAqLwotLyogLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSAqLwot LyogICBDb3B5cmlnaHQgKEMpIDE5OTUtMjAwMCBTaW1vbiBHLiBWb2dsCi0KLSAgICBUaGlzIHBy b2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1v ZGlmeQotICAgIGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExp Y2Vuc2UgYXMgcHVibGlzaGVkIGJ5Ci0gICAgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsg ZWl0aGVyIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3IKLSAgICAoYXQgeW91ciBvcHRpb24p IGFueSBsYXRlciB2ZXJzaW9uLgotCi0gICAgVGhpcyBwcm9ncmFtIGlzIGRpc3RyaWJ1dGVkIGlu IHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCi0gICAgYnV0IFdJVEhPVVQgQU5ZIFdB UlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKLSAgICBNRVJDSEFO VEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlCi0g ICAgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KLQotICAgIFlv dSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBM aWNlbnNlCi0gICAgYWxvbmcgd2l0aCB0aGlzIHByb2dyYW07IGlmIG5vdCwgd3JpdGUgdG8gdGhl IEZyZWUgU29mdHdhcmUKLSAgICBGb3VuZGF0aW9uLCBJbmMuLCA2NzUgTWFzcyBBdmUsIENhbWJy aWRnZSwgTUEgMDIxMzksIFVTQS4JCSAgICAgKi8KLS8qIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gKi8KLQot LyogV2l0aCBzb21lIGNoYW5nZXMgZnJvbSBLeT9zdGkgTT9sa2tpIDxrbWFsa2tpQGNjLmh1dC5m aT4gYW5kIGV2ZW4KLSAgIEZyb2RvIExvb2lqYWFyZCA8ZnJvZG9sQGRkcy5ubD4gKi8KLQotLyog JElkOiBpMmMtZWx2LmMsdiAxLjI3IDIwMDMvMDEvMjEgMDg6MDg6MTYga21hbGtraSBFeHAgJCAq LwotCi0jaW5jbHVkZSA8bGludXgva2VybmVsLmg+Ci0jaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+ Ci0jaW5jbHVkZSA8bGludXgvZGVsYXkuaD4KLSNpbmNsdWRlIDxsaW51eC9zbGFiLmg+Ci0jaW5j bHVkZSA8bGludXgvaW5pdC5oPgotI2luY2x1ZGUgPGxpbnV4L2lvcG9ydC5oPgotI2luY2x1ZGUg PGxpbnV4L2Vycm5vLmg+Ci0jaW5jbHVkZSA8bGludXgvaTJjLmg+Ci0jaW5jbHVkZSA8bGludXgv aTJjLWFsZ28tYml0Lmg+Ci0jaW5jbHVkZSA8YXNtL2lvLmg+Ci0KLSNkZWZpbmUgREVGQVVMVF9C QVNFIDB4Mzc4Ci1zdGF0aWMgaW50IGJhc2U9MDsKLXN0YXRpYyB1bnNpZ25lZCBjaGFyIFBvcnRE YXRhID0gMDsKLQotLyogLS0tLS0gZ2xvYmFsIGRlZmluZXMgLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0JKi8KLSNkZWZpbmUgREVCKHgpCQkvKiBzaG91bGQg YmUgcmVhc29uYWJsZSBvcGVuLCBjbG9zZSAmYy4gCSovCi0jZGVmaW5lIERFQjIoeCkgCS8qIGxv dyBsZXZlbCBkZWJ1Z2dpbmcgLSB2ZXJ5IHNsb3cgCQkqLwotI2RlZmluZSBERUJFKHgpCXgJLyog ZXJyb3IgbWVzc2FnZXMgCQkJCSovCi0jZGVmaW5lIERFQklOSVQoeCkgeAkvKiBkZXRlY3Rpb24g c3RhdHVzIG1lc3NhZ2VzCQkJKi8KLQotLyogLS0tIENvbnZlbmllbmNlIGRlZmluZXMgZm9yIHRo ZSBwYXJhbGxlbCBwb3J0OgkJCSovCi0jZGVmaW5lIEJBU0UJKHVuc2lnbmVkIGludCkoZGF0YSkK LSNkZWZpbmUgREFUQQlCQVNFCQkJLyogQ2VudHJvbmljcyBkYXRhIHBvcnQJCSovCi0jZGVmaW5l IFNUQVQJKEJBU0UrMSkJCS8qIENlbnRyb25pY3Mgc3RhdHVzIHBvcnQJKi8KLSNkZWZpbmUgQ1RS TAkoQkFTRSsyKQkJLyogQ2VudHJvbmljcyBjb250cm9sIHBvcnQJKi8KLQotCi0vKiAtLS0tLSBs b2NhbCBmdW5jdGlvbnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQkqLwotCi0KLXN0YXRpYyB2b2lkIGJpdF9lbHZfc2V0c2NsKHZvaWQgKmRhdGEsIGludCBz dGF0ZSkKLXsKLQlpZiAoc3RhdGUpIHsKLQkJUG9ydERhdGEgJj0gMHhmZTsKLQl9IGVsc2Ugewot CQlQb3J0RGF0YSB8PTE7Ci0JfQotCW91dGIoUG9ydERhdGEsIERBVEEpOwotfQotCi1zdGF0aWMg dm9pZCBiaXRfZWx2X3NldHNkYSh2b2lkICpkYXRhLCBpbnQgc3RhdGUpCi17Ci0JaWYgKHN0YXRl KSB7Ci0JCVBvcnREYXRhICY9MHhmZDsKLQl9IGVsc2UgewotCQlQb3J0RGF0YSB8PTI7Ci0JfQot CW91dGIoUG9ydERhdGEsIERBVEEpOwotfSAKLQotc3RhdGljIGludCBiaXRfZWx2X2dldHNjbCh2 b2lkICpkYXRhKQotewotCXJldHVybiAoIDAgPSAoIChpbmJfcChTVEFUKSkgJiAweDA4ICkgKTsK LX0KLQotc3RhdGljIGludCBiaXRfZWx2X2dldHNkYSh2b2lkICpkYXRhKQotewotCXJldHVybiAo IDAgPSAoIChpbmJfcChTVEFUKSkgJiAweDQwICkgKTsKLX0KLQotc3RhdGljIGludCBiaXRfZWx2 X2luaXQodm9pZCkKLXsKLQlpZiAoIXJlcXVlc3RfcmVnaW9uKGJhc2UsIChiYXNlID0gMHgzYmMp ID8gMyA6IDgsCi0JCQkJImkyYyAoRUxWIGFkYXB0ZXIpIikpCi0JCXJldHVybiAtRU5PREVWOwot Ci0JaWYgKGluYihiYXNlKzEpICYgMHg4MCkgewkvKiBCVVNZIHNob3VsZCBiZSBoaWdoCSovCi0J CURFQklOSVQocHJpbnRrKEtFUk5fREVCVUcgImkyYy1lbHYubzogQnVzeSB3YXMgbG93LlxuIikp OwotCQlnb3RvIGZhaWw7Ci0JfSAKLQotCW91dGIoMHgwYyxiYXNlKzIpOwkvKiBTTENUIGF1ZiBs b3cJCSovCi0JdWRlbGF5KDQwMCk7Ci0JaWYgKCEoaW5iKGJhc2UrMSkgJiYgMHgxMCkpIHsKLQkJ b3V0YigweDA0LGJhc2UrMik7Ci0JCURFQklOSVQocHJpbnRrKEtFUk5fREVCVUcgImkyYy1lbHYu bzogU2VsZWN0IHdhcyBoaWdoLlxuIikpOwotCQlnb3RvIGZhaWw7Ci0JfQotCi0JUG9ydERhdGEg PSAwOwotCWJpdF9lbHZfc2V0c2RhKCh2b2lkKiliYXNlLDEpOwotCWJpdF9lbHZfc2V0c2NsKCh2 b2lkKiliYXNlLDEpOwotCXJldHVybiAwOwotCi1mYWlsOgotCXJlbGVhc2VfcmVnaW9uKGJhc2Ug LCAoYmFzZSA9IDB4M2JjKSA/IDMgOiA4KTsKLQlyZXR1cm4gLUVOT0RFVjsKLX0KLQotLyogLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCi0gKiBFbmNhcHN1bGF0ZSB0aGUgYWJvdmUgZnVuY3Rpb25zIGluIHRoZSBj b3JyZWN0IG9wZXJhdGlvbnMgc3RydWN0dXJlLgotICogVGhpcyBpcyBvbmx5IGRvbmUgd2hlbiBt b3JlIHRoYW4gb25lIGhhcmR3YXJlIGFkYXB0ZXIgaXMgc3VwcG9ydGVkLgotICovCi1zdGF0aWMg c3RydWN0IGkyY19hbGdvX2JpdF9kYXRhIGJpdF9lbHZfZGF0YSA9IHsKLQkuc2V0c2RhCQk9IGJp dF9lbHZfc2V0c2RhLAotCS5zZXRzY2wJCT0gYml0X2Vsdl9zZXRzY2wsCi0JLmdldHNkYQkJPSBi aXRfZWx2X2dldHNkYSwKLQkuZ2V0c2NsCQk9IGJpdF9lbHZfZ2V0c2NsLAotCS51ZGVsYXkJCT0g ODAsCi0JLm1kZWxheQkJPSA4MCwKLQkudGltZW91dAk9IEhaCi19OwotCi1zdGF0aWMgc3RydWN0 IGkyY19hZGFwdGVyIGJpdF9lbHZfb3BzID0gewotCS5vd25lcgkJPSBUSElTX01PRFVMRSwKLQku aWQJCT0gSTJDX0hXX0JfRUxWLAotCS5hbGdvX2RhdGEJPSAmYml0X2Vsdl9kYXRhLAotCS5uYW1l CQk9ICJFTFYgUGFyYWxsZWwgcG9ydCBhZGFwdG9yIiwKLX07Ci0KLXN0YXRpYyBpbnQgX19pbml0 IGkyY19iaXRlbHZfaW5pdCh2b2lkKQotewotCXByaW50ayhLRVJOX0lORk8gImkyYy1lbHYubzog aTJjIEVMViBwYXJhbGxlbCBwb3J0IGFkYXB0ZXIgbW9kdWxlIHZlcnNpb24gJXMgKCVzKVxuIiwg STJDX1ZFUlNJT04sIEkyQ19EQVRFKTsKLQlpZiAoYmFzZT0wKSB7Ci0JCS8qIHByb2JlIHNvbWUg dmFsdWVzICovCi0JCWJhc2XeRkFVTFRfQkFTRTsKLQkJYml0X2Vsdl9kYXRhLmRhdGE9KHZvaWQq KURFRkFVTFRfQkFTRTsKLQkJaWYgKGJpdF9lbHZfaW5pdCgpPTApIHsKLQkJCWlmKGkyY19iaXRf YWRkX2J1cygmYml0X2Vsdl9vcHMpIDwgMCkKLQkJCQlyZXR1cm4gLUVOT0RFVjsKLQkJfSBlbHNl IHsKLQkJCXJldHVybiAtRU5PREVWOwotCQl9Ci0JfSBlbHNlIHsKLQkJaTJjX3NldF9hZGFwZGF0 YSgmYml0X2Vsdl9vcHMsICh2b2lkICopYmFzZSk7Ci0JCWlmIChiaXRfZWx2X2luaXQoKT0wKSB7 Ci0JCQlpZihpMmNfYml0X2FkZF9idXMoJmJpdF9lbHZfb3BzKSA8IDApCi0JCQkJcmV0dXJuIC1F Tk9ERVY7Ci0JCX0gZWxzZSB7Ci0JCQlyZXR1cm4gLUVOT0RFVjsKLQkJfQotCX0KLQlwcmludGso S0VSTl9ERUJVRyAiaTJjLWVsdi5vOiBmb3VuZCBkZXZpY2UgYXQgJSN4LlxuIixiYXNlKTsKLQly ZXR1cm4gMDsKLX0KLQotc3RhdGljIHZvaWQgX19leGl0IGkyY19iaXRlbHZfZXhpdCh2b2lkKQot ewotCWkyY19iaXRfZGVsX2J1cygmYml0X2Vsdl9vcHMpOwotCXJlbGVhc2VfcmVnaW9uKGJhc2Ug LCAoYmFzZSA9IDB4M2JjKSA/IDMgOiA4KTsKLX0KLQotTU9EVUxFX0FVVEhPUigiU2ltb24gRy4g Vm9nbCA8c2ltb25AdGsudW5pLWxpbnouYWMuYXQ+Iik7Ci1NT0RVTEVfREVTQ1JJUFRJT04oIkky Qy1CdXMgYWRhcHRlciByb3V0aW5lcyBmb3IgRUxWIHBhcmFsbGVsIHBvcnQgYWRhcHRlciIpOwot TU9EVUxFX0xJQ0VOU0UoIkdQTCIpOwotCi1NT0RVTEVfUEFSTShiYXNlLCAiaSIpOwotCi1tb2R1 bGVfaW5pdChpMmNfYml0ZWx2X2luaXQpOwotbW9kdWxlX2V4aXQoaTJjX2JpdGVsdl9leGl0KTsK Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262436AbTIVXkE (ORCPT ); Mon, 22 Sep 2003 19:40:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262404AbTIVXii (ORCPT ); Mon, 22 Sep 2003 19:38:38 -0400 Received: from mail.kroah.org ([65.200.24.183]:3745 "EHLO perch.kroah.org") by vger.kernel.org with ESMTP id S262436AbTIVXah convert rfc822-to-8bit (ORCPT ); Mon, 22 Sep 2003 19:30:37 -0400 Content-Type: text/plain; charset="iso-8859-1" Message-Id: <10642734262038@kroah.com> Subject: Re: [PATCH] i2c driver fixes for 2.6.0-test5 In-Reply-To: <10642734251033@kroah.com> From: Greg KH X-Mailer: gregkh_patchbomb Date: Mon, 22 Sep 2003 16:30:26 -0700 Content-Transfer-Encoding: 8BIT To: linux-kernel@vger.kernel.org, sensors@stimpy.netroedge.com Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org ChangeSet 1.1315.1.19, 2003/09/22 13:36:52-07:00, greg@kroah.com [PATCH] I2C: move i2c-elv.c driver to drivers/i2c/busses drivers/i2c/i2c-elv.c | 176 ------------------------------------------- drivers/i2c/Kconfig | 10 -- drivers/i2c/Makefile | 1 drivers/i2c/busses/Kconfig | 10 ++ drivers/i2c/busses/Makefile | 1 drivers/i2c/busses/i2c-elv.c | 176 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 187 insertions(+), 187 deletions(-) diff -Nru a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig --- a/drivers/i2c/Kconfig Mon Sep 22 16:12:56 2003 +++ b/drivers/i2c/Kconfig Mon Sep 22 16:12:56 2003 @@ -48,16 +48,6 @@ This support is also available as a module. If so, the module will be called i2c-algo-bit. -config I2C_ELV - tristate "ELV adapter" - depends on I2C_ALGOBIT && ISA - help - This supports parallel-port I2C adapters called ELV. Say Y if you - own such an adapter. - - This support is also available as a module. If so, the module - will be called i2c-elv. - config I2C_VELLEMAN tristate "Velleman K9000 adapter" depends on I2C_ALGOBIT && ISA diff -Nru a/drivers/i2c/Makefile b/drivers/i2c/Makefile --- a/drivers/i2c/Makefile Mon Sep 22 16:12:56 2003 +++ b/drivers/i2c/Makefile Mon Sep 22 16:12:56 2003 @@ -5,7 +5,6 @@ obj-$(CONFIG_I2C) += i2c-core.o obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o obj-$(CONFIG_I2C_ALGOBIT) += i2c-algo-bit.o -obj-$(CONFIG_I2C_ELV) += i2c-elv.o obj-$(CONFIG_I2C_VELLEMAN) += i2c-velleman.o obj-$(CONFIG_I2C_ALGOPCF) += i2c-algo-pcf.o obj-$(CONFIG_I2C_ELEKTOR) += i2c-elektor.o diff -Nru a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig --- a/drivers/i2c/busses/Kconfig Mon Sep 22 16:12:56 2003 +++ b/drivers/i2c/busses/Kconfig Mon Sep 22 16:12:56 2003 @@ -46,6 +46,16 @@ This driver can also be built as a module. If so, the module will be called i2c-amd8111. +config I2C_ELV + tristate "ELV adapter" + depends on I2C_ALGOBIT && ISA + help + This supports parallel-port I2C adapters called ELV. Say Y if you + own such an adapter. + + This support is also available as a module. If so, the module + will be called i2c-elv. + config I2C_I801 tristate "Intel 801" depends on I2C && PCI && EXPERIMENTAL diff -Nru a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile --- a/drivers/i2c/busses/Makefile Mon Sep 22 16:12:56 2003 +++ b/drivers/i2c/busses/Makefile Mon Sep 22 16:12:56 2003 @@ -6,6 +6,7 @@ obj-$(CONFIG_I2C_ALI15X3) += i2c-ali15x3.o obj-$(CONFIG_I2C_AMD756) += i2c-amd756.o obj-$(CONFIG_I2C_AMD8111) += i2c-amd8111.o +obj-$(CONFIG_I2C_ELV) += i2c-elv.o obj-$(CONFIG_I2C_I801) += i2c-i801.o obj-$(CONFIG_I2C_I810) += i2c-i810.o obj-$(CONFIG_I2C_ISA) += i2c-isa.o diff -Nru a/drivers/i2c/busses/i2c-elv.c b/drivers/i2c/busses/i2c-elv.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/i2c/busses/i2c-elv.c Mon Sep 22 16:12:56 2003 @@ -0,0 +1,176 @@ +/* ------------------------------------------------------------------------- */ +/* i2c-elv.c i2c-hw access for philips style parallel port adapters */ +/* ------------------------------------------------------------------------- */ +/* Copyright (C) 1995-2000 Simon G. Vogl + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* ------------------------------------------------------------------------- */ + +/* With some changes from Kyösti Mälkki and even + Frodo Looijaard */ + +/* $Id: i2c-elv.c,v 1.27 2003/01/21 08:08:16 kmalkki Exp $ */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define DEFAULT_BASE 0x378 +static int base=0; +static unsigned char PortData = 0; + +/* ----- global defines ----------------------------------------------- */ +#define DEB(x) /* should be reasonable open, close &c. */ +#define DEB2(x) /* low level debugging - very slow */ +#define DEBE(x) x /* error messages */ +#define DEBINIT(x) x /* detection status messages */ + +/* --- Convenience defines for the parallel port: */ +#define BASE (unsigned int)(data) +#define DATA BASE /* Centronics data port */ +#define STAT (BASE+1) /* Centronics status port */ +#define CTRL (BASE+2) /* Centronics control port */ + + +/* ----- local functions ---------------------------------------------- */ + + +static void bit_elv_setscl(void *data, int state) +{ + if (state) { + PortData &= 0xfe; + } else { + PortData |=1; + } + outb(PortData, DATA); +} + +static void bit_elv_setsda(void *data, int state) +{ + if (state) { + PortData &=0xfd; + } else { + PortData |=2; + } + outb(PortData, DATA); +} + +static int bit_elv_getscl(void *data) +{ + return ( 0 == ( (inb_p(STAT)) & 0x08 ) ); +} + +static int bit_elv_getsda(void *data) +{ + return ( 0 == ( (inb_p(STAT)) & 0x40 ) ); +} + +static int bit_elv_init(void) +{ + if (!request_region(base, (base == 0x3bc) ? 3 : 8, + "i2c (ELV adapter)")) + return -ENODEV; + + if (inb(base+1) & 0x80) { /* BUSY should be high */ + DEBINIT(printk(KERN_DEBUG "i2c-elv.o: Busy was low.\n")); + goto fail; + } + + outb(0x0c,base+2); /* SLCT auf low */ + udelay(400); + if (!(inb(base+1) && 0x10)) { + outb(0x04,base+2); + DEBINIT(printk(KERN_DEBUG "i2c-elv.o: Select was high.\n")); + goto fail; + } + + PortData = 0; + bit_elv_setsda((void*)base,1); + bit_elv_setscl((void*)base,1); + return 0; + +fail: + release_region(base , (base == 0x3bc) ? 3 : 8); + return -ENODEV; +} + +/* ------------------------------------------------------------------------ + * Encapsulate the above functions in the correct operations structure. + * This is only done when more than one hardware adapter is supported. + */ +static struct i2c_algo_bit_data bit_elv_data = { + .setsda = bit_elv_setsda, + .setscl = bit_elv_setscl, + .getsda = bit_elv_getsda, + .getscl = bit_elv_getscl, + .udelay = 80, + .mdelay = 80, + .timeout = HZ +}; + +static struct i2c_adapter bit_elv_ops = { + .owner = THIS_MODULE, + .id = I2C_HW_B_ELV, + .algo_data = &bit_elv_data, + .name = "ELV Parallel port adaptor", +}; + +static int __init i2c_bitelv_init(void) +{ + printk(KERN_INFO "i2c-elv.o: i2c ELV parallel port adapter module version %s (%s)\n", I2C_VERSION, I2C_DATE); + if (base==0) { + /* probe some values */ + base=DEFAULT_BASE; + bit_elv_data.data=(void*)DEFAULT_BASE; + if (bit_elv_init()==0) { + if(i2c_bit_add_bus(&bit_elv_ops) < 0) + return -ENODEV; + } else { + return -ENODEV; + } + } else { + i2c_set_adapdata(&bit_elv_ops, (void *)base); + if (bit_elv_init()==0) { + if(i2c_bit_add_bus(&bit_elv_ops) < 0) + return -ENODEV; + } else { + return -ENODEV; + } + } + printk(KERN_DEBUG "i2c-elv.o: found device at %#x.\n",base); + return 0; +} + +static void __exit i2c_bitelv_exit(void) +{ + i2c_bit_del_bus(&bit_elv_ops); + release_region(base , (base == 0x3bc) ? 3 : 8); +} + +MODULE_AUTHOR("Simon G. Vogl "); +MODULE_DESCRIPTION("I2C-Bus adapter routines for ELV parallel port adapter"); +MODULE_LICENSE("GPL"); + +MODULE_PARM(base, "i"); + +module_init(i2c_bitelv_init); +module_exit(i2c_bitelv_exit); diff -Nru a/drivers/i2c/i2c-elv.c b/drivers/i2c/i2c-elv.c --- a/drivers/i2c/i2c-elv.c Mon Sep 22 16:12:56 2003 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,176 +0,0 @@ -/* ------------------------------------------------------------------------- */ -/* i2c-elv.c i2c-hw access for philips style parallel port adapters */ -/* ------------------------------------------------------------------------- */ -/* Copyright (C) 1995-2000 Simon G. Vogl - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* ------------------------------------------------------------------------- */ - -/* With some changes from Kyösti Mälkki and even - Frodo Looijaard */ - -/* $Id: i2c-elv.c,v 1.27 2003/01/21 08:08:16 kmalkki Exp $ */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define DEFAULT_BASE 0x378 -static int base=0; -static unsigned char PortData = 0; - -/* ----- global defines ----------------------------------------------- */ -#define DEB(x) /* should be reasonable open, close &c. */ -#define DEB2(x) /* low level debugging - very slow */ -#define DEBE(x) x /* error messages */ -#define DEBINIT(x) x /* detection status messages */ - -/* --- Convenience defines for the parallel port: */ -#define BASE (unsigned int)(data) -#define DATA BASE /* Centronics data port */ -#define STAT (BASE+1) /* Centronics status port */ -#define CTRL (BASE+2) /* Centronics control port */ - - -/* ----- local functions ---------------------------------------------- */ - - -static void bit_elv_setscl(void *data, int state) -{ - if (state) { - PortData &= 0xfe; - } else { - PortData |=1; - } - outb(PortData, DATA); -} - -static void bit_elv_setsda(void *data, int state) -{ - if (state) { - PortData &=0xfd; - } else { - PortData |=2; - } - outb(PortData, DATA); -} - -static int bit_elv_getscl(void *data) -{ - return ( 0 == ( (inb_p(STAT)) & 0x08 ) ); -} - -static int bit_elv_getsda(void *data) -{ - return ( 0 == ( (inb_p(STAT)) & 0x40 ) ); -} - -static int bit_elv_init(void) -{ - if (!request_region(base, (base == 0x3bc) ? 3 : 8, - "i2c (ELV adapter)")) - return -ENODEV; - - if (inb(base+1) & 0x80) { /* BUSY should be high */ - DEBINIT(printk(KERN_DEBUG "i2c-elv.o: Busy was low.\n")); - goto fail; - } - - outb(0x0c,base+2); /* SLCT auf low */ - udelay(400); - if (!(inb(base+1) && 0x10)) { - outb(0x04,base+2); - DEBINIT(printk(KERN_DEBUG "i2c-elv.o: Select was high.\n")); - goto fail; - } - - PortData = 0; - bit_elv_setsda((void*)base,1); - bit_elv_setscl((void*)base,1); - return 0; - -fail: - release_region(base , (base == 0x3bc) ? 3 : 8); - return -ENODEV; -} - -/* ------------------------------------------------------------------------ - * Encapsulate the above functions in the correct operations structure. - * This is only done when more than one hardware adapter is supported. - */ -static struct i2c_algo_bit_data bit_elv_data = { - .setsda = bit_elv_setsda, - .setscl = bit_elv_setscl, - .getsda = bit_elv_getsda, - .getscl = bit_elv_getscl, - .udelay = 80, - .mdelay = 80, - .timeout = HZ -}; - -static struct i2c_adapter bit_elv_ops = { - .owner = THIS_MODULE, - .id = I2C_HW_B_ELV, - .algo_data = &bit_elv_data, - .name = "ELV Parallel port adaptor", -}; - -static int __init i2c_bitelv_init(void) -{ - printk(KERN_INFO "i2c-elv.o: i2c ELV parallel port adapter module version %s (%s)\n", I2C_VERSION, I2C_DATE); - if (base==0) { - /* probe some values */ - base=DEFAULT_BASE; - bit_elv_data.data=(void*)DEFAULT_BASE; - if (bit_elv_init()==0) { - if(i2c_bit_add_bus(&bit_elv_ops) < 0) - return -ENODEV; - } else { - return -ENODEV; - } - } else { - i2c_set_adapdata(&bit_elv_ops, (void *)base); - if (bit_elv_init()==0) { - if(i2c_bit_add_bus(&bit_elv_ops) < 0) - return -ENODEV; - } else { - return -ENODEV; - } - } - printk(KERN_DEBUG "i2c-elv.o: found device at %#x.\n",base); - return 0; -} - -static void __exit i2c_bitelv_exit(void) -{ - i2c_bit_del_bus(&bit_elv_ops); - release_region(base , (base == 0x3bc) ? 3 : 8); -} - -MODULE_AUTHOR("Simon G. Vogl "); -MODULE_DESCRIPTION("I2C-Bus adapter routines for ELV parallel port adapter"); -MODULE_LICENSE("GPL"); - -MODULE_PARM(base, "i"); - -module_init(i2c_bitelv_init); -module_exit(i2c_bitelv_exit);