From: Imre Deak Subject: [PATCH 20/49] drm/i915/bxt: Add change to support gmbus pin pair for BXT Date: Tue, 17 Mar 2015 11:39:46 +0200 Message-ID: <1426585215-8788-21-git-send-email-imre.deak@intel.com> References: <1426585215-8788-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 5D3E46E650 for ; Tue, 17 Mar 2015 02:40:37 -0700 (PDT) In-Reply-To: <1426585215-8788-1-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogIkEuU3VuaWwgS2FtYXRoIiA8c3VuaWwua2FtYXRoQGludGVsLmNvbT4KCkZvciBCWFQg Z21idXMgaXMgcHVsbGVkIGZyb20gR1BVIHRvIENQVS4gRnJvbSBpbXBsZW1lbnRhdGlvbgpwb2lu dCBvZiB2aWV3IG9ubHkgcGluIHBhaXIgY29uZmlndXJhdGlvbiB3aWxsIGNoYW5nZS4gVGhlCmV4 aXN0aW5nIGltcGxlbWVudGF0aW9uIHN1cHBvcnRzIGFsbCBwbGF0Zm9ybXMgcHJldmlvdXMgdG8g R0VOOAphbmQgYWxzbyBTS0wuIEJ1dCBmb3IgQlhUIHBpbiBwYWlyIGNvbmZpZ3VyYXRpb24KaXMg Y29tcGxldGVseSBkaWZmZXJlbnQgdGhhbiBTS0wgb3Igb3RoZXIgcHJldmlvdXMgR0VOJ3MuClRo aXMgcGF0Y2ggaW50cm9kdWNlcyB0aGUgbmV3IHBpbiBwYWlyIGNvbmZpZ3VyYXRpb24gc3RydWN0 dXJlCnNwZWNpZmljIHRvIEJYVCBhbmQgYWxzbyBlbnN1cmVzIGV2ZXJ5IHJlYWwgZ21idXMgcG9y dCBoYXMgYQpncGlvIHBpbi4KClRlc3RlZCBvbiBCRFcgaGFyZHdhcmUgdG8gY29uZmlybSBpdCBk b2VzbnQgYnJlYWsgYW55dGhpbmcKaW4gZXhpc3RpbmcgcGxhdGZvcm0uCgpGb3IgQkRXIHBpbiBw YWlyIGNvbmZpZyB3aWxsIHJlbWFpbiBhczoKZ21idXNbMF06IE5hbWUgPSBpOTE1IGdtYnVzIHNz YywgZ3Bpb19yZWcgPSBjNTAxNCwgcmVnMCA9IDEKZ21idXNbMV06IE5hbWUgPSBpOTE1IGdtYnVz IHZnYSwgZ3Bpb19yZWcgPSBjNTAxMCwgcmVnMCA9IDIKZ21idXNbMl06IE5hbWUgPSBpOTE1IGdt YnVzIHBhbmVsLCBncGlvX3JlZyA9IGM1MDE4LCByZWcwID0gMwpnbWJ1c1szXTogTmFtZSA9IGk5 MTUgZ21idXMgZHBjLCBncGlvX3JlZyA9IGM1MDFjLCByZWcwID0gNApnbWJ1c1s0XTogTmFtZSA9 IGk5MTUgZ21idXMgZHBiLCBncGlvX3JlZyA9IGM1MDIwLCByZWcwID0gNQpnbWJ1c1s1XTogTmFt ZSA9IGk5MTUgZ21idXMgZHBkLCBncGlvX3JlZyA9IGM1MDI0LCByZWcwID0gNgoKQlhUIHdpbGwg aGF2ZToKZ21idXNbMF06IG5hbWUgPSBpOTE1IGdtYnVzIE5vbmUsIGdwaW9fcmVnID0gMCwgcmVn MCA9IDAKZ21idXNbMV06IG5hbWUgPSBpOTE1IGdtYnVzIE5vbmUsIGdwaW9fcmVnID0gMCwgcmVn MCA9IDAKZ21idXNbMl06IG5hbWUgPSBpOTE1IGdtYnVzIE5vbmUsIGdwaW9fcmVnID0gMCwgcmVn MCA9IDAKZ21idXNbM106IG5hbWUgPSBpOTE1IGdtYnVzIGRwYywgZ3Bpb19yZWcgPSBjNTAxOCwg cmVnMCA9IDIKZ21idXNbNF06IG5hbWUgPSBpOTE1IGdtYnVzIGRwYiwgZ3Bpb19yZWcgPSBjNTAx NCwgcmVnMCA9IDEKZ21idXNbNV06IG5hbWUgPSBpOTE1IGdtYnVzIG1pc2MsIGdwaW9fcmVnID0g YzUwMWMsIHJlZzAgPSAzCgpWYWx1ZXMgb2YgR01CVVNfUE9SVF9EUEIsIEdNQlVTX1BPUlRfRFBD LCBHTUJVU19QT1JUX0RQRCBpcwpyZXRhaW5lZCBhcyBpdCBpcyBsaWtlIG90aGVyIHBsYXRmb3Jt cy4gT25seSBsb2dpYyBpbiBnbWJ1cwpzdHJ1Y3R1cmUgY3JlYXRpb24gaXMgY2hhbmdlZCB0byBt aW5pbWl6ZSBjaGFuZ2VzIGluIG11bHRpcGxlCmZpbGVzLgoKdjE6IEluaXRpYWwgcmVsZWFzZQpT dHJ1Y3R1cmUgZ21idXNfcG9ydHNfYnh0ICBjcmVhdGVkIGZvciAzIHBvcnRzIG9ubHkuCkhlcmUg Zm9yIEJYVCwgZ21idXNbMF0sIGdtYnVzWzFdLCBnbWJ1c1syXSBpcyB1bnRvdWNoZWQuCkxvZ2lj IHVzZWQgdG8gY2FsY3VsYXRlIHBpbiBmcm9tIHJlc3BlY3RpdmUgcmVnaXN0ZXIgYWRkcmVzcyBh czoKcGluID0gcmVnICYgMHgwMDBmID4+IDIKCnYyOiBJbmNvcnBvcmF0ZWQgcmV2aWV3IGNvbW1l bnRzIGZyb20gSmFuaSBOaWt1bGEuCkFkZGVkIGEgZnVsbCBieHQgc3BlY2lmaWMgZ21idXNfcG9y dHNfYnh0IGFuZCB1c2VkIGl0IGZvciBieHQKcmVnYXJkbGVzcyBvZiBwaW4gPj0gNC4KQWRkZWQg Y29uc3QgY2hhciAqbmFtZSBhbmQgaW5pdGlhbGl6ZWQgaXQgY29uZGl0aW9uYWxseSB0bwpJU19C Uk9YVE9OKCkgc28gYW5kIGF2b2lkZWQgZHVwbGljYXRpb24gb2Ygc25wcmludGYuCkFkZGVkIHBv cnRfdG9fcGluX2J4dChwb3J0KSBmdW5jdGlvbiB3aGljaCByZXR1cm5zIHJpZ2h0CnBpbiB2YWx1 ZSBmb3IgYSBwb3J0IGZvciBieHQgcGxhdGZvcm0uCgpJc3N1ZTogVklaLTM1NzQKU2lnbmVkLW9m Zi1ieTogQS5TdW5pbCBLYW1hdGggPHN1bmlsLmthbWF0aEBpbnRlbC5jb20+ClNpZ25lZC1vZmYt Ynk6IERhbWllbiBMZXNwaWF1IDxkYW1pZW4ubGVzcGlhdUBpbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfaTJjLmMgfCA1NSArKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKy0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDkgaW5zZXJ0aW9ucygrKSwgNiBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jCmluZGV4IGIzMTA4OGEuLjNhYTMxZTEg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jCkBAIC00OCw2ICs0OCwxNiBAQCBzdGF0aWMgY29u c3Qgc3RydWN0IGdtYnVzX3BvcnQgZ21idXNfcG9ydHNbXSA9IHsKIAl7ICJkcGQiLCBHUElPRiB9 LAogfTsKIAorLyogZ21idXMgcGluIHBhaXIgY29uZmlndXJhdGlvbiBmb3IgYnh0ICovCitzdGF0 aWMgY29uc3Qgc3RydWN0IGdtYnVzX3BvcnQgZ21idXNfcG9ydHNfYnh0W10gPSB7CisJeyAiTm9u ZSIsIDAgfSwKKwl7ICJOb25lIiwgMCB9LAorCXsgIk5vbmUiLCAwIH0sCisJeyAiZHBjIiwgUENI X0dQSU9DIH0sCisJeyAiZHBiIiwgUENIX0dQSU9CIH0sCisJeyAibWlzYyIsIFBDSF9HUElPRCB9 LAorfTsKKwogLyogSW50ZWwgR1BJTyBhY2Nlc3MgZnVuY3Rpb25zICovCiAKICNkZWZpbmUgSTJD X1JJU0VGQUxMX1RJTUUgMTAKQEAgLTE4NSwxMiArMTk1LDE3IEBAIHN0YXRpYyB2b2lkCiBpbnRl bF9ncGlvX3NldHVwKHN0cnVjdCBpbnRlbF9nbWJ1cyAqYnVzLCB1MzIgcGluKQogewogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGJ1cy0+ZGV2X3ByaXY7CisJc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IGRldl9wcml2LT5kZXY7CiAJc3RydWN0IGkyY19hbGdvX2JpdF9kYXRh ICphbGdvOwogCiAJYWxnbyA9ICZidXMtPmJpdF9hbGdvOwogCiAJLyogLTEgdG8gbWFwIHBpbiBw YWlyIHRvIGdtYnVzIGluZGV4ICovCi0JYnVzLT5ncGlvX3JlZyA9IGRldl9wcml2LT5ncGlvX21t aW9fYmFzZSArIGdtYnVzX3BvcnRzW3BpbiAtIDFdLnJlZzsKKwlpZiAoSVNfQlJPWFRPTihkZXYp KQorCQlidXMtPmdwaW9fcmVnID0gZ21idXNfcG9ydHNfYnh0W3BpbiAtIDFdLnJlZzsKKwllbHNl CisJCWJ1cy0+Z3Bpb19yZWcgPSBkZXZfcHJpdi0+Z3Bpb19tbWlvX2Jhc2UKKwkJCQkrIGdtYnVz X3BvcnRzW3BpbiAtIDFdLnJlZzsKIAogCWJ1cy0+YWRhcHRlci5hbGdvX2RhdGEgPSBhbGdvOwog CWFsZ28tPnNldHNkYSA9IHNldF9kYXRhOwpAQCAtNTEwLDYgKzUyNSwyNyBAQCBzdGF0aWMgY29u c3Qgc3RydWN0IGkyY19hbGdvcml0aG0gZ21idXNfYWxnb3JpdGhtID0gewogCS5mdW5jdGlvbmFs aXR5CT0gZ21idXNfZnVuYwogfTsKIAorLyogcmV0dXJucyBtYXBwZWQgcGluIGZvciBhIHBvcnQg aW4gQlhUICovCitzdGF0aWMgdTMyIHBvcnRfdG9fcGluX2J4dCh1MzIgcG9ydCkKK3sKKwl1MzIg cGluOworCisJc3dpdGNoIChwb3J0KSB7CisJY2FzZSBHTUJVU19QT1JUX0RQQjoKKwkJcGluID0g MTsKKwkJYnJlYWs7CisJY2FzZSBHTUJVU19QT1JUX0RQQzoKKwkJcGluID0gMjsKKwkJYnJlYWs7 CisJY2FzZSBHTUJVU19QT1JUX0RQRDoKKwkJcGluID0gMzsKKwkJYnJlYWs7CisJZGVmYXVsdDoK KwkJcGluID0gMDsKKwl9CisJcmV0dXJuIHBpbjsKK30KKwogLyoqCiAgKiBpbnRlbF9nbWJ1c19z ZXR1cCAtIGluc3RhbnRpYXRlIGFsbCBJbnRlbCBpMmMgR01CdXNlcwogICogQGRldjogRFJNIGRl dmljZQpAQCAtNTM0LDEzICs1NzAsMTcgQEAgaW50IGludGVsX3NldHVwX2dtYnVzKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJZm9yIChpID0gMDsgaSA8IEdNQlVTX05VTV9QT1JUUzsgaSsrKSB7 CiAJCXN0cnVjdCBpbnRlbF9nbWJ1cyAqYnVzID0gJmRldl9wcml2LT5nbWJ1c1tpXTsKIAkJdTMy IHBvcnQgPSBpICsgMTsgLyogKzEgdG8gbWFwIGdtYnVzIGluZGV4IHRvIHBpbiBwYWlyICovCisJ CWNvbnN0IGNoYXIgKm5hbWU7CiAKIAkJYnVzLT5hZGFwdGVyLm93bmVyID0gVEhJU19NT0RVTEU7 CiAJCWJ1cy0+YWRhcHRlci5jbGFzcyA9IEkyQ19DTEFTU19EREM7Ci0JCXNucHJpbnRmKGJ1cy0+ YWRhcHRlci5uYW1lLAotCQkJIHNpemVvZihidXMtPmFkYXB0ZXIubmFtZSksCi0JCQkgImk5MTUg Z21idXMgJXMiLAotCQkJIGdtYnVzX3BvcnRzW2ldLm5hbWUpOworCQlpZiAoSVNfQlJPWFRPTihk ZXYpKQorCQkJbmFtZSA9IGdtYnVzX3BvcnRzX2J4dFtpXS5uYW1lOworCQllbHNlCisJCQluYW1l ID0gZ21idXNfcG9ydHNbaV0ubmFtZTsKKworCQlzbnByaW50ZihidXMtPmFkYXB0ZXIubmFtZSwg c2l6ZW9mKGJ1cy0+YWRhcHRlci5uYW1lKSwKKwkJCSAiaTkxNSBnbWJ1cyAlcyIsIG5hbWUpOwog CiAJCWJ1cy0+YWRhcHRlci5kZXYucGFyZW50ID0gJmRldi0+cGRldi0+ZGV2OwogCQlidXMtPmRl dl9wcml2ID0gZGV2X3ByaXY7CkBAIC01NDgsNyArNTg4LDEwIEBAIGludCBpbnRlbF9zZXR1cF9n bWJ1cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlidXMtPmFkYXB0ZXIuYWxnbyA9ICZnbWJ1 c19hbGdvcml0aG07CiAKIAkJLyogQnkgZGVmYXVsdCB1c2UgYSBjb25zZXJ2YXRpdmUgY2xvY2sg cmF0ZSAqLwotCQlidXMtPnJlZzAgPSBwb3J0IHwgR01CVVNfUkFURV8xMDBLSFo7CisJCWlmIChJ U19CUk9YVE9OKGRldikpCisJCQlidXMtPnJlZzAgPSBwb3J0X3RvX3Bpbl9ieHQocG9ydCkgfCBH TUJVU19SQVRFXzEwMEtIWjsKKwkJZWxzZQorCQkJYnVzLT5yZWcwID0gcG9ydCB8IEdNQlVTX1JB VEVfMTAwS0haOwogCiAJCS8qIGdtYnVzIHNlZW1zIHRvIGJlIGJyb2tlbiBvbiBpODMwICovCiAJ CWlmIChJU19JODMwKGRldikpCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK