From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Brown Subject: Applied "ASoC: hdmi-codec: remove multi detection support" to the asoc tree Date: Wed, 24 May 2017 18:45:48 +0100 Message-ID: References: <87a86boskr.wl%kuninori.morimoto.gx@renesas.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [IPv6:2400:8900::f03c:91ff:fedb:4f4]) by gabe.freedesktop.org (Postfix) with ESMTPS id 173356E6D7 for ; Wed, 24 May 2017 17:45:59 +0000 (UTC) In-Reply-To: <87a86boskr.wl%kuninori.morimoto.gx@renesas.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Kuninori Morimoto Cc: Laurent Pinchart , Simon , Mark Brown , alsa-devel@alsa-project.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Russell King , Jose Abreu List-Id: dri-devel@lists.freedesktop.org VGhlIHBhdGNoCgogICBBU29DOiBoZG1pLWNvZGVjOiByZW1vdmUgbXVsdGkgZGV0ZWN0aW9uIHN1 cHBvcnQKCmhhcyBiZWVuIGFwcGxpZWQgdG8gdGhlIGFzb2MgdHJlZSBhdAoKICAgZ2l0Oi8vZ2l0 Lmtlcm5lbC5vcmcvcHViL3NjbS9saW51eC9rZXJuZWwvZ2l0L2Jyb29uaWUvc291bmQuZ2l0IAoK QWxsIGJlaW5nIHdlbGwgdGhpcyBtZWFucyB0aGF0IGl0IHdpbGwgYmUgaW50ZWdyYXRlZCBpbnRv IHRoZSBsaW51eC1uZXh0CnRyZWUgKHVzdWFsbHkgc29tZXRpbWUgaW4gdGhlIG5leHQgMjQgaG91 cnMpIGFuZCBzZW50IHRvIExpbnVzIGR1cmluZwp0aGUgbmV4dCBtZXJnZSB3aW5kb3cgKG9yIHNv b25lciBpZiBpdCBpcyBhIGJ1ZyBmaXgpLCBob3dldmVyIGlmCnByb2JsZW1zIGFyZSBkaXNjb3Zl cmVkIHRoZW4gdGhlIHBhdGNoIG1heSBiZSBkcm9wcGVkIG9yIHJldmVydGVkLiAgCgpZb3UgbWF5 IGdldCBmdXJ0aGVyIGUtbWFpbHMgcmVzdWx0aW5nIGZyb20gYXV0b21hdGVkIG9yIG1hbnVhbCB0 ZXN0aW5nCmFuZCByZXZpZXcgb2YgdGhlIHRyZWUsIHBsZWFzZSBlbmdhZ2Ugd2l0aCBwZW9wbGUg cmVwb3J0aW5nIHByb2JsZW1zIGFuZApzZW5kIGZvbGxvd3VwIHBhdGNoZXMgYWRkcmVzc2luZyBh bnkgaXNzdWVzIHRoYXQgYXJlIHJlcG9ydGVkIGlmIG5lZWRlZC4KCklmIGFueSB1cGRhdGVzIGFy ZSByZXF1aXJlZCBvciB5b3UgYXJlIHN1Ym1pdHRpbmcgZnVydGhlciBjaGFuZ2VzIHRoZXkKc2hv dWxkIGJlIHNlbnQgYXMgaW5jcmVtZW50YWwgdXBkYXRlcyBhZ2FpbnN0IGN1cnJlbnQgZ2l0LCBl eGlzdGluZwpwYXRjaGVzIHdpbGwgbm90IGJlIHJlcGxhY2VkLgoKUGxlYXNlIGFkZCBhbnkgcmVs ZXZhbnQgbGlzdHMgYW5kIG1haW50YWluZXJzIHRvIHRoZSBDQ3Mgd2hlbiByZXBseWluZwp0byB0 aGlzIG1haWwuCgpUaGFua3MsCk1hcmsKCkZyb20gMjQwNjliNTg5YjAyY2MxMjkyNzYxYjBmNzI2 MjNkZDUwYWQxZTE5YyBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKRnJvbTogS3VuaW5vcmkgTW9y aW1vdG8gPGt1bmlub3JpLm1vcmltb3RvLmd4QHJlbmVzYXMuY29tPgpEYXRlOiBUaHUsIDE4IE1h eSAyMDE3IDAxOjQwOjAyICswMDAwClN1YmplY3Q6IFtQQVRDSF0gQVNvQzogaGRtaS1jb2RlYzog cmVtb3ZlIG11bHRpIGRldGVjdGlvbiBzdXBwb3J0CgpEZXNpZ25XYXJlIEhETUkgZHJpdmVyICg9 IGR3LWhkbWkpIGlzIHN1cHBvcnRpbmcgSERNSSBzb3VuZCwgYW5kIGl0cwpwcm9iZSBmdW5jdGlv biB3YXMgY2FsbGluZyBzb3VuZCBiaW5kaW5nIGZ1bmN0aW9uIG11bHRpcGxlIHRpbWVzIGFzCnNh bWUgSERNSSBkZXZpY2UgZGlmZmVyZW50IHBvcnQuCgpCZWNhdXNlIG9mIHRoaXMgYmVoYXZpb3Is IGNvbW1pdCA5NzMxZjgyZDYwMSAoIkFTb0M6IGhkbWktY29kZWM6IGVuYWJsZQptdWx0aSBwcm9i ZSBmb3IgLi4uIikgd2FzIGFkZGVkIGZvciBtdWx0aSBkZXRlY3Rpb24gY2FzZS4KQnV0LCB0aGlz IERlc2lnbldhcmUgSERNSSBkZXRlY3Rpb24vYmluZCBjb2RlIHdhcyBleGNoYW5nZWQvYWRqdXN0 ZWQgYnkKY29tbWl0IDY5NDk3ZWI5MjM0ICgiZHJtOiBicmlkZ2U6IGR3LWhkbWk6IEltcGxlbWVu dCBEUk0gYnJpZGdlLi4uIikuCk5vdywgYWxsIERlc2lnbldhcmUgSERNSSBzb3VuZCBwb3J0cyBh cmUgZGV0ZWN0ZWQgYXMgMSBiaW5kbmcgZnVuY3Rpb24uCgpCZWNhdXNlIG9mIHRoaXMsIGhkbWkt Y29kZWMgbXVsdGkgZGV0ZWN0aW9uIHN1cHBvcnQgaXMgbm8gbG9uZ2VyIG5lZWRlZC4KVGh1cywg dGhpcyBwYXRjaCByZW1vdmVzCmNvbW1pdCA5NzMxZjgyZDYwMSAoIkFTb0M6IGhkbWktY29kZWM6 IGVuYWJsZSBtdWx0aSBwcm9iZSBmb3IgLi4uIiksCmFuZCBpdHMgcmVsYXRlZApjb21taXQgMzQw MzI3YTYyYzQgKCJBU29DOiBoZG1pLWNvZGVjOiBGaXggaGRtaV9vZl94bGF0ZV9kYWlfbmFtZS4u LiIpCmNvbW1pdCA4NDgwYWM1Njc5NSAoIkFTb0M6IGhkbWktY29kZWM6IHJlbW92ZSBIRE1JIGRl dmljZSB1bnJlZ2lzdGVyIikKY29tbWl0IDBjMzQzYTM1YmZlICgiQVNvQzogaGRtaS1jb2RlYzog Zml4IHNwZWxsaW5nIG1pc3Rha2U6IC4uLikKClNpZ25lZC1vZmYtYnk6IEt1bmlub3JpIE1vcmlt b3RvIDxrdW5pbm9yaS5tb3JpbW90by5neEByZW5lc2FzLmNvbT4KU2lnbmVkLW9mZi1ieTogTWFy ayBCcm93biA8YnJvb25pZUBrZXJuZWwub3JnPgotLS0KIHNvdW5kL3NvYy9jb2RlY3MvaGRtaS1j b2RlYy5jIHwgODggKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgODUgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvc291bmQvc29jL2NvZGVjcy9oZG1pLWNvZGVjLmMgYi9zb3VuZC9zb2MvY29kZWNzL2hk bWktY29kZWMuYwppbmRleCBhM2YxNTE0OWFmY2YuLjg2NTliNzZiMDY2YSAxMDA2NDQKLS0tIGEv c291bmQvc29jL2NvZGVjcy9oZG1pLWNvZGVjLmMKKysrIGIvc291bmQvc29jL2NvZGVjcy9oZG1p LWNvZGVjLmMKQEAgLTI1LDE3ICsyNSw2IEBACiAKICNpbmNsdWRlIDxkcm0vZHJtX2NydGMuaD4g LyogVGhpcyBpcyBvbmx5IHRvIGdldCBNQVhfRUxEX0JZVEVTICovCiAKLXN0cnVjdCBoZG1pX2Rl dmljZSB7Ci0Jc3RydWN0IGRldmljZSAqZGV2OwotCXN0cnVjdCBsaXN0X2hlYWQgbGlzdDsKLQlp bnQgY250OwotfTsKLSNkZWZpbmUgcG9zX3RvX2hkbWlfZGV2aWNlKHBvcykJY29udGFpbmVyX29m KChwb3MpLCBzdHJ1Y3QgaGRtaV9kZXZpY2UsIGxpc3QpCi1MSVNUX0hFQUQoaGRtaV9kZXZpY2Vf bGlzdCk7Ci1zdGF0aWMgREVGSU5FX01VVEVYKGhkbWlfbXV0ZXgpOwotCi0jZGVmaW5lIERBSV9O QU1FX1NJWkUgMTYKLQogI2RlZmluZSBIRE1JX0NPREVDX0NITUFQX0lEWF9VTktOT1dOICAtMQog CiBzdHJ1Y3QgaGRtaV9jb2RlY19jaGFubmVsX21hcF90YWJsZSB7CkBAIC03MDIsNiArNjkxLDcg QEAgc3RhdGljIGludCBoZG1pX2NvZGVjX3BjbV9uZXcoc3RydWN0IHNuZF9zb2NfcGNtX3J1bnRp bWUgKnJ0ZCwKIH0KIAogc3RhdGljIHN0cnVjdCBzbmRfc29jX2RhaV9kcml2ZXIgaGRtaV9pMnNf ZGFpID0geworCS5uYW1lID0gImkycy1oaWZpIiwKIAkuaWQgPSBEQUlfSURfSTJTLAogCS5wbGF5 YmFjayA9IHsKIAkJLnN0cmVhbV9uYW1lID0gIlBsYXliYWNrIiwKQEAgLTcxNiw2ICs3MDYsNyBA QCBzdGF0aWMgc3RydWN0IHNuZF9zb2NfZGFpX2RyaXZlciBoZG1pX2kyc19kYWkgPSB7CiB9Owog CiBzdGF0aWMgY29uc3Qgc3RydWN0IHNuZF9zb2NfZGFpX2RyaXZlciBoZG1pX3NwZGlmX2RhaSA9 IHsKKwkubmFtZSA9ICJzcGRpZi1oaWZpIiwKIAkuaWQgPSBEQUlfSURfU1BESUYsCiAJLnBsYXli YWNrID0gewogCQkuc3RyZWFtX25hbWUgPSAiUGxheWJhY2siLApAQCAtNzI4LDMyICs3MTksNiBA QCBzdGF0aWMgY29uc3Qgc3RydWN0IHNuZF9zb2NfZGFpX2RyaXZlciBoZG1pX3NwZGlmX2RhaSA9 IHsKIAkucGNtX25ldyA9IGhkbWlfY29kZWNfcGNtX25ldywKIH07CiAKLXN0YXRpYyBjaGFyIGhk bWlfZGFpX25hbWVbXVtEQUlfTkFNRV9TSVpFXSA9IHsKLQkiaGRtaS1oaWZpLjAiLAotCSJoZG1p LWhpZmkuMSIsCi0JImhkbWktaGlmaS4yIiwKLQkiaGRtaS1oaWZpLjMiLAotfTsKLQotc3RhdGlj IGludCBoZG1pX29mX3hsYXRlX2RhaV9uYW1lKHN0cnVjdCBzbmRfc29jX2NvbXBvbmVudCAqY29t cG9uZW50LAotCQkJCSAgc3RydWN0IG9mX3BoYW5kbGVfYXJncyAqYXJncywKLQkJCQkgIGNvbnN0 IGNoYXIgKipkYWlfbmFtZSkKLXsKLQlpbnQgaWQ7Ci0KLQlpZiAoYXJncy0+YXJnc19jb3VudCkK LQkJaWQgPSBhcmdzLT5hcmdzWzBdOwotCWVsc2UKLQkJaWQgPSAwOwotCi0JaWYgKGlkIDwgQVJS QVlfU0laRShoZG1pX2RhaV9uYW1lKSkgewotCQkqZGFpX25hbWUgPSBoZG1pX2RhaV9uYW1lW2lk XTsKLQkJcmV0dXJuIDA7Ci0JfQotCi0JcmV0dXJuIC1FQUdBSU47Ci19Ci0KIHN0YXRpYyBzdHJ1 Y3Qgc25kX3NvY19jb2RlY19kcml2ZXIgaGRtaV9jb2RlYyA9IHsKIAkuY29tcG9uZW50X2RyaXZl ciA9IHsKIAkJLmNvbnRyb2xzCQk9IGhkbWlfY29udHJvbHMsCkBAIC03NjIsNyArNzI3LDYgQEAg c3RhdGljIHN0cnVjdCBzbmRfc29jX2NvZGVjX2RyaXZlciBoZG1pX2NvZGVjID0gewogCQkubnVt X2RhcG1fd2lkZ2V0cwk9IEFSUkFZX1NJWkUoaGRtaV93aWRnZXRzKSwKIAkJLmRhcG1fcm91dGVz CQk9IGhkbWlfcm91dGVzLAogCQkubnVtX2RhcG1fcm91dGVzCT0gQVJSQVlfU0laRShoZG1pX3Jv dXRlcyksCi0JCS5vZl94bGF0ZV9kYWlfbmFtZQk9IGhkbWlfb2ZfeGxhdGVfZGFpX25hbWUsCiAJ fSwKIH07CiAKQEAgLTc3MSw4ICs3MzUsNiBAQCBzdGF0aWMgaW50IGhkbWlfY29kZWNfcHJvYmUo c3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAlzdHJ1Y3QgaGRtaV9jb2RlY19wZGF0YSAq aGNkID0gcGRldi0+ZGV2LnBsYXRmb3JtX2RhdGE7CiAJc3RydWN0IGRldmljZSAqZGV2ID0gJnBk ZXYtPmRldjsKIAlzdHJ1Y3QgaGRtaV9jb2RlY19wcml2ICpoY3A7Ci0Jc3RydWN0IGhkbWlfZGV2 aWNlICpoZDsKLQlzdHJ1Y3QgbGlzdF9oZWFkICpwb3M7CiAJaW50IGRhaV9jb3VudCwgaSA9IDA7 CiAJaW50IHJldDsKIApAQCAtNzk0LDM1ICs3NTYsNiBAQCBzdGF0aWMgaW50IGhkbWlfY29kZWNf cHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAlpZiAoIWhjcCkKIAkJcmV0dXJu IC1FTk9NRU07CiAKLQloZCA9IE5VTEw7Ci0JbXV0ZXhfbG9jaygmaGRtaV9tdXRleCk7Ci0JbGlz dF9mb3JfZWFjaChwb3MsICZoZG1pX2RldmljZV9saXN0KSB7Ci0JCXN0cnVjdCBoZG1pX2Rldmlj ZSAqdG1wID0gcG9zX3RvX2hkbWlfZGV2aWNlKHBvcyk7Ci0KLQkJaWYgKHRtcC0+ZGV2ID09IGRl di0+cGFyZW50KSB7Ci0JCQloZCA9IHRtcDsKLQkJCWJyZWFrOwotCQl9Ci0JfQotCi0JaWYgKCFo ZCkgewotCQloZCA9IGRldm1fa3phbGxvYyhkZXYsIHNpemVvZigqaGQpLCBHRlBfS0VSTkVMKTsK LQkJaWYgKCFoZCkgewotCQkJbXV0ZXhfdW5sb2NrKCZoZG1pX211dGV4KTsKLQkJCXJldHVybiAt RU5PTUVNOwotCQl9Ci0KLQkJaGQtPmRldiA9IGRldi0+cGFyZW50OwotCi0JCWxpc3RfYWRkX3Rh aWwoJmhkLT5saXN0LCAmaGRtaV9kZXZpY2VfbGlzdCk7Ci0JfQotCW11dGV4X3VubG9jaygmaGRt aV9tdXRleCk7Ci0KLQlpZiAoaGQtPmNudCA+PSBBUlJBWV9TSVpFKGhkbWlfZGFpX25hbWUpKSB7 Ci0JCWRldl9lcnIoZGV2LCAidG9vIG1hbnkgaGRtaSBjb2RlYyBhcmUgZGV0ZWN0ZWRcbiIpOwot CQlyZXR1cm4gLUVJTlZBTDsKLQl9Ci0KIAloY3AtPmhjZCA9ICpoY2Q7CiAJbXV0ZXhfaW5pdCgm aGNwLT5jdXJyZW50X3N0cmVhbV9sb2NrKTsKIApAQCAtODM1LDE0ICs3NjgsMTEgQEAgc3RhdGlj IGludCBoZG1pX2NvZGVjX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJCWhj cC0+ZGFpZHJ2W2ldID0gaGRtaV9pMnNfZGFpOwogCQloY3AtPmRhaWRydltpXS5wbGF5YmFjay5j aGFubmVsc19tYXggPQogCQkJaGNkLT5tYXhfaTJzX2NoYW5uZWxzOwotCQloY3AtPmRhaWRydltp XS5uYW1lID0gaGRtaV9kYWlfbmFtZVtoZC0+Y250KytdOwogCQlpKys7CiAJfQogCi0JaWYgKGhj ZC0+c3BkaWYpIHsKKwlpZiAoaGNkLT5zcGRpZikKIAkJaGNwLT5kYWlkcnZbaV0gPSBoZG1pX3Nw ZGlmX2RhaTsKLQkJaGNwLT5kYWlkcnZbaV0ubmFtZSA9IGhkbWlfZGFpX25hbWVbaGQtPmNudCsr XTsKLQl9CiAKIAlyZXQgPSBzbmRfc29jX3JlZ2lzdGVyX2NvZGVjKGRldiwgJmhkbWlfY29kZWMs IGhjcC0+ZGFpZHJ2LAogCQkJCSAgICAgZGFpX2NvdW50KTsKQEAgLTg1OSwyMCArNzg5LDggQEAg c3RhdGljIGludCBoZG1pX2NvZGVjX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYp CiBzdGF0aWMgaW50IGhkbWlfY29kZWNfcmVtb3ZlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBk ZXYpCiB7CiAJc3RydWN0IGRldmljZSAqZGV2ID0gJnBkZXYtPmRldjsKLQlzdHJ1Y3QgbGlzdF9o ZWFkICpwb3M7CiAJc3RydWN0IGhkbWlfY29kZWNfcHJpdiAqaGNwOwogCi0JbXV0ZXhfbG9jaygm aGRtaV9tdXRleCk7Ci0JbGlzdF9mb3JfZWFjaChwb3MsICZoZG1pX2RldmljZV9saXN0KSB7Ci0J CXN0cnVjdCBoZG1pX2RldmljZSAqdG1wID0gcG9zX3RvX2hkbWlfZGV2aWNlKHBvcyk7Ci0KLQkJ aWYgKHRtcC0+ZGV2ID09IGRldi0+cGFyZW50KSB7Ci0JCQlsaXN0X2RlbChwb3MpOwotCQkJYnJl YWs7Ci0JCX0KLQl9Ci0JbXV0ZXhfdW5sb2NrKCZoZG1pX211dGV4KTsKLQogCWhjcCA9IGRldl9n ZXRfZHJ2ZGF0YShkZXYpOwogCWtmcmVlKGhjcC0+Y2htYXBfaW5mbyk7CiAJc25kX3NvY191bnJl Z2lzdGVyX2NvZGVjKGRldik7Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2RyaS1kZXZlbAo=