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: <10642734271040@kroah.com> List-Id: In-Reply-To: <10642734262308@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 Q2hhbmdlU2V0IDEuMTMxNS4xLjIyLCAyMDAzLzA5LzIyIDE0OjA5OjE3LTA3OjAwLCBncmVnQGty b2FoLmNvbQoKW1BBVENIXSBJMkM6IG1vdmUgaTJjLXZlbGxlbWFuIGRyaXZlciB0byBkcml2ZXJz L2kyYy9idXNzZXMKCgogZHJpdmVycy9pMmMvaTJjLXZlbGxlbWFuLmMgICAgICAgIHwgIDE2MSAt LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9pMmMvS2NvbmZp ZyAgICAgICAgICAgICAgIHwgICAxMCAtLQogZHJpdmVycy9pMmMvTWFrZWZpbGUgICAgICAgICAg ICAgIHwgICAgMSAKIGRyaXZlcnMvaTJjL2J1c3Nlcy9LY29uZmlnICAgICAgICB8ICAgMTAgKysK IGRyaXZlcnMvaTJjL2J1c3Nlcy9NYWtlZmlsZSAgICAgICB8ICAgIDEgCiBkcml2ZXJzL2kyYy9i dXNzZXMvaTJjLXZlbGxlbWFuLmMgfCAgMTYwICsrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysKIDYgZmlsZXMgY2hhbmdlZCwgMTcxIGluc2VydGlvbnMoKyksIDE3MiBkZWxldGlv bnMoLSkKCgpkaWZmIC1OcnUgYS9kcml2ZXJzL2kyYy9LY29uZmlnIGIvZHJpdmVycy9pMmMvS2Nv bmZpZwotLS0gYS9kcml2ZXJzL2kyYy9LY29uZmlnCU1vbiBTZXAgMjIgMTY6MTI6MjYgMjAwMwor KysgYi9kcml2ZXJzL2kyYy9LY29uZmlnCU1vbiBTZXAgMjIgMTY6MTI6MjYgMjAwMwpAQCAtNDgs MTYgKzQ4LDYgQEAKIAkgIFRoaXMgc3VwcG9ydCBpcyBhbHNvIGF2YWlsYWJsZSBhcyBhIG1vZHVs ZS4gIElmIHNvLCB0aGUgbW9kdWxlIAogCSAgd2lsbCBiZSBjYWxsZWQgaTJjLWFsZ28tYml0Lgog Ci1jb25maWcgSTJDX1ZFTExFTUFOCi0JdHJpc3RhdGUgIlZlbGxlbWFuIEs5MDAwIGFkYXB0ZXIi Ci0JZGVwZW5kcyBvbiBJMkNfQUxHT0JJVCAmJiBJU0EKLQloZWxwCi0JICBUaGlzIHN1cHBvcnRz IHRoZSBWZWxsZW1hbiBLOTAwMCBwYXJhbGxlbC1wb3J0IEkyQyBhZGFwdGVyLiAgU2F5IFkKLQkg IGlmIHlvdSBvd24gc3VjaCBhbiBhZGFwdGVyLgotCi0JICBUaGlzIHN1cHBvcnQgaXMgYWxzbyBh dmFpbGFibGUgYXMgYSBtb2R1bGUuICBJZiBzbywgdGhlIG1vZHVsZSAKLQkgIHdpbGwgYmUgY2Fs bGVkIGkyYy12ZWxsZW1hbi4KLQogY29uZmlnIFNDeDIwMF9JMkMKIAl0cmlzdGF0ZSAiTmF0U2Vt aSBTQ3gyMDAgSTJDIHVzaW5nIEdQSU8gcGlucyIKIAlkZXBlbmRzIG9uIFNDeDIwMCAmJiBJMkNf QUxHT0JJVApkaWZmIC1OcnUgYS9kcml2ZXJzL2kyYy9NYWtlZmlsZSBiL2RyaXZlcnMvaTJjL01h a2VmaWxlCi0tLSBhL2RyaXZlcnMvaTJjL01ha2VmaWxlCU1vbiBTZXAgMjIgMTY6MTI6MjYgMjAw MworKysgYi9kcml2ZXJzL2kyYy9NYWtlZmlsZQlNb24gU2VwIDIyIDE2OjEyOjI2IDIwMDMKQEAg LTUsNyArNSw2IEBACiBvYmotJChDT05GSUdfSTJDKQkJKz0gaTJjLWNvcmUubwogb2JqLSQoQ09O RklHX0kyQ19DSEFSREVWKQkrPSBpMmMtZGV2Lm8KIG9iai0kKENPTkZJR19JMkNfQUxHT0JJVCkJ Kz0gaTJjLWFsZ28tYml0Lm8KLW9iai0kKENPTkZJR19JMkNfVkVMTEVNQU4pCSs9IGkyYy12ZWxs ZW1hbi5vCiBvYmotJChDT05GSUdfSTJDX0FMR09QQ0YpCSs9IGkyYy1hbGdvLXBjZi5vCiBvYmot JChDT05GSUdfSTJDX0tFWVdFU1QpCSs9IGkyYy1rZXl3ZXN0Lm8KIG9iai0kKENPTkZJR19JVEVf STJDX0FMR08pCSs9IGkyYy1hbGdvLWl0ZS5vCmRpZmYgLU5ydSBhL2RyaXZlcnMvaTJjL2J1c3Nl cy9LY29uZmlnIGIvZHJpdmVycy9pMmMvYnVzc2VzL0tjb25maWcKLS0tIGEvZHJpdmVycy9pMmMv YnVzc2VzL0tjb25maWcJTW9uIFNlcCAyMiAxNjoxMjoyNiAyMDAzCisrKyBiL2RyaXZlcnMvaTJj L2J1c3Nlcy9LY29uZmlnCU1vbiBTZXAgMjIgMTY6MTI6MjYgMjAwMwpAQCAtMjAzLDYgKzIwMywx NiBAQAogCSAgVGhpcyBkcml2ZXIgY2FuIGFsc28gYmUgYnVpbHQgYXMgYSBtb2R1bGUuICBJZiBz bywgdGhlIG1vZHVsZQogCSAgd2lsbCBiZSBjYWxsZWQgaTJjLXNpczk2eC4KIAorY29uZmlnIEky Q19WRUxMRU1BTgorCXRyaXN0YXRlICJWZWxsZW1hbiBLOTAwMCBhZGFwdGVyIgorCWRlcGVuZHMg b24gSTJDX0FMR09CSVQgJiYgSVNBCisJaGVscAorCSAgVGhpcyBzdXBwb3J0cyB0aGUgVmVsbGVt YW4gSzkwMDAgcGFyYWxsZWwtcG9ydCBJMkMgYWRhcHRlci4gIFNheSBZCisJICBpZiB5b3Ugb3du IHN1Y2ggYW4gYWRhcHRlci4KKworCSAgVGhpcyBzdXBwb3J0IGlzIGFsc28gYXZhaWxhYmxlIGFz IGEgbW9kdWxlLiAgSWYgc28sIHRoZSBtb2R1bGUgCisJICB3aWxsIGJlIGNhbGxlZCBpMmMtdmVs bGVtYW4uCisKIGNvbmZpZyBJMkNfVklBCiAJdHJpc3RhdGUgIlZJQSA4MkM1OEIiCiAJZGVwZW5k cyBvbiBJMkNfQUxHT0JJVCAmJiBQQ0kgJiYgRVhQRVJJTUVOVEFMCmRpZmYgLU5ydSBhL2RyaXZl cnMvaTJjL2J1c3Nlcy9NYWtlZmlsZSBiL2RyaXZlcnMvaTJjL2J1c3Nlcy9NYWtlZmlsZQotLS0g YS9kcml2ZXJzL2kyYy9idXNzZXMvTWFrZWZpbGUJTW9uIFNlcCAyMiAxNjoxMjoyNiAyMDAzCisr KyBiL2RyaXZlcnMvaTJjL2J1c3Nlcy9NYWtlZmlsZQlNb24gU2VwIDIyIDE2OjEyOjI2IDIwMDMK QEAgLTE5LDYgKzE5LDcgQEAKIG9iai0kKENPTkZJR19JMkNfU0lTNTU5NSkJKz0gaTJjLXNpczU1 OTUubwogb2JqLSQoQ09ORklHX0kyQ19TSVM2MzApCSs9IGkyYy1zaXM2MzAubwogb2JqLSQoQ09O RklHX0kyQ19TSVM5NlgpCSs9IGkyYy1zaXM5Nngubworb2JqLSQoQ09ORklHX0kyQ19WRUxMRU1B TikJKz0gaTJjLXZlbGxlbWFuLm8KIG9iai0kKENPTkZJR19JMkNfVklBKQkJKz0gaTJjLXZpYS5v CiBvYmotJChDT05GSUdfSTJDX1ZJQVBSTykJKz0gaTJjLXZpYXByby5vCiBvYmotJChDT05GSUdf STJDX1ZPT0RPTzMpCSs9IGkyYy12b29kb28zLm8KZGlmZiAtTnJ1IGEvZHJpdmVycy9pMmMvYnVz c2VzL2kyYy12ZWxsZW1hbi5jIGIvZHJpdmVycy9pMmMvYnVzc2VzL2kyYy12ZWxsZW1hbi5jCi0t LSAvZGV2L251bGwJV2VkIERlYyAzMSAxNjowMDowMCAxOTY5CisrKyBiL2RyaXZlcnMvaTJjL2J1 c3Nlcy9pMmMtdmVsbGVtYW4uYwlNb24gU2VwIDIyIDE2OjEyOjI2IDIwMDMKQEAgLTAsMCArMSwx NjAgQEAKKy8qIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gKi8KKy8qIGkyYy12ZWxsZW1hbi5jIGkyYy1odyBh Y2Nlc3MgZm9yIFZlbGxlbWFuIEs5MDAwIGFkYXB0ZXJzCQkgICAgICovCisvKiAtLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tICovCisvKiAgIENvcHlyaWdodCAoQykgMTk5NS05NiwgMjAwMCBTaW1vbiBHLiBWb2ds CisKKyAgICBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1 dGUgaXQgYW5kL29yIG1vZGlmeQorICAgIGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdl bmVyYWwgUHVibGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5CisgICAgdGhlIEZyZWUgU29mdHdh cmUgRm91bmRhdGlvbjsgZWl0aGVyIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3IKKyAgICAo YXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorCisgICAgVGhpcyBwcm9ncmFtIGlz IGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisgICAgYnV0 IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkg b2YKKyAgICBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBP U0UuICBTZWUgdGhlCisgICAgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0 YWlscy4KKworICAgIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBH ZW5lcmFsIFB1YmxpYyBMaWNlbnNlCisgICAgYWxvbmcgd2l0aCB0aGlzIHByb2dyYW07IGlmIG5v dCwgd3JpdGUgdG8gdGhlIEZyZWUgU29mdHdhcmUKKyAgICBGb3VuZGF0aW9uLCBJbmMuLCA2NzUg TWFzcyBBdmUsIENhbWJyaWRnZSwgTUEgMDIxMzksIFVTQS4JCSAgICAgKi8KKy8qIC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0gKi8KKworLyogJElkOiBpMmMtdmVsbGVtYW4uYyx2IDEuMjkgMjAwMy8wMS8yMSAw ODowODoxNiBrbWFsa2tpIEV4cCAkICovCisKKyNpbmNsdWRlIDxsaW51eC9rZXJuZWwuaD4KKyNp bmNsdWRlIDxsaW51eC9pb3BvcnQuaD4KKyNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4KKyNpbmNs dWRlIDxsaW51eC9pbml0Lmg+CisjaW5jbHVkZSA8bGludXgvZGVsYXkuaD4KKyNpbmNsdWRlIDxs aW51eC9pMmMuaD4KKyNpbmNsdWRlIDxsaW51eC9pMmMtYWxnby1iaXQuaD4KKyNpbmNsdWRlIDxh c20vaW8uaD4KKworLyogLS0tLS0gZ2xvYmFsIGRlZmluZXMgLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0JKi8KKyNkZWZpbmUgREVCKHgpCQkvKiBzaG91bGQg YmUgcmVhc29uYWJsZSBvcGVuLCBjbG9zZSAmYy4gCSovCisjZGVmaW5lIERFQjIoeCkgCS8qIGxv dyBsZXZlbCBkZWJ1Z2dpbmcgLSB2ZXJ5IHNsb3cgCQkqLworI2RlZmluZSBERUJFKHgpCXgJLyog ZXJyb3IgbWVzc2FnZXMgCQkJCSovCisKKwkJCQkJLyogUGluIFBvcnQgIEludmVydGVkCW5hbWUJ Ki8KKyNkZWZpbmUgSTJDX1NEQQkJMHgwMgkJLyogIGN0cmwgYml0IDEgCShpbnYpCSovCisjZGVm aW5lIEkyQ19TQ0wJCTB4MDgJCS8qICBjdHJsIGJpdCAzIAkoaW52KQkqLworCisjZGVmaW5lIEky Q19TREFJTgkweDEwCQkvKiBzdGF0IGJpdCA0CQkqLworI2RlZmluZSBJMkNfU0NMSU4JMHgwOAkJ LyogY3RybCBiaXQgMyAoaW52KShyZWFkcyBvd24gb3V0cHV0KSovCisKKyNkZWZpbmUgSTJDX0RN QVNLCTB4ZmQKKyNkZWZpbmUgSTJDX0NNQVNLCTB4ZjcKKworCisvKiAtLS0gQ29udmVuaWVuY2Ug ZGVmaW5lcyBmb3IgdGhlIHBhcmFsbGVsIHBvcnQ6CQkJKi8KKyNkZWZpbmUgQkFTRQkodW5zaWdu ZWQgaW50KShkYXRhKQorI2RlZmluZSBEQVRBCUJBU0UJCQkvKiBDZW50cm9uaWNzIGRhdGEgcG9y dAkJKi8KKyNkZWZpbmUgU1RBVAkoQkFTRSsxKQkJLyogQ2VudHJvbmljcyBzdGF0dXMgcG9ydAkq LworI2RlZmluZSBDVFJMCShCQVNFKzIpCQkvKiBDZW50cm9uaWNzIGNvbnRyb2wgcG9ydAkqLwor CisjZGVmaW5lIERFRkFVTFRfQkFTRSAweDM3OAorc3RhdGljIGludCBiYXNlPTA7CisKKy8qIC0t LS0tIGxvY2FsIGZ1bmN0aW9ucyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0gKi8KKworc3RhdGljIHZvaWQgYml0X3ZlbGxlX3NldHNjbCh2b2lkICpk YXRhLCBpbnQgc3RhdGUpCit7CisJaWYgKHN0YXRlKSB7CisJCW91dGIoaW5iKENUUkwpICYgSTJD X0NNQVNLLCAgIENUUkwpOworCX0gZWxzZSB7CisJCW91dGIoaW5iKENUUkwpIHwgSTJDX1NDTCwg Q1RSTCk7CisJfQorCQorfQorCitzdGF0aWMgdm9pZCBiaXRfdmVsbGVfc2V0c2RhKHZvaWQgKmRh dGEsIGludCBzdGF0ZSkKK3sKKwlpZiAoc3RhdGUpIHsKKwkJb3V0YihpbmIoQ1RSTCkgJiBJMkNf RE1BU0sgLCBDVFJMKTsKKwl9IGVsc2UgeworCQlvdXRiKGluYihDVFJMKSB8IEkyQ19TREEsIENU UkwpOworCX0KKwkKK30gCisKK3N0YXRpYyBpbnQgYml0X3ZlbGxlX2dldHNjbCh2b2lkICpkYXRh KQoreworCXJldHVybiAoIDAgPSAoIChpbmIoQ1RSTCkpICYgSTJDX1NDTElOICkgKTsKK30KKwor c3RhdGljIGludCBiaXRfdmVsbGVfZ2V0c2RhKHZvaWQgKmRhdGEpCit7CisJcmV0dXJuICggMCAh PSAoIChpbmIoU1RBVCkpICYgSTJDX1NEQUlOICkgKTsKK30KKworc3RhdGljIGludCBiaXRfdmVs bGVfaW5pdCh2b2lkKQoreworCWlmICghcmVxdWVzdF9yZWdpb24oYmFzZSwgKGJhc2UgPSAweDNi YykgPyAzIDogOCwgCisJCQkiaTJjIChWZWxsZW1hbm4gYWRhcHRlcikiKSkKKwkJcmV0dXJuIC1F Tk9ERVY7CisKKwliaXRfdmVsbGVfc2V0c2RhKCh2b2lkKiliYXNlLDEpOworCWJpdF92ZWxsZV9z ZXRzY2woKHZvaWQqKWJhc2UsMSk7CisJcmV0dXJuIDA7Cit9CisKKy8qIC0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQorICogRW5jYXBzdWxhdGUgdGhlIGFib3ZlIGZ1bmN0aW9ucyBpbiB0aGUgY29ycmVjdCBvcGVy YXRpb25zIHN0cnVjdHVyZS4KKyAqIFRoaXMgaXMgb25seSBkb25lIHdoZW4gbW9yZSB0aGFuIG9u ZSBoYXJkd2FyZSBhZGFwdGVyIGlzIHN1cHBvcnRlZC4KKyAqLworCitzdGF0aWMgc3RydWN0IGky Y19hbGdvX2JpdF9kYXRhIGJpdF92ZWxsZV9kYXRhID0geworCS5zZXRzZGEJCT0gYml0X3ZlbGxl X3NldHNkYSwKKwkuc2V0c2NsCQk9IGJpdF92ZWxsZV9zZXRzY2wsCisJLmdldHNkYQkJPSBiaXRf dmVsbGVfZ2V0c2RhLAorCS5nZXRzY2wJCT0gYml0X3ZlbGxlX2dldHNjbCwKKwkudWRlbGF5CQk9 IDEwLAorCS5tZGVsYXkJCT0gMTAsCisJLnRpbWVvdXQJPSBIWgorfTsKKworc3RhdGljIHN0cnVj dCBpMmNfYWRhcHRlciBiaXRfdmVsbGVfb3BzID0geworCS5vd25lcgkJPSBUSElTX01PRFVMRSwK KwkuYWxnb19kYXRhCT0gJmJpdF92ZWxsZV9kYXRhLAorCS5uYW1lCQk9ICJWZWxsZW1hbiBLODAw MCIsCit9OworCitzdGF0aWMgaW50IF9faW5pdCBpMmNfYml0dmVsbGVfaW5pdCh2b2lkKQorewor CXByaW50ayhLRVJOX0lORk8gImkyYy12ZWxsZW1hbi5vOiBpMmMgVmVsbGVtYW4gSzgwMDAgYWRh cHRlciBtb2R1bGUgdmVyc2lvbiAlcyAoJXMpXG4iLCBJMkNfVkVSU0lPTiwgSTJDX0RBVEUpOwor CWlmIChiYXNlPTApIHsKKwkJLyogcHJvYmUgc29tZSB2YWx1ZXMgKi8KKwkJYmFzZd5GQVVMVF9C QVNFOworCQliaXRfdmVsbGVfZGF0YS5kYXRhPSh2b2lkKilERUZBVUxUX0JBU0U7CisJCWlmIChi aXRfdmVsbGVfaW5pdCgpPTApIHsKKwkJCWlmKGkyY19iaXRfYWRkX2J1cygmYml0X3ZlbGxlX29w cykgPCAwKQorCQkJCXJldHVybiAtRU5PREVWOworCQl9IGVsc2UgeworCQkJcmV0dXJuIC1FTk9E RVY7CisJCX0KKwl9IGVsc2UgeworCQliaXRfdmVsbGVfZGF0YS5kYXRhPSh2b2lkKiliYXNlOwor CQlpZiAoYml0X3ZlbGxlX2luaXQoKT0wKSB7CisJCQlpZihpMmNfYml0X2FkZF9idXMoJmJpdF92 ZWxsZV9vcHMpIDwgMCkKKwkJCQlyZXR1cm4gLUVOT0RFVjsKKwkJfSBlbHNlIHsKKwkJCXJldHVy biAtRU5PREVWOworCQl9CisJfQorCXByaW50ayhLRVJOX0RFQlVHICJpMmMtdmVsbGVtYW4ubzog Zm91bmQgZGV2aWNlIGF0ICUjeC5cbiIsYmFzZSk7CisJcmV0dXJuIDA7Cit9CisKK3N0YXRpYyB2 b2lkIF9fZXhpdCBpMmNfYml0dmVsbGVfZXhpdCh2b2lkKQorewkKKwlpMmNfYml0X2RlbF9idXMo JmJpdF92ZWxsZV9vcHMpOworCXJlbGVhc2VfcmVnaW9uKGJhc2UsIChiYXNlID0gMHgzYmMpID8g MyA6IDgpOworfQorCitNT0RVTEVfQVVUSE9SKCJTaW1vbiBHLiBWb2dsIDxzaW1vbkB0ay51bmkt bGluei5hYy5hdD4iKTsKK01PRFVMRV9ERVNDUklQVElPTigiSTJDLUJ1cyBhZGFwdGVyIHJvdXRp bmVzIGZvciBWZWxsZW1hbiBLODAwMCBhZGFwdGVyIik7CitNT0RVTEVfTElDRU5TRSgiR1BMIik7 CisKK01PRFVMRV9QQVJNKGJhc2UsICJpIik7CisKK21vZHVsZV9pbml0KGkyY19iaXR2ZWxsZV9p bml0KTsKK21vZHVsZV9leGl0KGkyY19iaXR2ZWxsZV9leGl0KTsKZGlmZiAtTnJ1IGEvZHJpdmVy cy9pMmMvaTJjLXZlbGxlbWFuLmMgYi9kcml2ZXJzL2kyYy9pMmMtdmVsbGVtYW4uYwotLS0gYS9k cml2ZXJzL2kyYy9pMmMtdmVsbGVtYW4uYwlNb24gU2VwIDIyIDE2OjEyOjI2IDIwMDMKKysrIC9k ZXYvbnVsbAlXZWQgRGVjIDMxIDE2OjAwOjAwIDE5NjkKQEAgLTEsMTYxICswLDAgQEAKLS8qIC0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0gKi8KLS8qIGkyYy12ZWxsZW1hbi5jIGkyYy1odyBhY2Nlc3MgZm9yIFZl bGxlbWFuIEs5MDAwIGFkYXB0ZXJzCQkgICAgICovCi0vKiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tICovCi0v KiAgIENvcHlyaWdodCAoQykgMTk5NS05NiwgMjAwMCBTaW1vbiBHLiBWb2dsCi0KLSAgICBUaGlz IHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29y IG1vZGlmeQotICAgIGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGlj IExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5Ci0gICAgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlv bjsgZWl0aGVyIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3IKLSAgICAoYXQgeW91ciBvcHRp b24pIGFueSBsYXRlciB2ZXJzaW9uLgotCi0gICAgVGhpcyBwcm9ncmFtIGlzIGRpc3RyaWJ1dGVk IGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCi0gICAgYnV0IFdJVEhPVVQgQU5Z IFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKLSAgICBNRVJD SEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhl Ci0gICAgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KLQotICAg IFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1Ymxp YyBMaWNlbnNlCi0gICAgYWxvbmcgd2l0aCB0aGlzIHByb2dyYW07IGlmIG5vdCwgd3JpdGUgdG8g dGhlIEZyZWUgU29mdHdhcmUKLSAgICBGb3VuZGF0aW9uLCBJbmMuLCA2NzUgTWFzcyBBdmUsIENh bWJyaWRnZSwgTUEgMDIxMzksIFVTQS4JCSAgICAgKi8KLS8qIC0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gKi8K LQotLyogJElkOiBpMmMtdmVsbGVtYW4uYyx2IDEuMjkgMjAwMy8wMS8yMSAwODowODoxNiBrbWFs a2tpIEV4cCAkICovCi0KLSNpbmNsdWRlIDxsaW51eC9rZXJuZWwuaD4KLSNpbmNsdWRlIDxsaW51 eC9pb3BvcnQuaD4KLSNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4KLSNpbmNsdWRlIDxsaW51eC9p bml0Lmg+Ci0jaW5jbHVkZSA8bGludXgvZGVsYXkuaD4KLSNpbmNsdWRlIDxsaW51eC9pMmMuaD4K LSNpbmNsdWRlIDxsaW51eC9pMmMtYWxnby1iaXQuaD4KLSNpbmNsdWRlIDxhc20vaW8uaD4KLQot LyogLS0tLS0gZ2xvYmFsIGRlZmluZXMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0JKi8KLSNkZWZpbmUgREVCKHgpCQkvKiBzaG91bGQgYmUgcmVhc29uYWJs ZSBvcGVuLCBjbG9zZSAmYy4gCSovCi0jZGVmaW5lIERFQjIoeCkgCS8qIGxvdyBsZXZlbCBkZWJ1 Z2dpbmcgLSB2ZXJ5IHNsb3cgCQkqLwotI2RlZmluZSBERUJFKHgpCXgJLyogZXJyb3IgbWVzc2Fn ZXMgCQkJCSovCi0KLQkJCQkJLyogUGluIFBvcnQgIEludmVydGVkCW5hbWUJKi8KLSNkZWZpbmUg STJDX1NEQQkJMHgwMgkJLyogIGN0cmwgYml0IDEgCShpbnYpCSovCi0jZGVmaW5lIEkyQ19TQ0wJ CTB4MDgJCS8qICBjdHJsIGJpdCAzIAkoaW52KQkqLwotCi0jZGVmaW5lIEkyQ19TREFJTgkweDEw CQkvKiBzdGF0IGJpdCA0CQkqLwotI2RlZmluZSBJMkNfU0NMSU4JMHgwOAkJLyogY3RybCBiaXQg MyAoaW52KShyZWFkcyBvd24gb3V0cHV0KSovCi0KLSNkZWZpbmUgSTJDX0RNQVNLCTB4ZmQKLSNk ZWZpbmUgSTJDX0NNQVNLCTB4ZjcKLQotCi0vKiAtLS0gQ29udmVuaWVuY2UgZGVmaW5lcyBmb3Ig dGhlIHBhcmFsbGVsIHBvcnQ6CQkJKi8KLSNkZWZpbmUgQkFTRQkodW5zaWduZWQgaW50KShkYXRh KQotI2RlZmluZSBEQVRBCUJBU0UJCQkvKiBDZW50cm9uaWNzIGRhdGEgcG9ydAkJKi8KLSNkZWZp bmUgU1RBVAkoQkFTRSsxKQkJLyogQ2VudHJvbmljcyBzdGF0dXMgcG9ydAkqLwotI2RlZmluZSBD VFJMCShCQVNFKzIpCQkvKiBDZW50cm9uaWNzIGNvbnRyb2wgcG9ydAkqLwotCi0jZGVmaW5lIERF RkFVTFRfQkFTRSAweDM3OAotc3RhdGljIGludCBiYXNlPTA7Ci0KLS8qIC0tLS0tIGxvY2FsIGZ1 bmN0aW9ucyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0gKi8KLQotc3RhdGljIHZvaWQgYml0X3ZlbGxlX3NldHNjbCh2b2lkICpkYXRhLCBpbnQgc3Rh dGUpCi17Ci0JaWYgKHN0YXRlKSB7Ci0JCW91dGIoaW5iKENUUkwpICYgSTJDX0NNQVNLLCAgIENU UkwpOwotCX0gZWxzZSB7Ci0JCW91dGIoaW5iKENUUkwpIHwgSTJDX1NDTCwgQ1RSTCk7Ci0JfQot CQotfQotCi1zdGF0aWMgdm9pZCBiaXRfdmVsbGVfc2V0c2RhKHZvaWQgKmRhdGEsIGludCBzdGF0 ZSkKLXsKLQlpZiAoc3RhdGUpIHsKLQkJb3V0YihpbmIoQ1RSTCkgJiBJMkNfRE1BU0sgLCBDVFJM KTsKLQl9IGVsc2UgewotCQlvdXRiKGluYihDVFJMKSB8IEkyQ19TREEsIENUUkwpOwotCX0KLQkK LX0gCi0KLXN0YXRpYyBpbnQgYml0X3ZlbGxlX2dldHNjbCh2b2lkICpkYXRhKQotewotCXJldHVy biAoIDAgPSAoIChpbmIoQ1RSTCkpICYgSTJDX1NDTElOICkgKTsKLX0KLQotc3RhdGljIGludCBi aXRfdmVsbGVfZ2V0c2RhKHZvaWQgKmRhdGEpCi17Ci0JcmV0dXJuICggMCAhPSAoIChpbmIoU1RB VCkpICYgSTJDX1NEQUlOICkgKTsKLX0KLQotc3RhdGljIGludCBiaXRfdmVsbGVfaW5pdCh2b2lk KQotewotCWlmICghcmVxdWVzdF9yZWdpb24oYmFzZSwgKGJhc2UgPSAweDNiYykgPyAzIDogOCwg Ci0JCQkiaTJjIChWZWxsZW1hbm4gYWRhcHRlcikiKSkKLQkJcmV0dXJuIC1FTk9ERVY7Ci0KLQli aXRfdmVsbGVfc2V0c2RhKCh2b2lkKiliYXNlLDEpOwotCWJpdF92ZWxsZV9zZXRzY2woKHZvaWQq KWJhc2UsMSk7Ci0JcmV0dXJuIDA7Ci19Ci0KLS8qIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQotICogRW5jYXBz dWxhdGUgdGhlIGFib3ZlIGZ1bmN0aW9ucyBpbiB0aGUgY29ycmVjdCBvcGVyYXRpb25zIHN0cnVj dHVyZS4KLSAqIFRoaXMgaXMgb25seSBkb25lIHdoZW4gbW9yZSB0aGFuIG9uZSBoYXJkd2FyZSBh ZGFwdGVyIGlzIHN1cHBvcnRlZC4KLSAqLwotCi1zdGF0aWMgc3RydWN0IGkyY19hbGdvX2JpdF9k YXRhIGJpdF92ZWxsZV9kYXRhID0gewotCS5zZXRzZGEJCT0gYml0X3ZlbGxlX3NldHNkYSwKLQku c2V0c2NsCQk9IGJpdF92ZWxsZV9zZXRzY2wsCi0JLmdldHNkYQkJPSBiaXRfdmVsbGVfZ2V0c2Rh LAotCS5nZXRzY2wJCT0gYml0X3ZlbGxlX2dldHNjbCwKLQkudWRlbGF5CQk9IDEwLAotCS5tZGVs YXkJCT0gMTAsCi0JLnRpbWVvdXQJPSBIWgotfTsKLQotc3RhdGljIHN0cnVjdCBpMmNfYWRhcHRl ciBiaXRfdmVsbGVfb3BzID0gewotCS5vd25lcgkJPSBUSElTX01PRFVMRSwKLQkuaWQJCT0gSTJD X0hXX0JfVkVMTEUsCi0JLmFsZ29fZGF0YQk9ICZiaXRfdmVsbGVfZGF0YSwKLQkubmFtZQkJPSAi VmVsbGVtYW4gSzgwMDAiLAotfTsKLQotc3RhdGljIGludCBfX2luaXQgaTJjX2JpdHZlbGxlX2lu aXQodm9pZCkKLXsKLQlwcmludGsoS0VSTl9JTkZPICJpMmMtdmVsbGVtYW4ubzogaTJjIFZlbGxl bWFuIEs4MDAwIGFkYXB0ZXIgbW9kdWxlIHZlcnNpb24gJXMgKCVzKVxuIiwgSTJDX1ZFUlNJT04s IEkyQ19EQVRFKTsKLQlpZiAoYmFzZT0wKSB7Ci0JCS8qIHByb2JlIHNvbWUgdmFsdWVzICovCi0J CWJhc2XeRkFVTFRfQkFTRTsKLQkJYml0X3ZlbGxlX2RhdGEuZGF0YT0odm9pZCopREVGQVVMVF9C QVNFOwotCQlpZiAoYml0X3ZlbGxlX2luaXQoKT0wKSB7Ci0JCQlpZihpMmNfYml0X2FkZF9idXMo JmJpdF92ZWxsZV9vcHMpIDwgMCkKLQkJCQlyZXR1cm4gLUVOT0RFVjsKLQkJfSBlbHNlIHsKLQkJ CXJldHVybiAtRU5PREVWOwotCQl9Ci0JfSBlbHNlIHsKLQkJYml0X3ZlbGxlX2RhdGEuZGF0YT0o dm9pZCopYmFzZTsKLQkJaWYgKGJpdF92ZWxsZV9pbml0KCk9MCkgewotCQkJaWYoaTJjX2JpdF9h ZGRfYnVzKCZiaXRfdmVsbGVfb3BzKSA8IDApCi0JCQkJcmV0dXJuIC1FTk9ERVY7Ci0JCX0gZWxz ZSB7Ci0JCQlyZXR1cm4gLUVOT0RFVjsKLQkJfQotCX0KLQlwcmludGsoS0VSTl9ERUJVRyAiaTJj LXZlbGxlbWFuLm86IGZvdW5kIGRldmljZSBhdCAlI3guXG4iLGJhc2UpOwotCXJldHVybiAwOwot fQotCi1zdGF0aWMgdm9pZCBfX2V4aXQgaTJjX2JpdHZlbGxlX2V4aXQodm9pZCkKLXsJCi0JaTJj X2JpdF9kZWxfYnVzKCZiaXRfdmVsbGVfb3BzKTsKLQlyZWxlYXNlX3JlZ2lvbihiYXNlLCAoYmFz ZSA9IDB4M2JjKSA/IDMgOiA4KTsKLX0KLQotTU9EVUxFX0FVVEhPUigiU2ltb24gRy4gVm9nbCA8 c2ltb25AdGsudW5pLWxpbnouYWMuYXQ+Iik7Ci1NT0RVTEVfREVTQ1JJUFRJT04oIkkyQy1CdXMg YWRhcHRlciByb3V0aW5lcyBmb3IgVmVsbGVtYW4gSzgwMDAgYWRhcHRlciIpOwotTU9EVUxFX0xJ Q0VOU0UoIkdQTCIpOwotCi1NT0RVTEVfUEFSTShiYXNlLCAiaSIpOwotCi1tb2R1bGVfaW5pdChp MmNfYml0dmVsbGVfaW5pdCk7Ci1tb2R1bGVfZXhpdChpMmNfYml0dmVsbGVfZXhpdCk7Cgo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262817AbTIWADY (ORCPT ); Mon, 22 Sep 2003 20:03:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S263068AbTIWABy (ORCPT ); Mon, 22 Sep 2003 20:01:54 -0400 Received: from mail.kroah.org ([65.200.24.183]:29857 "EHLO perch.kroah.org") by vger.kernel.org with ESMTP id S262817AbTIVXba convert rfc822-to-8bit (ORCPT ); Mon, 22 Sep 2003 19:31:30 -0400 Content-Type: text/plain; charset=US-ASCII Message-Id: <10642734271040@kroah.com> Subject: Re: [PATCH] i2c driver fixes for 2.6.0-test5 In-Reply-To: <10642734262308@kroah.com> From: Greg KH X-Mailer: gregkh_patchbomb Date: Mon, 22 Sep 2003 16:30:27 -0700 Content-Transfer-Encoding: 7BIT 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.22, 2003/09/22 14:09:17-07:00, greg@kroah.com [PATCH] I2C: move i2c-velleman driver to drivers/i2c/busses drivers/i2c/i2c-velleman.c | 161 -------------------------------------- drivers/i2c/Kconfig | 10 -- drivers/i2c/Makefile | 1 drivers/i2c/busses/Kconfig | 10 ++ drivers/i2c/busses/Makefile | 1 drivers/i2c/busses/i2c-velleman.c | 160 +++++++++++++++++++++++++++++++++++++ 6 files changed, 171 insertions(+), 172 deletions(-) diff -Nru a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig --- a/drivers/i2c/Kconfig Mon Sep 22 16:12:26 2003 +++ b/drivers/i2c/Kconfig Mon Sep 22 16:12:26 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_VELLEMAN - tristate "Velleman K9000 adapter" - depends on I2C_ALGOBIT && ISA - help - This supports the Velleman K9000 parallel-port I2C adapter. Say Y - if you own such an adapter. - - This support is also available as a module. If so, the module - will be called i2c-velleman. - config SCx200_I2C tristate "NatSemi SCx200 I2C using GPIO pins" depends on SCx200 && I2C_ALGOBIT diff -Nru a/drivers/i2c/Makefile b/drivers/i2c/Makefile --- a/drivers/i2c/Makefile Mon Sep 22 16:12:26 2003 +++ b/drivers/i2c/Makefile Mon Sep 22 16:12:26 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_VELLEMAN) += i2c-velleman.o obj-$(CONFIG_I2C_ALGOPCF) += i2c-algo-pcf.o obj-$(CONFIG_I2C_KEYWEST) += i2c-keywest.o obj-$(CONFIG_ITE_I2C_ALGO) += i2c-algo-ite.o diff -Nru a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig --- a/drivers/i2c/busses/Kconfig Mon Sep 22 16:12:26 2003 +++ b/drivers/i2c/busses/Kconfig Mon Sep 22 16:12:26 2003 @@ -203,6 +203,16 @@ This driver can also be built as a module. If so, the module will be called i2c-sis96x. +config I2C_VELLEMAN + tristate "Velleman K9000 adapter" + depends on I2C_ALGOBIT && ISA + help + This supports the Velleman K9000 parallel-port I2C adapter. Say Y + if you own such an adapter. + + This support is also available as a module. If so, the module + will be called i2c-velleman. + config I2C_VIA tristate "VIA 82C58B" depends on I2C_ALGOBIT && PCI && EXPERIMENTAL diff -Nru a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile --- a/drivers/i2c/busses/Makefile Mon Sep 22 16:12:26 2003 +++ b/drivers/i2c/busses/Makefile Mon Sep 22 16:12:26 2003 @@ -19,6 +19,7 @@ obj-$(CONFIG_I2C_SIS5595) += i2c-sis5595.o obj-$(CONFIG_I2C_SIS630) += i2c-sis630.o obj-$(CONFIG_I2C_SIS96X) += i2c-sis96x.o +obj-$(CONFIG_I2C_VELLEMAN) += i2c-velleman.o obj-$(CONFIG_I2C_VIA) += i2c-via.o obj-$(CONFIG_I2C_VIAPRO) += i2c-viapro.o obj-$(CONFIG_I2C_VOODOO3) += i2c-voodoo3.o diff -Nru a/drivers/i2c/busses/i2c-velleman.c b/drivers/i2c/busses/i2c-velleman.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/i2c/busses/i2c-velleman.c Mon Sep 22 16:12:26 2003 @@ -0,0 +1,160 @@ +/* ------------------------------------------------------------------------- */ +/* i2c-velleman.c i2c-hw access for Velleman K9000 adapters */ +/* ------------------------------------------------------------------------- */ +/* Copyright (C) 1995-96, 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. */ +/* ------------------------------------------------------------------------- */ + +/* $Id: i2c-velleman.c,v 1.29 2003/01/21 08:08:16 kmalkki Exp $ */ + +#include +#include +#include +#include +#include +#include +#include +#include + +/* ----- 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 */ + + /* Pin Port Inverted name */ +#define I2C_SDA 0x02 /* ctrl bit 1 (inv) */ +#define I2C_SCL 0x08 /* ctrl bit 3 (inv) */ + +#define I2C_SDAIN 0x10 /* stat bit 4 */ +#define I2C_SCLIN 0x08 /* ctrl bit 3 (inv)(reads own output)*/ + +#define I2C_DMASK 0xfd +#define I2C_CMASK 0xf7 + + +/* --- 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 */ + +#define DEFAULT_BASE 0x378 +static int base=0; + +/* ----- local functions --------------------------------------------------- */ + +static void bit_velle_setscl(void *data, int state) +{ + if (state) { + outb(inb(CTRL) & I2C_CMASK, CTRL); + } else { + outb(inb(CTRL) | I2C_SCL, CTRL); + } + +} + +static void bit_velle_setsda(void *data, int state) +{ + if (state) { + outb(inb(CTRL) & I2C_DMASK , CTRL); + } else { + outb(inb(CTRL) | I2C_SDA, CTRL); + } + +} + +static int bit_velle_getscl(void *data) +{ + return ( 0 == ( (inb(CTRL)) & I2C_SCLIN ) ); +} + +static int bit_velle_getsda(void *data) +{ + return ( 0 != ( (inb(STAT)) & I2C_SDAIN ) ); +} + +static int bit_velle_init(void) +{ + if (!request_region(base, (base == 0x3bc) ? 3 : 8, + "i2c (Vellemann adapter)")) + return -ENODEV; + + bit_velle_setsda((void*)base,1); + bit_velle_setscl((void*)base,1); + return 0; +} + +/* ------------------------------------------------------------------------ + * 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_velle_data = { + .setsda = bit_velle_setsda, + .setscl = bit_velle_setscl, + .getsda = bit_velle_getsda, + .getscl = bit_velle_getscl, + .udelay = 10, + .mdelay = 10, + .timeout = HZ +}; + +static struct i2c_adapter bit_velle_ops = { + .owner = THIS_MODULE, + .algo_data = &bit_velle_data, + .name = "Velleman K8000", +}; + +static int __init i2c_bitvelle_init(void) +{ + printk(KERN_INFO "i2c-velleman.o: i2c Velleman K8000 adapter module version %s (%s)\n", I2C_VERSION, I2C_DATE); + if (base==0) { + /* probe some values */ + base=DEFAULT_BASE; + bit_velle_data.data=(void*)DEFAULT_BASE; + if (bit_velle_init()==0) { + if(i2c_bit_add_bus(&bit_velle_ops) < 0) + return -ENODEV; + } else { + return -ENODEV; + } + } else { + bit_velle_data.data=(void*)base; + if (bit_velle_init()==0) { + if(i2c_bit_add_bus(&bit_velle_ops) < 0) + return -ENODEV; + } else { + return -ENODEV; + } + } + printk(KERN_DEBUG "i2c-velleman.o: found device at %#x.\n",base); + return 0; +} + +static void __exit i2c_bitvelle_exit(void) +{ + i2c_bit_del_bus(&bit_velle_ops); + release_region(base, (base == 0x3bc) ? 3 : 8); +} + +MODULE_AUTHOR("Simon G. Vogl "); +MODULE_DESCRIPTION("I2C-Bus adapter routines for Velleman K8000 adapter"); +MODULE_LICENSE("GPL"); + +MODULE_PARM(base, "i"); + +module_init(i2c_bitvelle_init); +module_exit(i2c_bitvelle_exit); diff -Nru a/drivers/i2c/i2c-velleman.c b/drivers/i2c/i2c-velleman.c --- a/drivers/i2c/i2c-velleman.c Mon Sep 22 16:12:26 2003 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,161 +0,0 @@ -/* ------------------------------------------------------------------------- */ -/* i2c-velleman.c i2c-hw access for Velleman K9000 adapters */ -/* ------------------------------------------------------------------------- */ -/* Copyright (C) 1995-96, 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. */ -/* ------------------------------------------------------------------------- */ - -/* $Id: i2c-velleman.c,v 1.29 2003/01/21 08:08:16 kmalkki Exp $ */ - -#include -#include -#include -#include -#include -#include -#include -#include - -/* ----- 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 */ - - /* Pin Port Inverted name */ -#define I2C_SDA 0x02 /* ctrl bit 1 (inv) */ -#define I2C_SCL 0x08 /* ctrl bit 3 (inv) */ - -#define I2C_SDAIN 0x10 /* stat bit 4 */ -#define I2C_SCLIN 0x08 /* ctrl bit 3 (inv)(reads own output)*/ - -#define I2C_DMASK 0xfd -#define I2C_CMASK 0xf7 - - -/* --- 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 */ - -#define DEFAULT_BASE 0x378 -static int base=0; - -/* ----- local functions --------------------------------------------------- */ - -static void bit_velle_setscl(void *data, int state) -{ - if (state) { - outb(inb(CTRL) & I2C_CMASK, CTRL); - } else { - outb(inb(CTRL) | I2C_SCL, CTRL); - } - -} - -static void bit_velle_setsda(void *data, int state) -{ - if (state) { - outb(inb(CTRL) & I2C_DMASK , CTRL); - } else { - outb(inb(CTRL) | I2C_SDA, CTRL); - } - -} - -static int bit_velle_getscl(void *data) -{ - return ( 0 == ( (inb(CTRL)) & I2C_SCLIN ) ); -} - -static int bit_velle_getsda(void *data) -{ - return ( 0 != ( (inb(STAT)) & I2C_SDAIN ) ); -} - -static int bit_velle_init(void) -{ - if (!request_region(base, (base == 0x3bc) ? 3 : 8, - "i2c (Vellemann adapter)")) - return -ENODEV; - - bit_velle_setsda((void*)base,1); - bit_velle_setscl((void*)base,1); - return 0; -} - -/* ------------------------------------------------------------------------ - * 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_velle_data = { - .setsda = bit_velle_setsda, - .setscl = bit_velle_setscl, - .getsda = bit_velle_getsda, - .getscl = bit_velle_getscl, - .udelay = 10, - .mdelay = 10, - .timeout = HZ -}; - -static struct i2c_adapter bit_velle_ops = { - .owner = THIS_MODULE, - .id = I2C_HW_B_VELLE, - .algo_data = &bit_velle_data, - .name = "Velleman K8000", -}; - -static int __init i2c_bitvelle_init(void) -{ - printk(KERN_INFO "i2c-velleman.o: i2c Velleman K8000 adapter module version %s (%s)\n", I2C_VERSION, I2C_DATE); - if (base==0) { - /* probe some values */ - base=DEFAULT_BASE; - bit_velle_data.data=(void*)DEFAULT_BASE; - if (bit_velle_init()==0) { - if(i2c_bit_add_bus(&bit_velle_ops) < 0) - return -ENODEV; - } else { - return -ENODEV; - } - } else { - bit_velle_data.data=(void*)base; - if (bit_velle_init()==0) { - if(i2c_bit_add_bus(&bit_velle_ops) < 0) - return -ENODEV; - } else { - return -ENODEV; - } - } - printk(KERN_DEBUG "i2c-velleman.o: found device at %#x.\n",base); - return 0; -} - -static void __exit i2c_bitvelle_exit(void) -{ - i2c_bit_del_bus(&bit_velle_ops); - release_region(base, (base == 0x3bc) ? 3 : 8); -} - -MODULE_AUTHOR("Simon G. Vogl "); -MODULE_DESCRIPTION("I2C-Bus adapter routines for Velleman K8000 adapter"); -MODULE_LICENSE("GPL"); - -MODULE_PARM(base, "i"); - -module_init(i2c_bitvelle_init); -module_exit(i2c_bitvelle_exit);