From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas De Marchi Subject: [PATCH] drm/i915: remove confusing GPIO vs PCH_GPIO Date: Thu, 5 Jul 2018 21:58:13 -0700 Message-ID: <20180706045813.1821-1-lucas.demarchi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C56D6E183 for ; Fri, 6 Jul 2018 04:58:39 +0000 (UTC) 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 Cc: Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org SW5zdGVhZCBvZiBkZWZpbmluZyBhbGwgcmVnaXN0ZXJzIHR3aWNlLCBkZWZpbmUganVzdCBhIFBD SF9HUElPX0JBU0UKdGhhdCBoYXMgdGhlIHNhbWUgYWRkcmVzcyBhcyBQQ0hfR1BJT19BIGFuZCB1 c2UgdGhhdCB0byBjYWxjdWxhdGUgYWxsCnRoZSBvdGhlcnMuIFRoaXMgYWxzbyBicmluZ3MgVkxW IGFuZCAhSEFTX0dNQ0hfRElTUExBWSBpbiBsaW5lLCBkb2luZwp0aGUgc2FtZSB0aGluZy4KClNp Z25lZC1vZmYtYnk6IEx1Y2FzIERlIE1hcmNoaSA8bHVjYXMuZGVtYXJjaGlAaW50ZWwuY29tPgot LS0KCkFzIGRpc2N1c3NlZCBvbiBodHRwczovL3BhdGNod29yay5mcmVlZGVza3RvcC5vcmcvcGF0 Y2gvMjI1Mzg4Ly4KCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvaGFuZGxlcnMuYyB8ICAyICst CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oICAgICB8IDM3ICsrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMuYyAgICB8IDE1 ICsrKysrKy0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCAyNyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvaGFuZGxlcnMu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9oYW5kbGVycy5jCmluZGV4IGUzOTQ5MmFhZmY2 Yy4uZTI1YTc0ZmU3NTNiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvaGFu ZGxlcnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvaGFuZGxlcnMuYwpAQCAtMjA4 NCw3ICsyMDg0LDcgQEAgc3RhdGljIGludCBpbml0X2dlbmVyaWNfbW1pb19pbmZvKHN0cnVjdCBp bnRlbF9ndnQgKmd2dCkKIAogCU1NSU9fRihQQ0hfR01CVVMwLCA0ICogNCwgMCwgMCwgMCwgRF9B TEwsIGdtYnVzX21taW9fcmVhZCwKIAkJZ21idXNfbW1pb193cml0ZSk7Ci0JTU1JT19GKFBDSF9H UElPQSwgNiAqIDQsIEZfVU5BTElHTiwgMCwgMCwgRF9BTEwsIE5VTEwsIE5VTEwpOworCU1NSU9f RihfTU1JTyhQQ0hfR1BJT19CQVNFKSwgNiAqIDQsIEZfVU5BTElHTiwgMCwgMCwgRF9BTEwsIE5V TEwsIE5VTEwpOwogCU1NSU9fRihfTU1JTygweGU0ZjAwKSwgMHgyOCwgMCwgMCwgMCwgRF9BTEws IE5VTEwsIE5VTEwpOwogCiAJTU1JT19GKF9NTUlPKF9QQ0hfRFBCX0FVWF9DSF9DVEwpLCA2ICog NCwgMCwgMCwgMCwgRF9QUkVfU0tMLCBOVUxMLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXgg ZGM5NTNlZTdlM2IzLi4xMTUwM2VkNjA4MzIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAt MzA0NSwxOCArMzA0NSw2IEBAIGVudW0gaTkxNV9wb3dlcl93ZWxsX2lkIHsKIC8qCiAgKiBHUElP IHJlZ3MKICAqLwotI2RlZmluZSBHUElPQQkJCV9NTUlPKDB4NTAxMCkKLSNkZWZpbmUgR1BJT0IJ CQlfTU1JTygweDUwMTQpCi0jZGVmaW5lIEdQSU9DCQkJX01NSU8oMHg1MDE4KQotI2RlZmluZSBH UElPRAkJCV9NTUlPKDB4NTAxYykKLSNkZWZpbmUgR1BJT0UJCQlfTU1JTygweDUwMjApCi0jZGVm aW5lIEdQSU9GCQkJX01NSU8oMHg1MDI0KQotI2RlZmluZSBHUElPRwkJCV9NTUlPKDB4NTAyOCkK LSNkZWZpbmUgR1BJT0gJCQlfTU1JTygweDUwMmMpCi0jZGVmaW5lIEdQSU9KCQkJX01NSU8oMHg1 MDM0KQotI2RlZmluZSBHUElPSwkJCV9NTUlPKDB4NTAzOCkKLSNkZWZpbmUgR1BJT0wJCQlfTU1J TygweDUwM0MpCi0jZGVmaW5lIEdQSU9NCQkJX01NSU8oMHg1MDQwKQogIyBkZWZpbmUgR1BJT19D TE9DS19ESVJfTUFTSwkJKDEgPDwgMCkKICMgZGVmaW5lIEdQSU9fQ0xPQ0tfRElSX0lOCQkoMCA8 PCAxKQogIyBkZWZpbmUgR1BJT19DTE9DS19ESVJfT1VUCQkoMSA8PCAxKQpAQCAtNzYyNSwxMiAr NzYxMywyNSBAQCBlbnVtIHsKICNkZWZpbmUgICBJQ1BfVENfSFBEX0xPTkdfREVURUNUKHRjX3Bv cnQpCSgyIDw8ICh0Y19wb3J0KSAqIDQpCiAjZGVmaW5lICAgSUNQX1RDX0hQRF9TSE9SVF9ERVRF Q1QodGNfcG9ydCkJKDEgPDwgKHRjX3BvcnQpICogNCkKIAotI2RlZmluZSBQQ0hfR1BJT0EgICAg ICAgICAgICAgICBfTU1JTygweGM1MDEwKQotI2RlZmluZSBQQ0hfR1BJT0IgICAgICAgICAgICAg ICBfTU1JTygweGM1MDE0KQotI2RlZmluZSBQQ0hfR1BJT0MgICAgICAgICAgICAgICBfTU1JTygw eGM1MDE4KQotI2RlZmluZSBQQ0hfR1BJT0QgICAgICAgICAgICAgICBfTU1JTygweGM1MDFjKQot I2RlZmluZSBQQ0hfR1BJT0UgICAgICAgICAgICAgICBfTU1JTygweGM1MDIwKQotI2RlZmluZSBQ Q0hfR1BJT0YgICAgICAgICAgICAgICBfTU1JTygweGM1MDI0KQorI2RlZmluZSBHUElPX09GRlNF VAkJMHg1MDEwdQorI2RlZmluZSBQQ0hfR1BJT19CQVNFCQkoMHhjMDAwMHUgKyBHUElPX09GRlNF VCkKKyNkZWZpbmUgVkxWX0dQSU9fQkFTRQkJKFZMVl9ESVNQTEFZX0JBU0UgKyBHUElPX09GRlNF VCkKKworZW51bSBpOTE1X2dwaW8geworCUdQSU9BID0gMCwKKwlHUElPQiwKKwlHUElPQywKKwlH UElPRCwKKwlHUElPRSwKKwlHUElPRiwKKwlHUElPRywKKwlHUElPSCwKKwlfX0dQSU9JX1VOVVNF RCwKKwlHUElPSiwKKwlHUElPSywKKwlHUElPTCwKKwlHUElPTSwKK307CiAKICNkZWZpbmUgUENI X0dNQlVTMAkJX01NSU8oMHhjNTEwMCkKICNkZWZpbmUgUENIX0dNQlVTMQkJX01NSU8oMHhjNTEw NCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfaTJjLmMKaW5kZXggOTc2MDZjMWJlNzBkLi5iYjEwNDAyNzVk NGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jCkBAIC0zNyw3ICszNyw3IEBACiAKIHN0cnVj dCBnbWJ1c19waW4gewogCWNvbnN0IGNoYXIgKm5hbWU7Ci0JaTkxNV9yZWdfdCByZWc7CisJZW51 bSBpOTE1X2dwaW8gZ3BpbzsKIH07CiAKIC8qIE1hcCBnbWJ1cyBwaW4gcGFpcnMgdG8gbmFtZXMg YW5kIHJlZ2lzdGVycy4gKi8KQEAgLTEyMSw4ICsxMjEsNyBAQCBib29sIGludGVsX2dtYnVzX2lz X3ZhbGlkX3BpbihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJZWxzZQogCQlz aXplID0gQVJSQVlfU0laRShnbWJ1c19waW5zKTsKIAotCXJldHVybiBwaW4gPCBzaXplICYmCi0J CWk5MTVfbW1pb19yZWdfdmFsaWQoZ2V0X2dtYnVzX3BpbihkZXZfcHJpdiwgcGluKS0+cmVnKTsK KwlyZXR1cm4gcGluIDwgc2l6ZSAmJiBnZXRfZ21idXNfcGluKGRldl9wcml2LCBwaW4pLT5uYW1l OwogfQogCiAvKiBJbnRlbCBHUElPIGFjY2VzcyBmdW5jdGlvbnMgKi8KQEAgLTI5Myw3ICsyOTIs NyBAQCBpbnRlbF9ncGlvX3NldHVwKHN0cnVjdCBpbnRlbF9nbWJ1cyAqYnVzLCB1bnNpZ25lZCBp bnQgcGluKQogCWFsZ28gPSAmYnVzLT5iaXRfYWxnbzsKIAogCWJ1cy0+Z3Bpb19yZWcgPSBfTU1J TyhkZXZfcHJpdi0+Z3Bpb19tbWlvX2Jhc2UgKwotCQkJICAgICAgaTkxNV9tbWlvX3JlZ19vZmZz ZXQoZ2V0X2dtYnVzX3BpbihkZXZfcHJpdiwgcGluKS0+cmVnKSk7CisJCQkgICAgICA0ICogZ2V0 X2dtYnVzX3BpbihkZXZfcHJpdiwgcGluKS0+Z3Bpbyk7CiAJYnVzLT5hZGFwdGVyLmFsZ29fZGF0 YSA9IGFsZ287CiAJYWxnby0+c2V0c2RhID0gc2V0X2RhdGE7CiAJYWxnby0+c2V0c2NsID0gc2V0 X2Nsb2NrOwpAQCAtNzc1LDExICs3NzQsMTEgQEAgaW50IGludGVsX3NldHVwX2dtYnVzKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJcmV0dXJuIDA7CiAKIAlpZiAoSVNfVkFM TEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCi0JCWRldl9wcml2 LT5ncGlvX21taW9fYmFzZSA9IFZMVl9ESVNQTEFZX0JBU0U7CisJCWRldl9wcml2LT5ncGlvX21t aW9fYmFzZSA9IFZMVl9HUElPX0JBU0U7CiAJZWxzZSBpZiAoIUhBU19HTUNIX0RJU1BMQVkoZGV2 X3ByaXYpKQotCQlkZXZfcHJpdi0+Z3Bpb19tbWlvX2Jhc2UgPQotCQkJaTkxNV9tbWlvX3JlZ19v ZmZzZXQoUENIX0dQSU9BKSAtCi0JCQlpOTE1X21taW9fcmVnX29mZnNldChHUElPQSk7CisJCWRl dl9wcml2LT5ncGlvX21taW9fYmFzZSA9IFBDSF9HUElPX0JBU0U7CisJZWxzZQorCQlkZXZfcHJp di0+Z3Bpb19tbWlvX2Jhc2UgPSBHUElPX09GRlNFVDsKIAogCW11dGV4X2luaXQoJmRldl9wcml2 LT5nbWJ1c19tdXRleCk7CiAJaW5pdF93YWl0cXVldWVfaGVhZCgmZGV2X3ByaXYtPmdtYnVzX3dh aXRfcXVldWUpOwotLSAKMi4xNy4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK