From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: Applied "ARM: pxa: change SSP DMA channels allocation" to the asoc tree From: Mark Brown Message-Id: Date: Mon, 25 Jun 2018 14:15:15 +0100 To: Robert Jarzmik Cc: Daniel Mack Daniel Mack , Haojian Zhuang , Ezequiel Garcia , Boris Brezillon , David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Liam Girdwood , Mark Brown , Arnd Bergmann , alsa-devel@alsa-project.org, netdev@vger.kernel.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, linux-mtd@lists.infradead.org, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.orgalsa-devel@alsa-project.org List-ID: VGhlIHBhdGNoCgogICBBUk06IHB4YTogY2hhbmdlIFNTUCBETUEgY2hhbm5lbHMgYWxsb2NhdGlv bgoKaGFzIGJlZW4gYXBwbGllZCB0byB0aGUgYXNvYyB0cmVlIGF0CgogICBodHRwczovL2dpdC5r ZXJuZWwub3JnL3B1Yi9zY20vbGludXgva2VybmVsL2dpdC9icm9vbmllL3NvdW5kLmdpdCAKCkFs bCBiZWluZyB3ZWxsIHRoaXMgbWVhbnMgdGhhdCBpdCB3aWxsIGJlIGludGVncmF0ZWQgaW50byB0 aGUgbGludXgtbmV4dAp0cmVlICh1c3VhbGx5IHNvbWV0aW1lIGluIHRoZSBuZXh0IDI0IGhvdXJz KSBhbmQgc2VudCB0byBMaW51cyBkdXJpbmcKdGhlIG5leHQgbWVyZ2Ugd2luZG93IChvciBzb29u ZXIgaWYgaXQgaXMgYSBidWcgZml4KSwgaG93ZXZlciBpZgpwcm9ibGVtcyBhcmUgZGlzY292ZXJl ZCB0aGVuIHRoZSBwYXRjaCBtYXkgYmUgZHJvcHBlZCBvciByZXZlcnRlZC4gIAoKWW91IG1heSBn ZXQgZnVydGhlciBlLW1haWxzIHJlc3VsdGluZyBmcm9tIGF1dG9tYXRlZCBvciBtYW51YWwgdGVz dGluZwphbmQgcmV2aWV3IG9mIHRoZSB0cmVlLCBwbGVhc2UgZW5nYWdlIHdpdGggcGVvcGxlIHJl cG9ydGluZyBwcm9ibGVtcyBhbmQKc2VuZCBmb2xsb3d1cCBwYXRjaGVzIGFkZHJlc3NpbmcgYW55 IGlzc3VlcyB0aGF0IGFyZSByZXBvcnRlZCBpZiBuZWVkZWQuCgpJZiBhbnkgdXBkYXRlcyBhcmUg cmVxdWlyZWQgb3IgeW91IGFyZSBzdWJtaXR0aW5nIGZ1cnRoZXIgY2hhbmdlcyB0aGV5CnNob3Vs ZCBiZSBzZW50IGFzIGluY3JlbWVudGFsIHVwZGF0ZXMgYWdhaW5zdCBjdXJyZW50IGdpdCwgZXhp c3RpbmcKcGF0Y2hlcyB3aWxsIG5vdCBiZSByZXBsYWNlZC4KClBsZWFzZSBhZGQgYW55IHJlbGV2 YW50IGxpc3RzIGFuZCBtYWludGFpbmVycyB0byB0aGUgQ0NzIHdoZW4gcmVwbHlpbmcKdG8gdGhp cyBtYWlsLgoKVGhhbmtzLApNYXJrCgpGcm9tIGNkMzFiODA3MzY4NTJkMzRiYzEwNzJmM2U1Nzlh NmZkNzNhMjQ0ZTcgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCkZyb206IFJvYmVydCBKYXJ6bWlr IDxyb2JlcnQuamFyem1pa0BmcmVlLmZyPgpEYXRlOiBTdW4sIDE3IEp1biAyMDE4IDE5OjAyOjE3 ICswMjAwClN1YmplY3Q6IFtQQVRDSF0gQVJNOiBweGE6IGNoYW5nZSBTU1AgRE1BIGNoYW5uZWxz IGFsbG9jYXRpb24KCk5vdyB0aGUgZG1hX3NsYXZlX21hcCBpcyBhdmFpbGFibGUgZm9yIFBYQSBh cmNoaXRlY3R1cmUsIHN3aXRjaCB0aGUgU1NQCmRldmljZSB0byBpdC4KClRoaXMgc3BlY2lmaWNh bGx5IG1lYW5zIHRoYXQgOgotIGZvciBwbGF0Zm9ybSBkYXRhIGJhc2VkIG1hY2hpbmVzLCB0aGUg RE1BIHJlcXVlc3RvciBjaGFubmVscyBhcmUKICBleHRyYWN0ZWQgZnJvbSB0aGUgc2xhdmUgbWFw LCB3aGVyZSBweGEtc3NwLWRhaS48Tj4gaXMgYSAxLTEgbWF0Y2ggdG8KICBzc3AuPE4+LCBhbmQg dGhlIGNoYW5uZWxzIGFyZSBlaXRoZXIgInJ4IiBvciAidHgiLgoKLSBmb3IgZGV2aWNlIHRyZWUg cGxhdGZvcm1zLCB0aGUgZG1hIG5vZGUgc2hvdWxkIGJlIGhvb2tlZCBpbnRvIHRoZQogIHB4YTJ4 eC1hYzk3IG9yIHB4YS1zc3AtZGFpIG5vZGUuCgpTaWduZWQtb2ZmLWJ5OiBSb2JlcnQgSmFyem1p ayA8cm9iZXJ0LmphcnptaWtAZnJlZS5mcj4KQWNrZWQtYnk6IERhbmllbCBNYWNrIDxkYW5pZWxA em9ucXVlLm9yZz4KLS0tCiBhcmNoL2FybS9wbGF0LXB4YS9zc3AuYyAgICB8IDQ3IC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBpbmNsdWRlL2xpbnV4L3B4YTJ4eF9zc3Au aCB8ICAyIC0tCiBzb3VuZC9zb2MvcHhhL3B4YS1zc3AuYyAgICB8ICA1ICsrLS0KIDMgZmlsZXMg Y2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCA1MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9h cmNoL2FybS9wbGF0LXB4YS9zc3AuYyBiL2FyY2gvYXJtL3BsYXQtcHhhL3NzcC5jCmluZGV4IGJh MTNmNzkzZmJjZS4uZWQzNmRjYWI4MGYxIDEwMDY0NAotLS0gYS9hcmNoL2FybS9wbGF0LXB4YS9z c3AuYworKysgYi9hcmNoL2FybS9wbGF0LXB4YS9zc3AuYwpAQCAtMTI3LDUzICsxMjcsNiBAQCBz dGF0aWMgaW50IHB4YV9zc3BfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAlp ZiAoSVNfRVJSKHNzcC0+Y2xrKSkKIAkJcmV0dXJuIFBUUl9FUlIoc3NwLT5jbGspOwogCi0JaWYg KGRldi0+b2Zfbm9kZSkgewotCQlzdHJ1Y3Qgb2ZfcGhhbmRsZV9hcmdzIGRtYV9zcGVjOwotCQlz dHJ1Y3QgZGV2aWNlX25vZGUgKm5wID0gZGV2LT5vZl9ub2RlOwotCQlpbnQgcmV0OwotCi0JCS8q Ci0JCSAqIEZJWE1FOiB3ZSBzaG91bGQgYWxsb2NhdGUgdGhlIERNQSBjaGFubmVsIGZyb20gdGhp cwotCQkgKiBjb250ZXh0IGFuZCBwYXNzIHRoZSBjaGFubmVsIGRvd24gdG8gdGhlIHNzcCB1c2Vy cy4KLQkJICogRm9yIG5vdywgd2UgbG9va3VwIHRoZSByeCBhbmQgdHggaW5kaWNlcyBtYW51YWxs eQotCQkgKi8KLQotCQkvKiByeCAqLwotCQlyZXQgPSBvZl9wYXJzZV9waGFuZGxlX3dpdGhfYXJn cyhucCwgImRtYXMiLCAiI2RtYS1jZWxscyIsCi0JCQkJCQkgMCwgJmRtYV9zcGVjKTsKLQotCQlp ZiAocmV0KSB7Ci0JCQlkZXZfZXJyKGRldiwgIkNhbid0IHBhcnNlIGRtYXMgcHJvcGVydHlcbiIp OwotCQkJcmV0dXJuIC1FTk9ERVY7Ci0JCX0KLQkJc3NwLT5kcmNtcl9yeCA9IGRtYV9zcGVjLmFy Z3NbMF07Ci0JCW9mX25vZGVfcHV0KGRtYV9zcGVjLm5wKTsKLQotCQkvKiB0eCAqLwotCQlyZXQg PSBvZl9wYXJzZV9waGFuZGxlX3dpdGhfYXJncyhucCwgImRtYXMiLCAiI2RtYS1jZWxscyIsCi0J CQkJCQkgMSwgJmRtYV9zcGVjKTsKLQkJaWYgKHJldCkgewotCQkJZGV2X2VycihkZXYsICJDYW4n dCBwYXJzZSBkbWFzIHByb3BlcnR5XG4iKTsKLQkJCXJldHVybiAtRU5PREVWOwotCQl9Ci0JCXNz cC0+ZHJjbXJfdHggPSBkbWFfc3BlYy5hcmdzWzBdOwotCQlvZl9ub2RlX3B1dChkbWFfc3BlYy5u cCk7Ci0JfSBlbHNlIHsKLQkJcmVzID0gcGxhdGZvcm1fZ2V0X3Jlc291cmNlKHBkZXYsIElPUkVT T1VSQ0VfRE1BLCAwKTsKLQkJaWYgKHJlcyA9PSBOVUxMKSB7Ci0JCQlkZXZfZXJyKGRldiwgIm5v IFNTUCBSWCBEUkNNUiBkZWZpbmVkXG4iKTsKLQkJCXJldHVybiAtRU5PREVWOwotCQl9Ci0JCXNz cC0+ZHJjbXJfcnggPSByZXMtPnN0YXJ0OwotCi0JCXJlcyA9IHBsYXRmb3JtX2dldF9yZXNvdXJj ZShwZGV2LCBJT1JFU09VUkNFX0RNQSwgMSk7Ci0JCWlmIChyZXMgPT0gTlVMTCkgewotCQkJZGV2 X2VycihkZXYsICJubyBTU1AgVFggRFJDTVIgZGVmaW5lZFxuIik7Ci0JCQlyZXR1cm4gLUVOT0RF VjsKLQkJfQotCQlzc3AtPmRyY21yX3R4ID0gcmVzLT5zdGFydDsKLQl9Ci0KIAlyZXMgPSBwbGF0 Zm9ybV9nZXRfcmVzb3VyY2UocGRldiwgSU9SRVNPVVJDRV9NRU0sIDApOwogCWlmIChyZXMgPT0g TlVMTCkgewogCQlkZXZfZXJyKGRldiwgIm5vIG1lbW9yeSByZXNvdXJjZSBkZWZpbmVkXG4iKTsK ZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvcHhhMnh4X3NzcC5oIGIvaW5jbHVkZS9saW51eC9w eGEyeHhfc3NwLmgKaW5kZXggODQ2MWIxOGU0NjA4Li4wM2E3Y2E0NjczNWIgMTAwNjQ0Ci0tLSBh L2luY2x1ZGUvbGludXgvcHhhMnh4X3NzcC5oCisrKyBiL2luY2x1ZGUvbGludXgvcHhhMnh4X3Nz cC5oCkBAIC0yMTIsOCArMjEyLDYgQEAgc3RydWN0IHNzcF9kZXZpY2UgewogCWludAkJdHlwZTsK IAlpbnQJCXVzZV9jb3VudDsKIAlpbnQJCWlycTsKLQlpbnQJCWRyY21yX3J4OwotCWludAkJZHJj bXJfdHg7CiAKIAlzdHJ1Y3QgZGV2aWNlX25vZGUJKm9mX25vZGU7CiB9OwpkaWZmIC0tZ2l0IGEv c291bmQvc29jL3B4YS9weGEtc3NwLmMgYi9zb3VuZC9zb2MvcHhhL3B4YS1zc3AuYwppbmRleCA2 ZmM5ODYwODAxMzAuLjBiNDQxMzM4YmRkNCAxMDA2NDQKLS0tIGEvc291bmQvc29jL3B4YS9weGEt c3NwLmMKKysrIGIvc291bmQvc29jL3B4YS9weGEtc3NwLmMKQEAgLTEwNSw5ICsxMDUsOCBAQCBz dGF0aWMgaW50IHB4YV9zc3Bfc3RhcnR1cChzdHJ1Y3Qgc25kX3BjbV9zdWJzdHJlYW0gKnN1YnN0 cmVhbSwKIAlkbWEgPSBremFsbG9jKHNpemVvZihzdHJ1Y3Qgc25kX2RtYWVuZ2luZV9kYWlfZG1h X2RhdGEpLCBHRlBfS0VSTkVMKTsKIAlpZiAoIWRtYSkKIAkJcmV0dXJuIC1FTk9NRU07Ci0KLQlk bWEtPmZpbHRlcl9kYXRhID0gc3Vic3RyZWFtLT5zdHJlYW0gPT0gU05EUlZfUENNX1NUUkVBTV9Q TEFZQkFDSyA/Ci0JCQkJJnNzcC0+ZHJjbXJfdHggOiAmc3NwLT5kcmNtcl9yeDsKKwlkbWEtPmNo YW5fbmFtZSA9IHN1YnN0cmVhbS0+c3RyZWFtID09IFNORFJWX1BDTV9TVFJFQU1fUExBWUJBQ0sg PworCQkidHgiIDogInJ4IjsKIAogCXNuZF9zb2NfZGFpX3NldF9kbWFfZGF0YShjcHVfZGFpLCBz dWJzdHJlYW0sIGRtYSk7CiAK