From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [PATCH 1/5] mfd: twl-core: make driver DT only Date: Tue, 3 Jan 2017 15:00:40 +0000 Message-ID: <20170103150040.GG2977@dell> References: <20161126181326.14951-1-Nicolae_Rosia@mentor.com> <20161126181326.14951-2-Nicolae_Rosia@mentor.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20161126181326.14951-2-Nicolae_Rosia@mentor.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Nicolae Rosia Cc: Mark Rutland , devicetree@vger.kernel.org, Baruch Siach , Tony Lindgren , Liam Girdwood , Rob Herring , linux-kernel@vger.kernel.org, Paul Gortmaker , Mark Brown , Graeme Gregory , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: linux-omap@vger.kernel.org T24gU2F0LCAyNiBOb3YgMjAxNiwgTmljb2xhZSBSb3NpYSB3cm90ZToKCj4gQWxsIHVzZXJzIGFy ZSBEVC1vbmx5IGFuZCBpdCBtYWtlcyBubyBzZW5zZSB0byBrZWVwCj4gdW51c2VkIGNvZGUKPiAK PiBTaWduZWQtb2ZmLWJ5OiBOaWNvbGFlIFJvc2lhIDxOaWNvbGFlX1Jvc2lhQG1lbnRvci5jb20+ Cj4gLS0tCj4gIGRyaXZlcnMvbWZkL0tjb25maWcgICAgfCAgIDEgKwo+ICBkcml2ZXJzL21mZC90 d2wtY29yZS5jIHwgMzk5ICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KPiAgMiBmaWxlcyBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDM5MiBkZWxldGlv bnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tZmQvS2NvbmZpZyBiL2RyaXZlcnMvbWZk L0tjb25maWcKPiBpbmRleCBjNmRmNjQ0Li5jMTgwZjhiIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMv bWZkL0tjb25maWcKPiArKysgYi9kcml2ZXJzL21mZC9LY29uZmlnCj4gQEAgLTEzMzMsNiArMTMz Myw3IEBAIGNvbmZpZyBNRkRfVFBTODAwMzEKPiAgY29uZmlnIFRXTDQwMzBfQ09SRQo+ICAJYm9v bCAiVEkgVFdMNDAzMC9UV0w1MDMwL1RXTDYwMzAvVFBTNjU5eDAgU3VwcG9ydCIKPiAgCWRlcGVu ZHMgb24gSTJDPXkKPiArCWRlcGVuZHMgb24gT0YKPiAgCXNlbGVjdCBJUlFfRE9NQUlOCj4gIAlz ZWxlY3QgUkVHTUFQX0kyQwo+ICAJaGVscAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL21mZC90d2wt Y29yZS5jIGIvZHJpdmVycy9tZmQvdHdsLWNvcmUuYwo+IGluZGV4IGM2NDYxNWQuLjQ4YjA2Njgg MTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9tZmQvdHdsLWNvcmUuYwo+ICsrKyBiL2RyaXZlcnMvbWZk L3R3bC1jb3JlLmMKPiBAQCAtMTMsNiArMTMsOSBAQAo+ICAgKiBDb2RlIGNsZWFudXAgYW5kIG1v ZGlmaWNhdGlvbnMgdG8gSVJRIGhhbmRsZXIuCj4gICAqIGJ5IHN5ZWQga2hhc2ltIDx4MGtoYXNp bUB0aS5jb20+Cj4gICAqCj4gKyAqIENvZGUgY2xlYW51cCBhbmQgbW9kaWZpY2F0aW9uczoKPiAr ICogQ29weXJpZ2h0IChDKSAyMDE2IE5pY29sYWUgUm9zaWEgPG5pY29sYWUucm9zaWFAZ21haWwu Y29tPgoKVGhpcyBoZWFkZXIgY29tbWVudCBpcyBub3QgYSBjaGFuZ2Vsb2cuICBUaGVyZSBpcyBu byBuZWVkIGZvciBldmVyeW9uZQp3aG8gbWFrZXMgYSBjaGFuZ2UgdG8gYWRvcHQgY29weXJpZ2h0 LiAgUmVtb3ZpbmcgIURUIHN1cHBvcnQgaXMgYSBiaWcKY2hhbmdlIHJlZ2FyZHMgdG8gbGluZSBk aWZmLCBidXQgaXQncyBub3QgYSByZS13cml0ZS4KCkFwYXJ0IGZyb20gdGhhdCwgcGF0Y2ggbG9v a3MgZ29vZC4KCkZvciBteSBvd24gcmVmZXJlbmNlOgogIEFja2VkLWZvci1NRkQtYnk6IExlZSBK b25lcyA8bGVlLmpvbmVzQGxpbmFyby5vcmc+Cgo+ICAgKiBUaGlzIHByb2dyYW0gaXMgZnJlZSBz b2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeQo+ICAgKiBpdCB1 bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxp c2hlZCBieQo+ICAgKiB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIgdmVyc2lv biAyIG9mIHRoZSBMaWNlbnNlLCBvcgo+IEBAIC02MDQsMzc2ICs2MDcsNiBAQCBpbnQgdHdsX2dl dF9oZmNsa19yYXRlKHZvaWQpCj4gIH0KPiAgRVhQT1JUX1NZTUJPTF9HUEwodHdsX2dldF9oZmNs a19yYXRlKTsKPiAgCj4gLXN0YXRpYyBzdHJ1Y3QgZGV2aWNlICoKPiAtYWRkX251bWJlcmVkX2No aWxkKHVuc2lnbmVkIG1vZF9ubywgY29uc3QgY2hhciAqbmFtZSwgaW50IG51bSwKPiAtCQl2b2lk ICpwZGF0YSwgdW5zaWduZWQgcGRhdGFfbGVuLAo+IC0JCWJvb2wgY2FuX3dha2V1cCwgaW50IGly cTAsIGludCBpcnExKQo+IC17Cj4gLQlzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlCSpwZGV2Owo+IC0J c3RydWN0IHR3bF9jbGllbnQJKnR3bDsKPiAtCWludAkJCXN0YXR1cywgc2lkOwo+IC0KPiAtCWlm ICh1bmxpa2VseShtb2Rfbm8gPj0gdHdsX2dldF9sYXN0X21vZHVsZSgpKSkgewo+IC0JCXByX2Vy cigiJXM6IGludmFsaWQgbW9kdWxlIG51bWJlciAlZFxuIiwgRFJJVkVSX05BTUUsIG1vZF9ubyk7 Cj4gLQkJcmV0dXJuIEVSUl9QVFIoLUVQRVJNKTsKPiAtCX0KPiAtCXNpZCA9IHR3bF9wcml2LT50 d2xfbWFwW21vZF9ub10uc2lkOwo+IC0JdHdsID0gJnR3bF9wcml2LT50d2xfbW9kdWxlc1tzaWRd Owo+IC0KPiAtCXBkZXYgPSBwbGF0Zm9ybV9kZXZpY2VfYWxsb2MobmFtZSwgbnVtKTsKPiAtCWlm ICghcGRldikKPiAtCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKPiAtCj4gLQlwZGV2LT5kZXYu cGFyZW50ID0gJnR3bC0+Y2xpZW50LT5kZXY7Cj4gLQo+IC0JaWYgKHBkYXRhKSB7Cj4gLQkJc3Rh dHVzID0gcGxhdGZvcm1fZGV2aWNlX2FkZF9kYXRhKHBkZXYsIHBkYXRhLCBwZGF0YV9sZW4pOwo+ IC0JCWlmIChzdGF0dXMgPCAwKSB7Cj4gLQkJCWRldl9kYmcoJnBkZXYtPmRldiwgImNhbid0IGFk ZCBwbGF0Zm9ybV9kYXRhXG4iKTsKPiAtCQkJZ290byBwdXRfZGV2aWNlOwo+IC0JCX0KPiAtCX0K PiAtCj4gLQlpZiAoaXJxMCkgewo+IC0JCXN0cnVjdCByZXNvdXJjZSByWzJdID0gewo+IC0JCQl7 IC5zdGFydCA9IGlycTAsIC5mbGFncyA9IElPUkVTT1VSQ0VfSVJRLCB9LAo+IC0JCQl7IC5zdGFy dCA9IGlycTEsIC5mbGFncyA9IElPUkVTT1VSQ0VfSVJRLCB9LAo+IC0JCX07Cj4gLQo+IC0JCXN0 YXR1cyA9IHBsYXRmb3JtX2RldmljZV9hZGRfcmVzb3VyY2VzKHBkZXYsIHIsIGlycTEgPyAyIDog MSk7Cj4gLQkJaWYgKHN0YXR1cyA8IDApIHsKPiAtCQkJZGV2X2RiZygmcGRldi0+ZGV2LCAiY2Fu J3QgYWRkIGlycXNcbiIpOwo+IC0JCQlnb3RvIHB1dF9kZXZpY2U7Cj4gLQkJfQo+IC0JfQo+IC0K PiAtCXN0YXR1cyA9IHBsYXRmb3JtX2RldmljZV9hZGQocGRldik7Cj4gLQlpZiAoc3RhdHVzKQo+ IC0JCWdvdG8gcHV0X2RldmljZTsKPiAtCj4gLQlkZXZpY2VfaW5pdF93YWtldXAoJnBkZXYtPmRl diwgY2FuX3dha2V1cCk7Cj4gLQo+IC0JcmV0dXJuICZwZGV2LT5kZXY7Cj4gLQo+IC1wdXRfZGV2 aWNlOgo+IC0JcGxhdGZvcm1fZGV2aWNlX3B1dChwZGV2KTsKPiAtCWRldl9lcnIoJnR3bC0+Y2xp ZW50LT5kZXYsICJmYWlsZWQgdG8gYWRkIGRldmljZSAlc1xuIiwgbmFtZSk7Cj4gLQlyZXR1cm4g RVJSX1BUUihzdGF0dXMpOwo+IC19Cj4gLQo+IC1zdGF0aWMgaW5saW5lIHN0cnVjdCBkZXZpY2Ug KmFkZF9jaGlsZCh1bnNpZ25lZCBtb2Rfbm8sIGNvbnN0IGNoYXIgKm5hbWUsCj4gLQkJdm9pZCAq cGRhdGEsIHVuc2lnbmVkIHBkYXRhX2xlbiwKPiAtCQlib29sIGNhbl93YWtldXAsIGludCBpcnEw LCBpbnQgaXJxMSkKPiAtewo+IC0JcmV0dXJuIGFkZF9udW1iZXJlZF9jaGlsZChtb2Rfbm8sIG5h bWUsIC0xLCBwZGF0YSwgcGRhdGFfbGVuLAo+IC0JCWNhbl93YWtldXAsIGlycTAsIGlycTEpOwo+ IC19Cj4gLQo+IC1zdGF0aWMgc3RydWN0IGRldmljZSAqCj4gLWFkZF9yZWd1bGF0b3JfbGlua2Vk KGludCBudW0sIHN0cnVjdCByZWd1bGF0b3JfaW5pdF9kYXRhICpwZGF0YSwKPiAtCQlzdHJ1Y3Qg cmVndWxhdG9yX2NvbnN1bWVyX3N1cHBseSAqY29uc3VtZXJzLAo+IC0JCXVuc2lnbmVkIG51bV9j b25zdW1lcnMsIHVuc2lnbmVkIGxvbmcgZmVhdHVyZXMpCj4gLXsKPiAtCXN0cnVjdCB0d2xfcmVn dWxhdG9yX2RyaXZlcl9kYXRhIGRydl9kYXRhOwo+IC0KPiAtCS8qIHJlZ3VsYXRvciBmcmFtZXdv cmsgZGVtYW5kcyBpbml0X2RhdGEgLi4uICovCj4gLQlpZiAoIXBkYXRhKQo+IC0JCXJldHVybiBO VUxMOwo+IC0KPiAtCWlmIChjb25zdW1lcnMpIHsKPiAtCQlwZGF0YS0+Y29uc3VtZXJfc3VwcGxp ZXMgPSBjb25zdW1lcnM7Cj4gLQkJcGRhdGEtPm51bV9jb25zdW1lcl9zdXBwbGllcyA9IG51bV9j b25zdW1lcnM7Cj4gLQl9Cj4gLQo+IC0JaWYgKHBkYXRhLT5kcml2ZXJfZGF0YSkgewo+IC0JCS8q IElmIHdlIGhhdmUgZXhpc3RpbmcgZHJ2X2RhdGEsIGp1c3QgYWRkIHRoZSBmbGFncyAqLwo+IC0J CXN0cnVjdCB0d2xfcmVndWxhdG9yX2RyaXZlcl9kYXRhICp0bXA7Cj4gLQkJdG1wID0gcGRhdGEt PmRyaXZlcl9kYXRhOwo+IC0JCXRtcC0+ZmVhdHVyZXMgfD0gZmVhdHVyZXM7Cj4gLQl9IGVsc2Ug ewo+IC0JCS8qIGFkZCBuZXcgZHJpdmVyIGRhdGEgc3RydWN0LCB1c2VkIG9ubHkgZHVyaW5nIGlu aXQgKi8KPiAtCQlkcnZfZGF0YS5mZWF0dXJlcyA9IGZlYXR1cmVzOwo+IC0JCWRydl9kYXRhLnNl dF92b2x0YWdlID0gTlVMTDsKPiAtCQlkcnZfZGF0YS5nZXRfdm9sdGFnZSA9IE5VTEw7Cj4gLQkJ ZHJ2X2RhdGEuZGF0YSA9IE5VTEw7Cj4gLQkJcGRhdGEtPmRyaXZlcl9kYXRhID0gJmRydl9kYXRh Owo+IC0JfQo+IC0KPiAtCS8qIE5PVEU6ICB3ZSBjdXJyZW50bHkgaWdub3JlIHJlZ3VsYXRvciBJ UlFzLCBlLmcuIGZvciBzaG9ydCBjaXJjdWl0cyAqLwo+IC0JcmV0dXJuIGFkZF9udW1iZXJlZF9j aGlsZChUV0xfTU9EVUxFX1BNX01BU1RFUiwgInR3bF9yZWciLCBudW0sCj4gLQkJcGRhdGEsIHNp emVvZigqcGRhdGEpLCBmYWxzZSwgMCwgMCk7Cj4gLX0KPiAtCj4gLXN0YXRpYyBzdHJ1Y3QgZGV2 aWNlICoKPiAtYWRkX3JlZ3VsYXRvcihpbnQgbnVtLCBzdHJ1Y3QgcmVndWxhdG9yX2luaXRfZGF0 YSAqcGRhdGEsCj4gLQkJdW5zaWduZWQgbG9uZyBmZWF0dXJlcykKPiAtewo+IC0JcmV0dXJuIGFk ZF9yZWd1bGF0b3JfbGlua2VkKG51bSwgcGRhdGEsIE5VTEwsIDAsIGZlYXR1cmVzKTsKPiAtfQo+ IC0KPiAtLyoKPiAtICogTk9URTogIFdlIGtub3cgdGhlIGZpcnN0IDggSVJRcyBhZnRlciBwZGF0 YS0+YmFzZV9pcnEgYXJlCj4gLSAqIGZvciB0aGUgUElILCBhbmQgdGhlIG5leHQgYXJlIGZvciB0 aGUgUFdSX0lOVCBTSUgsIHNpbmNlCj4gLSAqIHRoYXQncyBob3cgdHdsX2luaXRfaXJxKCkgc2V0 cyB0aGluZ3MgdXAuCj4gLSAqLwo+IC0KPiAtc3RhdGljIGludAo+IC1hZGRfY2hpbGRyZW4oc3Ry dWN0IHR3bDQwMzBfcGxhdGZvcm1fZGF0YSAqcGRhdGEsIHVuc2lnbmVkIGlycV9iYXNlLAo+IC0J CXVuc2lnbmVkIGxvbmcgZmVhdHVyZXMpCj4gLXsKPiAtCXN0cnVjdCBkZXZpY2UJKmNoaWxkOwo+ IC0KPiAtCWlmIChJU19FTkFCTEVEKENPTkZJR19HUElPX1RXTDQwMzApICYmIHBkYXRhLT5ncGlv KSB7Cj4gLQkJY2hpbGQgPSBhZGRfY2hpbGQoVFdMNDAzMF9NT0RVTEVfR1BJTywgInR3bDQwMzBf Z3BpbyIsCj4gLQkJCQlwZGF0YS0+Z3Bpbywgc2l6ZW9mKCpwZGF0YS0+Z3BpbyksCj4gLQkJCQlm YWxzZSwgaXJxX2Jhc2UgKyBHUElPX0lOVFJfT0ZGU0VULCAwKTsKPiAtCQlpZiAoSVNfRVJSKGNo aWxkKSkKPiAtCQkJcmV0dXJuIFBUUl9FUlIoY2hpbGQpOwo+IC0JfQo+IC0KPiAtCWlmIChJU19F TkFCTEVEKENPTkZJR19LRVlCT0FSRF9UV0w0MDMwKSAmJiBwZGF0YS0+a2V5cGFkKSB7Cj4gLQkJ Y2hpbGQgPSBhZGRfY2hpbGQoVFdMNDAzMF9NT0RVTEVfS0VZUEFELCAidHdsNDAzMF9rZXlwYWQi LAo+IC0JCQkJcGRhdGEtPmtleXBhZCwgc2l6ZW9mKCpwZGF0YS0+a2V5cGFkKSwKPiAtCQkJCXRy dWUsIGlycV9iYXNlICsgS0VZUEFEX0lOVFJfT0ZGU0VULCAwKTsKPiAtCQlpZiAoSVNfRVJSKGNo aWxkKSkKPiAtCQkJcmV0dXJuIFBUUl9FUlIoY2hpbGQpOwo+IC0JfQo+IC0KPiAtCWlmIChJU19F TkFCTEVEKENPTkZJR19UV0w0MDMwX01BREMpICYmIHBkYXRhLT5tYWRjICYmCj4gLQkgICAgdHds X2NsYXNzX2lzXzQwMzAoKSkgewo+IC0JCWNoaWxkID0gYWRkX2NoaWxkKFRXTDQwMzBfTU9EVUxF X01BREMsICJ0d2w0MDMwX21hZGMiLAo+IC0JCQkJcGRhdGEtPm1hZGMsIHNpemVvZigqcGRhdGEt Pm1hZGMpLAo+IC0JCQkJdHJ1ZSwgaXJxX2Jhc2UgKyBNQURDX0lOVFJfT0ZGU0VULCAwKTsKPiAt CQlpZiAoSVNfRVJSKGNoaWxkKSkKPiAtCQkJcmV0dXJuIFBUUl9FUlIoY2hpbGQpOwo+IC0JfQo+ IC0KPiAtCWlmIChJU19FTkFCTEVEKENPTkZJR19SVENfRFJWX1RXTDQwMzApKSB7Cj4gLQkJLyoK PiAtCQkgKiBSRVZJU0lUIHBsYXRmb3JtX2RhdGEgaGVyZSBjdXJyZW50bHkgbWlnaHQgZXhwb3Nl IHRoZQo+IC0JCSAqICJtc2VjdXJlIiBsaW5lIC4uLiBidXQgZm9yIG5vdyB3ZSBqdXN0IGV4cGVj dCBib2FyZAo+IC0JCSAqIHNldHVwIHRvIHRlbGwgdGhlIGNoaXAgIml0J3MgYWx3YXlzIG9rIHRv IFNFVF9USU1FIi4KPiAtCQkgKiBFdmVudHVhbGx5LCBMaW51eCBtaWdodCBiZWNvbWUgbW9yZSBh d2FyZSBvZiBzdWNoCj4gLQkJICogSFcgc2VjdXJpdHkgY29uY2VybnMsIGFuZCAibGVhc3QgcHJp dmlsZWdlIi4KPiAtCQkgKi8KPiAtCQljaGlsZCA9IGFkZF9jaGlsZChUV0xfTU9EVUxFX1JUQywg InR3bF9ydGMiLCBOVUxMLCAwLAo+IC0JCQkJdHJ1ZSwgaXJxX2Jhc2UgKyBSVENfSU5UUl9PRkZT RVQsIDApOwo+IC0JCWlmIChJU19FUlIoY2hpbGQpKQo+IC0JCQlyZXR1cm4gUFRSX0VSUihjaGls ZCk7Cj4gLQl9Cj4gLQo+IC0JaWYgKElTX0VOQUJMRUQoQ09ORklHX1BXTV9UV0wpKSB7Cj4gLQkJ Y2hpbGQgPSBhZGRfY2hpbGQoVFdMX01PRFVMRV9QV00sICJ0d2wtcHdtIiwgTlVMTCwgMCwKPiAt CQkJCSAgZmFsc2UsIDAsIDApOwo+IC0JCWlmIChJU19FUlIoY2hpbGQpKQo+IC0JCQlyZXR1cm4g UFRSX0VSUihjaGlsZCk7Cj4gLQl9Cj4gLQo+IC0JaWYgKElTX0VOQUJMRUQoQ09ORklHX1BXTV9U V0xfTEVEKSkgewo+IC0JCWNoaWxkID0gYWRkX2NoaWxkKFRXTF9NT0RVTEVfTEVELCAidHdsLXB3 bWxlZCIsIE5VTEwsIDAsCj4gLQkJCQkgIGZhbHNlLCAwLCAwKTsKPiAtCQlpZiAoSVNfRVJSKGNo aWxkKSkKPiAtCQkJcmV0dXJuIFBUUl9FUlIoY2hpbGQpOwo+IC0JfQo+IC0KPiAtCWlmIChJU19F TkFCTEVEKENPTkZJR19UV0w0MDMwX1VTQikgJiYgcGRhdGEtPnVzYiAmJgo+IC0JICAgIHR3bF9j bGFzc19pc180MDMwKCkpIHsKPiAtCj4gLQkJc3RhdGljIHN0cnVjdCByZWd1bGF0b3JfY29uc3Vt ZXJfc3VwcGx5IHVzYjF2NSA9IHsKPiAtCQkJLnN1cHBseSA9CSJ1c2IxdjUiLAo+IC0JCX07Cj4g LQkJc3RhdGljIHN0cnVjdCByZWd1bGF0b3JfY29uc3VtZXJfc3VwcGx5IHVzYjF2OCA9IHsKPiAt CQkJLnN1cHBseSA9CSJ1c2IxdjgiLAo+IC0JCX07Cj4gLQkJc3RhdGljIHN0cnVjdCByZWd1bGF0 b3JfY29uc3VtZXJfc3VwcGx5IHVzYjN2MSA9IHsKPiAtCQkJLnN1cHBseSA9CSJ1c2IzdjEiLAo+ IC0JCX07Cj4gLQo+IC0JLyogRmlyc3QgYWRkIHRoZSByZWd1bGF0b3JzIHNvIHRoYXQgdGhleSBj YW4gYmUgdXNlZCBieSB0cmFuc2NlaXZlciAqLwo+IC0JCWlmIChJU19FTkFCTEVEKENPTkZJR19S RUdVTEFUT1JfVFdMNDAzMCkpIHsKPiAtCQkJLyogdGhpcyBpcyBhIHRlbXBsYXRlIHRoYXQgZ2V0 cyBjb3BpZWQgKi8KPiAtCQkJc3RydWN0IHJlZ3VsYXRvcl9pbml0X2RhdGEgdXNiX2ZpeGVkID0g ewo+IC0JCQkJLmNvbnN0cmFpbnRzLnZhbGlkX21vZGVzX21hc2sgPQo+IC0JCQkJCVJFR1VMQVRP Ul9NT0RFX05PUk1BTAo+IC0JCQkJCXwgUkVHVUxBVE9SX01PREVfU1RBTkRCWSwKPiAtCQkJCS5j b25zdHJhaW50cy52YWxpZF9vcHNfbWFzayA9Cj4gLQkJCQkJUkVHVUxBVE9SX0NIQU5HRV9NT0RF Cj4gLQkJCQkJfCBSRUdVTEFUT1JfQ0hBTkdFX1NUQVRVUywKPiAtCQkJfTsKPiAtCj4gLQkJCWNo aWxkID0gYWRkX3JlZ3VsYXRvcl9saW5rZWQoVFdMNDAzMF9SRUdfVlVTQjFWNSwKPiAtCQkJCQkJ ICAgICAgJnVzYl9maXhlZCwgJnVzYjF2NSwgMSwKPiAtCQkJCQkJICAgICAgZmVhdHVyZXMpOwo+ IC0JCQlpZiAoSVNfRVJSKGNoaWxkKSkKPiAtCQkJCXJldHVybiBQVFJfRVJSKGNoaWxkKTsKPiAt Cj4gLQkJCWNoaWxkID0gYWRkX3JlZ3VsYXRvcl9saW5rZWQoVFdMNDAzMF9SRUdfVlVTQjFWOCwK PiAtCQkJCQkJICAgICAgJnVzYl9maXhlZCwgJnVzYjF2OCwgMSwKPiAtCQkJCQkJICAgICAgZmVh dHVyZXMpOwo+IC0JCQlpZiAoSVNfRVJSKGNoaWxkKSkKPiAtCQkJCXJldHVybiBQVFJfRVJSKGNo aWxkKTsKPiAtCj4gLQkJCWNoaWxkID0gYWRkX3JlZ3VsYXRvcl9saW5rZWQoVFdMNDAzMF9SRUdf VlVTQjNWMSwKPiAtCQkJCQkJICAgICAgJnVzYl9maXhlZCwgJnVzYjN2MSwgMSwKPiAtCQkJCQkJ ICAgICAgZmVhdHVyZXMpOwo+IC0JCQlpZiAoSVNfRVJSKGNoaWxkKSkKPiAtCQkJCXJldHVybiBQ VFJfRVJSKGNoaWxkKTsKPiAtCj4gLQkJfQo+IC0KPiAtCQljaGlsZCA9IGFkZF9jaGlsZChUV0xf TU9EVUxFX1VTQiwgInR3bDQwMzBfdXNiIiwKPiAtCQkJCXBkYXRhLT51c2IsIHNpemVvZigqcGRh dGEtPnVzYiksIHRydWUsCj4gLQkJCQkvKiBpcnEwID0gVVNCX1BSRVMsIGlycTEgPSBVU0IgKi8K PiAtCQkJCWlycV9iYXNlICsgVVNCX1BSRVNfSU5UUl9PRkZTRVQsCj4gLQkJCQlpcnFfYmFzZSAr IFVTQl9JTlRSX09GRlNFVCk7Cj4gLQo+IC0JCWlmIChJU19FUlIoY2hpbGQpKQo+IC0JCQlyZXR1 cm4gUFRSX0VSUihjaGlsZCk7Cj4gLQo+IC0JCS8qIHdlIG5lZWQgdG8gY29ubmVjdCByZWd1bGF0 b3JzIHRvIHRoaXMgdHJhbnNjZWl2ZXIgKi8KPiAtCQlpZiAoSVNfRU5BQkxFRChDT05GSUdfUkVH VUxBVE9SX1RXTDQwMzApICYmIGNoaWxkKSB7Cj4gLQkJCXVzYjF2NS5kZXZfbmFtZSA9IGRldl9u YW1lKGNoaWxkKTsKPiAtCQkJdXNiMXY4LmRldl9uYW1lID0gZGV2X25hbWUoY2hpbGQpOwo+IC0J CQl1c2IzdjEuZGV2X25hbWUgPSBkZXZfbmFtZShjaGlsZCk7Cj4gLQkJfQo+IC0JfQo+IC0KPiAt CWlmIChJU19FTkFCTEVEKENPTkZJR19UV0w0MDMwX1dBVENIRE9HKSAmJiB0d2xfY2xhc3NfaXNf NDAzMCgpKSB7Cj4gLQkJY2hpbGQgPSBhZGRfY2hpbGQoVFdMX01PRFVMRV9QTV9SRUNFSVZFUiwg InR3bDQwMzBfd2R0IiwgTlVMTCwKPiAtCQkJCSAgMCwgZmFsc2UsIDAsIDApOwo+IC0JCWlmIChJ U19FUlIoY2hpbGQpKQo+IC0JCQlyZXR1cm4gUFRSX0VSUihjaGlsZCk7Cj4gLQl9Cj4gLQo+IC0J aWYgKElTX0VOQUJMRUQoQ09ORklHX0lOUFVUX1RXTDQwMzBfUFdSQlVUVE9OKSAmJiB0d2xfY2xh c3NfaXNfNDAzMCgpKSB7Cj4gLQkJY2hpbGQgPSBhZGRfY2hpbGQoVFdMX01PRFVMRV9QTV9NQVNU RVIsICJ0d2w0MDMwX3B3cmJ1dHRvbiIsCj4gLQkJCQkgIE5VTEwsIDAsIHRydWUsIGlycV9iYXNl ICsgOCArIDAsIDApOwo+IC0JCWlmIChJU19FUlIoY2hpbGQpKQo+IC0JCQlyZXR1cm4gUFRSX0VS UihjaGlsZCk7Cj4gLQl9Cj4gLQo+IC0JaWYgKElTX0VOQUJMRUQoQ09ORklHX01GRF9UV0w0MDMw X0FVRElPKSAmJiBwZGF0YS0+YXVkaW8gJiYKPiAtCSAgICB0d2xfY2xhc3NfaXNfNDAzMCgpKSB7 Cj4gLQkJY2hpbGQgPSBhZGRfY2hpbGQoVFdMNDAzMF9NT0RVTEVfQVVESU9fVk9JQ0UsICJ0d2w0 MDMwLWF1ZGlvIiwKPiAtCQkJCXBkYXRhLT5hdWRpbywgc2l6ZW9mKCpwZGF0YS0+YXVkaW8pLAo+ IC0JCQkJZmFsc2UsIDAsIDApOwo+IC0JCWlmIChJU19FUlIoY2hpbGQpKQo+IC0JCQlyZXR1cm4g UFRSX0VSUihjaGlsZCk7Cj4gLQl9Cj4gLQo+IC0JLyogdHdsNDAzMCByZWd1bGF0b3JzICovCj4g LQlpZiAoSVNfRU5BQkxFRChDT05GSUdfUkVHVUxBVE9SX1RXTDQwMzApICYmIHR3bF9jbGFzc19p c180MDMwKCkpIHsKPiAtCQljaGlsZCA9IGFkZF9yZWd1bGF0b3IoVFdMNDAzMF9SRUdfVlBMTDEs IHBkYXRhLT52cGxsMSwKPiAtCQkJCQlmZWF0dXJlcyk7Cj4gLQkJaWYgKElTX0VSUihjaGlsZCkp Cj4gLQkJCXJldHVybiBQVFJfRVJSKGNoaWxkKTsKPiAtCj4gLQkJY2hpbGQgPSBhZGRfcmVndWxh dG9yKFRXTDQwMzBfUkVHX1ZJTywgcGRhdGEtPnZpbywKPiAtCQkJCQlmZWF0dXJlcyk7Cj4gLQkJ aWYgKElTX0VSUihjaGlsZCkpCj4gLQkJCXJldHVybiBQVFJfRVJSKGNoaWxkKTsKPiAtCj4gLQkJ Y2hpbGQgPSBhZGRfcmVndWxhdG9yKFRXTDQwMzBfUkVHX1ZERDEsIHBkYXRhLT52ZGQxLAo+IC0J CQkJCWZlYXR1cmVzKTsKPiAtCQlpZiAoSVNfRVJSKGNoaWxkKSkKPiAtCQkJcmV0dXJuIFBUUl9F UlIoY2hpbGQpOwo+IC0KPiAtCQljaGlsZCA9IGFkZF9yZWd1bGF0b3IoVFdMNDAzMF9SRUdfVkRE MiwgcGRhdGEtPnZkZDIsCj4gLQkJCQkJZmVhdHVyZXMpOwo+IC0JCWlmIChJU19FUlIoY2hpbGQp KQo+IC0JCQlyZXR1cm4gUFRSX0VSUihjaGlsZCk7Cj4gLQo+IC0JCWNoaWxkID0gYWRkX3JlZ3Vs YXRvcihUV0w0MDMwX1JFR19WTU1DMSwgcGRhdGEtPnZtbWMxLAo+IC0JCQkJCWZlYXR1cmVzKTsK PiAtCQlpZiAoSVNfRVJSKGNoaWxkKSkKPiAtCQkJcmV0dXJuIFBUUl9FUlIoY2hpbGQpOwo+IC0K PiAtCQljaGlsZCA9IGFkZF9yZWd1bGF0b3IoVFdMNDAzMF9SRUdfVkRBQywgcGRhdGEtPnZkYWMs Cj4gLQkJCQkJZmVhdHVyZXMpOwo+IC0JCWlmIChJU19FUlIoY2hpbGQpKQo+IC0JCQlyZXR1cm4g UFRSX0VSUihjaGlsZCk7Cj4gLQo+IC0JCWNoaWxkID0gYWRkX3JlZ3VsYXRvcigoZmVhdHVyZXMg JiBUV0w0MDMwX1ZBVVgyKQo+IC0JCQkJCT8gVFdMNDAzMF9SRUdfVkFVWDJfNDAzMAo+IC0JCQkJ CTogVFdMNDAzMF9SRUdfVkFVWDIsCj4gLQkJCQlwZGF0YS0+dmF1eDIsIGZlYXR1cmVzKTsKPiAt CQlpZiAoSVNfRVJSKGNoaWxkKSkKPiAtCQkJcmV0dXJuIFBUUl9FUlIoY2hpbGQpOwo+IC0KPiAt CQljaGlsZCA9IGFkZF9yZWd1bGF0b3IoVFdMNDAzMF9SRUdfVklOVEFOQTEsIHBkYXRhLT52aW50 YW5hMSwKPiAtCQkJCQlmZWF0dXJlcyk7Cj4gLQkJaWYgKElTX0VSUihjaGlsZCkpCj4gLQkJCXJl dHVybiBQVFJfRVJSKGNoaWxkKTsKPiAtCj4gLQkJY2hpbGQgPSBhZGRfcmVndWxhdG9yKFRXTDQw MzBfUkVHX1ZJTlRBTkEyLCBwZGF0YS0+dmludGFuYTIsCj4gLQkJCQkJZmVhdHVyZXMpOwo+IC0J CWlmIChJU19FUlIoY2hpbGQpKQo+IC0JCQlyZXR1cm4gUFRSX0VSUihjaGlsZCk7Cj4gLQo+IC0J CWNoaWxkID0gYWRkX3JlZ3VsYXRvcihUV0w0MDMwX1JFR19WSU5URElHLCBwZGF0YS0+dmludGRp ZywKPiAtCQkJCQlmZWF0dXJlcyk7Cj4gLQkJaWYgKElTX0VSUihjaGlsZCkpCj4gLQkJCXJldHVy biBQVFJfRVJSKGNoaWxkKTsKPiAtCX0KPiAtCj4gLQkvKiBtYXliZSBhZGQgTERPcyB0aGF0IGFy ZSBvbWl0dGVkIG9uIGNvc3QtcmVkdWNlZCBwYXJ0cyAqLwo+IC0JaWYgKElTX0VOQUJMRUQoQ09O RklHX1JFR1VMQVRPUl9UV0w0MDMwKSAmJiAhKGZlYXR1cmVzICYgVFBTX1NVQlNFVCkKPiAtCSAg JiYgdHdsX2NsYXNzX2lzXzQwMzAoKSkgewo+IC0JCWNoaWxkID0gYWRkX3JlZ3VsYXRvcihUV0w0 MDMwX1JFR19WUExMMiwgcGRhdGEtPnZwbGwyLAo+IC0JCQkJCWZlYXR1cmVzKTsKPiAtCQlpZiAo SVNfRVJSKGNoaWxkKSkKPiAtCQkJcmV0dXJuIFBUUl9FUlIoY2hpbGQpOwo+IC0KPiAtCQljaGls ZCA9IGFkZF9yZWd1bGF0b3IoVFdMNDAzMF9SRUdfVk1NQzIsIHBkYXRhLT52bW1jMiwKPiAtCQkJ CQlmZWF0dXJlcyk7Cj4gLQkJaWYgKElTX0VSUihjaGlsZCkpCj4gLQkJCXJldHVybiBQVFJfRVJS KGNoaWxkKTsKPiAtCj4gLQkJY2hpbGQgPSBhZGRfcmVndWxhdG9yKFRXTDQwMzBfUkVHX1ZTSU0s IHBkYXRhLT52c2ltLAo+IC0JCQkJCWZlYXR1cmVzKTsKPiAtCQlpZiAoSVNfRVJSKGNoaWxkKSkK PiAtCQkJcmV0dXJuIFBUUl9FUlIoY2hpbGQpOwo+IC0KPiAtCQljaGlsZCA9IGFkZF9yZWd1bGF0 b3IoVFdMNDAzMF9SRUdfVkFVWDEsIHBkYXRhLT52YXV4MSwKPiAtCQkJCQlmZWF0dXJlcyk7Cj4g LQkJaWYgKElTX0VSUihjaGlsZCkpCj4gLQkJCXJldHVybiBQVFJfRVJSKGNoaWxkKTsKPiAtCj4g LQkJY2hpbGQgPSBhZGRfcmVndWxhdG9yKFRXTDQwMzBfUkVHX1ZBVVgzLCBwZGF0YS0+dmF1eDMs Cj4gLQkJCQkJZmVhdHVyZXMpOwo+IC0JCWlmIChJU19FUlIoY2hpbGQpKQo+IC0JCQlyZXR1cm4g UFRSX0VSUihjaGlsZCk7Cj4gLQo+IC0JCWNoaWxkID0gYWRkX3JlZ3VsYXRvcihUV0w0MDMwX1JF R19WQVVYNCwgcGRhdGEtPnZhdXg0LAo+IC0JCQkJCWZlYXR1cmVzKTsKPiAtCQlpZiAoSVNfRVJS KGNoaWxkKSkKPiAtCQkJcmV0dXJuIFBUUl9FUlIoY2hpbGQpOwo+IC0JfQo+IC0KPiAtCWlmIChJ U19FTkFCTEVEKENPTkZJR19DSEFSR0VSX1RXTDQwMzApICYmIHBkYXRhLT5iY2kgJiYKPiAtCQkJ IShmZWF0dXJlcyAmIChUUFNfU1VCU0VUIHwgVFdMNTAzMSkpKSB7Cj4gLQkJY2hpbGQgPSBhZGRf Y2hpbGQoVFdMX01PRFVMRV9NQUlOX0NIQVJHRSwgInR3bDQwMzBfYmNpIiwKPiAtCQkJCXBkYXRh LT5iY2ksIHNpemVvZigqcGRhdGEtPmJjaSksIGZhbHNlLAo+IC0JCQkJLyogaXJxMCA9IENIR19Q UkVTLCBpcnExID0gQkNJICovCj4gLQkJCQlpcnFfYmFzZSArIEJDSV9QUkVTX0lOVFJfT0ZGU0VU LAo+IC0JCQkJaXJxX2Jhc2UgKyBCQ0lfSU5UUl9PRkZTRVQpOwo+IC0JCWlmIChJU19FUlIoY2hp bGQpKQo+IC0JCQlyZXR1cm4gUFRSX0VSUihjaGlsZCk7Cj4gLQl9Cj4gLQo+IC0JaWYgKElTX0VO QUJMRUQoQ09ORklHX1RXTDQwMzBfUE9XRVIpICYmIHBkYXRhLT5wb3dlcikgewo+IC0JCWNoaWxk ID0gYWRkX2NoaWxkKFRXTF9NT0RVTEVfUE1fTUFTVEVSLCAidHdsNDAzMF9wb3dlciIsCj4gLQkJ CQkgIHBkYXRhLT5wb3dlciwgc2l6ZW9mKCpwZGF0YS0+cG93ZXIpLCBmYWxzZSwKPiAtCQkJCSAg MCwgMCk7Cj4gLQkJaWYgKElTX0VSUihjaGlsZCkpCj4gLQkJCXJldHVybiBQVFJfRVJSKGNoaWxk KTsKPiAtCX0KPiAtCj4gLQlyZXR1cm4gMDsKPiAtfQo+IC0KPiAtLyotLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKi8K PiAtCj4gIC8qCj4gICAqIFRoZXNlIHRocmVlIGZ1bmN0aW9ucyBpbml0aWFsaXplIHRoZSBvbi1j aGlwIGNsb2NrIGZyYW1ld29yaywKPiAgICogbGV0dGluZyBpdCBnZW5lcmF0ZSB0aGUgcmlnaHQg ZnJlcXVlbmNpZXMgZm9yIFVTQiwgTUFEQywgYW5kCj4gQEAgLTEwMDAsOCArNjMzLDcgQEAgc3Rh dGljIGlubGluZSBpbnQgX19pbml0IHVucHJvdGVjdF9wbV9tYXN0ZXIodm9pZCkKPiAgCXJldHVy biBlOwo+ICB9Cj4gIAo+IC1zdGF0aWMgdm9pZCBjbG9ja3NfaW5pdChzdHJ1Y3QgZGV2aWNlICpk ZXYsCj4gLQkJCXN0cnVjdCB0d2w0MDMwX2Nsb2NrX2luaXRfZGF0YSAqY2xvY2spCj4gK3N0YXRp YyB2b2lkIGNsb2Nrc19pbml0KHN0cnVjdCBkZXZpY2UgKmRldikKPiAgewo+ICAJaW50IGUgPSAw Owo+ICAJc3RydWN0IGNsayAqb3NjOwo+IEBAIC0xMDMxLDggKzY2Myw2IEBAIHN0YXRpYyB2b2lk IGNsb2Nrc19pbml0KHN0cnVjdCBkZXZpY2UgKmRldiwKPiAgCX0KPiAgCj4gIAljdHJsIHw9IEhJ R0hfUEVSRl9TUTsKPiAtCWlmIChjbG9jayAmJiBjbG9jay0+Y2szMmtfbG93cHdyX2VuYWJsZSkK PiAtCQljdHJsIHw9IENLMzJLX0xPV1BXUl9FTjsKPiAgCj4gIAllIHw9IHVucHJvdGVjdF9wbV9t YXN0ZXIoKTsKPiAgCS8qIGVmZmVjdC0+TUFEQytVU0IgY2sgZW4gKi8KPiBAQCAtMTA3MSwxNiAr NzAxLDEwIEBAIHN0YXRpYyBpbnQgdHdsX3JlbW92ZShzdHJ1Y3QgaTJjX2NsaWVudCAqY2xpZW50 KQo+ICAJcmV0dXJuIDA7Cj4gIH0KPiAgCj4gLXN0YXRpYyBzdHJ1Y3Qgb2ZfZGV2X2F1eGRhdGEg dHdsX2F1eGRhdGFfbG9va3VwW10gPSB7Cj4gLQlPRl9ERVZfQVVYREFUQSgidGksdHdsNDAzMC1n cGlvIiwgMCwgInR3bDQwMzAtZ3BpbyIsIE5VTEwpLAo+IC0JeyAvKiBzZW50aW5lbCAqLyB9LAo+ IC19Owo+IC0KPiAgLyogTk9URTogVGhpcyBkcml2ZXIgb25seSBoYW5kbGVzIGEgc2luZ2xlIHR3 bDQwMzAvdHBzNjU5eDAgY2hpcCAqLwo+ICBzdGF0aWMgaW50Cj4gIHR3bF9wcm9iZShzdHJ1Y3Qg aTJjX2NsaWVudCAqY2xpZW50LCBjb25zdCBzdHJ1Y3QgaTJjX2RldmljZV9pZCAqaWQpCj4gIHsK PiAtCXN0cnVjdCB0d2w0MDMwX3BsYXRmb3JtX2RhdGEJKnBkYXRhID0gZGV2X2dldF9wbGF0ZGF0 YSgmY2xpZW50LT5kZXYpOwo+ICAJc3RydWN0IGRldmljZV9ub2RlCQkqbm9kZSA9IGNsaWVudC0+ ZGV2Lm9mX25vZGU7Cj4gIAlzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlCQkqcGRldjsKPiAgCWNvbnN0 IHN0cnVjdCByZWdtYXBfY29uZmlnCSp0d2xfcmVnbWFwX2NvbmZpZzsKPiBAQCAtMTA4OCw4ICs3 MTIsOCBAQCB0d2xfcHJvYmUoc3RydWN0IGkyY19jbGllbnQgKmNsaWVudCwgY29uc3Qgc3RydWN0 IGkyY19kZXZpY2VfaWQgKmlkKQo+ICAJaW50CQkJCXN0YXR1czsKPiAgCXVuc2lnbmVkCQkJaSwg bnVtX3NsYXZlczsKPiAgCj4gLQlpZiAoIW5vZGUgJiYgIXBkYXRhKSB7Cj4gLQkJZGV2X2Vycigm Y2xpZW50LT5kZXYsICJubyBwbGF0Zm9ybSBkYXRhXG4iKTsKPiArCWlmICghbm9kZSkgewo+ICsJ CWRldl9lcnIoJmNsaWVudC0+ZGV2LCAibm8gRFQgaW5mb1xuIik7Cj4gIAkJcmV0dXJuIC1FSU5W QUw7Cj4gIAl9Cj4gIAo+IEBAIC0xMTc3LDcgKzgwMSw3IEBAIHR3bF9wcm9iZShzdHJ1Y3QgaTJj X2NsaWVudCAqY2xpZW50LCBjb25zdCBzdHJ1Y3QgaTJjX2RldmljZV9pZCAqaWQpCj4gIAl0d2xf cHJpdi0+cmVhZHkgPSB0cnVlOwo+ICAKPiAgCS8qIHNldHVwIGNsb2NrIGZyYW1ld29yayAqLwo+ IC0JY2xvY2tzX2luaXQoJnBkZXYtPmRldiwgcGRhdGEgPyBwZGF0YS0+Y2xvY2sgOiBOVUxMKTsK PiArCWNsb2Nrc19pbml0KCZwZGV2LT5kZXYpOwo+ICAKPiAgCS8qIHJlYWQgVFdMIElEQ09ERSBS ZWdpc3RlciAqLwo+ICAJaWYgKHR3bF9jbGFzc19pc180MDMwKCkpIHsKPiBAQCAtMTIyNSwxNSAr ODQ5LDYgQEAgdHdsX3Byb2JlKHN0cnVjdCBpMmNfY2xpZW50ICpjbGllbnQsIGNvbnN0IHN0cnVj dCBpMmNfZGV2aWNlX2lkICppZCkKPiAgCQkJCSBUV0w0MDMwX0RDRENfR0xPQkFMX0NGRyk7Cj4g IAl9Cj4gIAo+IC0JaWYgKG5vZGUpIHsKPiAtCQlpZiAocGRhdGEpCj4gLQkJCXR3bF9hdXhkYXRh X2xvb2t1cFswXS5wbGF0Zm9ybV9kYXRhID0gcGRhdGEtPmdwaW87Cj4gLQkJc3RhdHVzID0gb2Zf cGxhdGZvcm1fcG9wdWxhdGUobm9kZSwgTlVMTCwgdHdsX2F1eGRhdGFfbG9va3VwLAo+IC0JCQkJ CSAgICAgICZjbGllbnQtPmRldik7Cj4gLQl9IGVsc2Ugewo+IC0JCXN0YXR1cyA9IGFkZF9jaGls ZHJlbihwZGF0YSwgaXJxX2Jhc2UsIGlkLT5kcml2ZXJfZGF0YSk7Cj4gLQl9Cj4gLQo+ICBmYWls Ogo+ICAJaWYgKHN0YXR1cyA8IDApCj4gIAkJdHdsX3JlbW92ZShjbGllbnQpOwoKLS0gCkxlZSBK b25lcwpMaW5hcm8gU1RNaWNyb2VsZWN0cm9uaWNzIExhbmRpbmcgVGVhbSBMZWFkCkxpbmFyby5v cmcg4pSCIE9wZW4gc291cmNlIHNvZnR3YXJlIGZvciBBUk0gU29DcwpGb2xsb3cgTGluYXJvOiBG YWNlYm9vayB8IFR3aXR0ZXIgfCBCbG9nCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0t a2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFp bG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Tue, 3 Jan 2017 15:00:40 +0000 Subject: [PATCH 1/5] mfd: twl-core: make driver DT only In-Reply-To: <20161126181326.14951-2-Nicolae_Rosia@mentor.com> References: <20161126181326.14951-1-Nicolae_Rosia@mentor.com> <20161126181326.14951-2-Nicolae_Rosia@mentor.com> Message-ID: <20170103150040.GG2977@dell> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Sat, 26 Nov 2016, Nicolae Rosia wrote: > All users are DT-only and it makes no sense to keep > unused code > > Signed-off-by: Nicolae Rosia > --- > drivers/mfd/Kconfig | 1 + > drivers/mfd/twl-core.c | 399 +------------------------------------------------ > 2 files changed, 8 insertions(+), 392 deletions(-) > > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig > index c6df644..c180f8b 100644 > --- a/drivers/mfd/Kconfig > +++ b/drivers/mfd/Kconfig > @@ -1333,6 +1333,7 @@ config MFD_TPS80031 > config TWL4030_CORE > bool "TI TWL4030/TWL5030/TWL6030/TPS659x0 Support" > depends on I2C=y > + depends on OF > select IRQ_DOMAIN > select REGMAP_I2C > help > diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c > index c64615d..48b0668 100644 > --- a/drivers/mfd/twl-core.c > +++ b/drivers/mfd/twl-core.c > @@ -13,6 +13,9 @@ > * Code cleanup and modifications to IRQ handler. > * by syed khasim > * > + * Code cleanup and modifications: > + * Copyright (C) 2016 Nicolae Rosia This header comment is not a changelog. There is no need for everyone who makes a change to adopt copyright. Removing !DT support is a big change regards to line diff, but it's not a re-write. Apart from that, patch looks good. For my own reference: Acked-for-MFD-by: Lee Jones > * 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 > @@ -604,376 +607,6 @@ int twl_get_hfclk_rate(void) > } > EXPORT_SYMBOL_GPL(twl_get_hfclk_rate); > > -static struct device * > -add_numbered_child(unsigned mod_no, const char *name, int num, > - void *pdata, unsigned pdata_len, > - bool can_wakeup, int irq0, int irq1) > -{ > - struct platform_device *pdev; > - struct twl_client *twl; > - int status, sid; > - > - if (unlikely(mod_no >= twl_get_last_module())) { > - pr_err("%s: invalid module number %d\n", DRIVER_NAME, mod_no); > - return ERR_PTR(-EPERM); > - } > - sid = twl_priv->twl_map[mod_no].sid; > - twl = &twl_priv->twl_modules[sid]; > - > - pdev = platform_device_alloc(name, num); > - if (!pdev) > - return ERR_PTR(-ENOMEM); > - > - pdev->dev.parent = &twl->client->dev; > - > - if (pdata) { > - status = platform_device_add_data(pdev, pdata, pdata_len); > - if (status < 0) { > - dev_dbg(&pdev->dev, "can't add platform_data\n"); > - goto put_device; > - } > - } > - > - if (irq0) { > - struct resource r[2] = { > - { .start = irq0, .flags = IORESOURCE_IRQ, }, > - { .start = irq1, .flags = IORESOURCE_IRQ, }, > - }; > - > - status = platform_device_add_resources(pdev, r, irq1 ? 2 : 1); > - if (status < 0) { > - dev_dbg(&pdev->dev, "can't add irqs\n"); > - goto put_device; > - } > - } > - > - status = platform_device_add(pdev); > - if (status) > - goto put_device; > - > - device_init_wakeup(&pdev->dev, can_wakeup); > - > - return &pdev->dev; > - > -put_device: > - platform_device_put(pdev); > - dev_err(&twl->client->dev, "failed to add device %s\n", name); > - return ERR_PTR(status); > -} > - > -static inline struct device *add_child(unsigned mod_no, const char *name, > - void *pdata, unsigned pdata_len, > - bool can_wakeup, int irq0, int irq1) > -{ > - return add_numbered_child(mod_no, name, -1, pdata, pdata_len, > - can_wakeup, irq0, irq1); > -} > - > -static struct device * > -add_regulator_linked(int num, struct regulator_init_data *pdata, > - struct regulator_consumer_supply *consumers, > - unsigned num_consumers, unsigned long features) > -{ > - struct twl_regulator_driver_data drv_data; > - > - /* regulator framework demands init_data ... */ > - if (!pdata) > - return NULL; > - > - if (consumers) { > - pdata->consumer_supplies = consumers; > - pdata->num_consumer_supplies = num_consumers; > - } > - > - if (pdata->driver_data) { > - /* If we have existing drv_data, just add the flags */ > - struct twl_regulator_driver_data *tmp; > - tmp = pdata->driver_data; > - tmp->features |= features; > - } else { > - /* add new driver data struct, used only during init */ > - drv_data.features = features; > - drv_data.set_voltage = NULL; > - drv_data.get_voltage = NULL; > - drv_data.data = NULL; > - pdata->driver_data = &drv_data; > - } > - > - /* NOTE: we currently ignore regulator IRQs, e.g. for short circuits */ > - return add_numbered_child(TWL_MODULE_PM_MASTER, "twl_reg", num, > - pdata, sizeof(*pdata), false, 0, 0); > -} > - > -static struct device * > -add_regulator(int num, struct regulator_init_data *pdata, > - unsigned long features) > -{ > - return add_regulator_linked(num, pdata, NULL, 0, features); > -} > - > -/* > - * NOTE: We know the first 8 IRQs after pdata->base_irq are > - * for the PIH, and the next are for the PWR_INT SIH, since > - * that's how twl_init_irq() sets things up. > - */ > - > -static int > -add_children(struct twl4030_platform_data *pdata, unsigned irq_base, > - unsigned long features) > -{ > - struct device *child; > - > - if (IS_ENABLED(CONFIG_GPIO_TWL4030) && pdata->gpio) { > - child = add_child(TWL4030_MODULE_GPIO, "twl4030_gpio", > - pdata->gpio, sizeof(*pdata->gpio), > - false, irq_base + GPIO_INTR_OFFSET, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_KEYBOARD_TWL4030) && pdata->keypad) { > - child = add_child(TWL4030_MODULE_KEYPAD, "twl4030_keypad", > - pdata->keypad, sizeof(*pdata->keypad), > - true, irq_base + KEYPAD_INTR_OFFSET, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_TWL4030_MADC) && pdata->madc && > - twl_class_is_4030()) { > - child = add_child(TWL4030_MODULE_MADC, "twl4030_madc", > - pdata->madc, sizeof(*pdata->madc), > - true, irq_base + MADC_INTR_OFFSET, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_RTC_DRV_TWL4030)) { > - /* > - * REVISIT platform_data here currently might expose the > - * "msecure" line ... but for now we just expect board > - * setup to tell the chip "it's always ok to SET_TIME". > - * Eventually, Linux might become more aware of such > - * HW security concerns, and "least privilege". > - */ > - child = add_child(TWL_MODULE_RTC, "twl_rtc", NULL, 0, > - true, irq_base + RTC_INTR_OFFSET, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_PWM_TWL)) { > - child = add_child(TWL_MODULE_PWM, "twl-pwm", NULL, 0, > - false, 0, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_PWM_TWL_LED)) { > - child = add_child(TWL_MODULE_LED, "twl-pwmled", NULL, 0, > - false, 0, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_TWL4030_USB) && pdata->usb && > - twl_class_is_4030()) { > - > - static struct regulator_consumer_supply usb1v5 = { > - .supply = "usb1v5", > - }; > - static struct regulator_consumer_supply usb1v8 = { > - .supply = "usb1v8", > - }; > - static struct regulator_consumer_supply usb3v1 = { > - .supply = "usb3v1", > - }; > - > - /* First add the regulators so that they can be used by transceiver */ > - if (IS_ENABLED(CONFIG_REGULATOR_TWL4030)) { > - /* this is a template that gets copied */ > - struct regulator_init_data usb_fixed = { > - .constraints.valid_modes_mask = > - REGULATOR_MODE_NORMAL > - | REGULATOR_MODE_STANDBY, > - .constraints.valid_ops_mask = > - REGULATOR_CHANGE_MODE > - | REGULATOR_CHANGE_STATUS, > - }; > - > - child = add_regulator_linked(TWL4030_REG_VUSB1V5, > - &usb_fixed, &usb1v5, 1, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator_linked(TWL4030_REG_VUSB1V8, > - &usb_fixed, &usb1v8, 1, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator_linked(TWL4030_REG_VUSB3V1, > - &usb_fixed, &usb3v1, 1, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - } > - > - child = add_child(TWL_MODULE_USB, "twl4030_usb", > - pdata->usb, sizeof(*pdata->usb), true, > - /* irq0 = USB_PRES, irq1 = USB */ > - irq_base + USB_PRES_INTR_OFFSET, > - irq_base + USB_INTR_OFFSET); > - > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - /* we need to connect regulators to this transceiver */ > - if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && child) { > - usb1v5.dev_name = dev_name(child); > - usb1v8.dev_name = dev_name(child); > - usb3v1.dev_name = dev_name(child); > - } > - } > - > - if (IS_ENABLED(CONFIG_TWL4030_WATCHDOG) && twl_class_is_4030()) { > - child = add_child(TWL_MODULE_PM_RECEIVER, "twl4030_wdt", NULL, > - 0, false, 0, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_INPUT_TWL4030_PWRBUTTON) && twl_class_is_4030()) { > - child = add_child(TWL_MODULE_PM_MASTER, "twl4030_pwrbutton", > - NULL, 0, true, irq_base + 8 + 0, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_MFD_TWL4030_AUDIO) && pdata->audio && > - twl_class_is_4030()) { > - child = add_child(TWL4030_MODULE_AUDIO_VOICE, "twl4030-audio", > - pdata->audio, sizeof(*pdata->audio), > - false, 0, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - /* twl4030 regulators */ > - if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && twl_class_is_4030()) { > - child = add_regulator(TWL4030_REG_VPLL1, pdata->vpll1, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VIO, pdata->vio, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VDD1, pdata->vdd1, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VDD2, pdata->vdd2, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VMMC1, pdata->vmmc1, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VDAC, pdata->vdac, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator((features & TWL4030_VAUX2) > - ? TWL4030_REG_VAUX2_4030 > - : TWL4030_REG_VAUX2, > - pdata->vaux2, features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VINTANA1, pdata->vintana1, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VINTANA2, pdata->vintana2, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VINTDIG, pdata->vintdig, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - /* maybe add LDOs that are omitted on cost-reduced parts */ > - if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && !(features & TPS_SUBSET) > - && twl_class_is_4030()) { > - child = add_regulator(TWL4030_REG_VPLL2, pdata->vpll2, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VMMC2, pdata->vmmc2, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VSIM, pdata->vsim, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VAUX1, pdata->vaux1, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VAUX3, pdata->vaux3, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VAUX4, pdata->vaux4, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_CHARGER_TWL4030) && pdata->bci && > - !(features & (TPS_SUBSET | TWL5031))) { > - child = add_child(TWL_MODULE_MAIN_CHARGE, "twl4030_bci", > - pdata->bci, sizeof(*pdata->bci), false, > - /* irq0 = CHG_PRES, irq1 = BCI */ > - irq_base + BCI_PRES_INTR_OFFSET, > - irq_base + BCI_INTR_OFFSET); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_TWL4030_POWER) && pdata->power) { > - child = add_child(TWL_MODULE_PM_MASTER, "twl4030_power", > - pdata->power, sizeof(*pdata->power), false, > - 0, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - return 0; > -} > - > -/*----------------------------------------------------------------------*/ > - > /* > * These three functions initialize the on-chip clock framework, > * letting it generate the right frequencies for USB, MADC, and > @@ -1000,8 +633,7 @@ static inline int __init unprotect_pm_master(void) > return e; > } > > -static void clocks_init(struct device *dev, > - struct twl4030_clock_init_data *clock) > +static void clocks_init(struct device *dev) > { > int e = 0; > struct clk *osc; > @@ -1031,8 +663,6 @@ static void clocks_init(struct device *dev, > } > > ctrl |= HIGH_PERF_SQ; > - if (clock && clock->ck32k_lowpwr_enable) > - ctrl |= CK32K_LOWPWR_EN; > > e |= unprotect_pm_master(); > /* effect->MADC+USB ck en */ > @@ -1071,16 +701,10 @@ static int twl_remove(struct i2c_client *client) > return 0; > } > > -static struct of_dev_auxdata twl_auxdata_lookup[] = { > - OF_DEV_AUXDATA("ti,twl4030-gpio", 0, "twl4030-gpio", NULL), > - { /* sentinel */ }, > -}; > - > /* NOTE: This driver only handles a single twl4030/tps659x0 chip */ > static int > twl_probe(struct i2c_client *client, const struct i2c_device_id *id) > { > - struct twl4030_platform_data *pdata = dev_get_platdata(&client->dev); > struct device_node *node = client->dev.of_node; > struct platform_device *pdev; > const struct regmap_config *twl_regmap_config; > @@ -1088,8 +712,8 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id) > int status; > unsigned i, num_slaves; > > - if (!node && !pdata) { > - dev_err(&client->dev, "no platform data\n"); > + if (!node) { > + dev_err(&client->dev, "no DT info\n"); > return -EINVAL; > } > > @@ -1177,7 +801,7 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id) > twl_priv->ready = true; > > /* setup clock framework */ > - clocks_init(&pdev->dev, pdata ? pdata->clock : NULL); > + clocks_init(&pdev->dev); > > /* read TWL IDCODE Register */ > if (twl_class_is_4030()) { > @@ -1225,15 +849,6 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id) > TWL4030_DCDC_GLOBAL_CFG); > } > > - if (node) { > - if (pdata) > - twl_auxdata_lookup[0].platform_data = pdata->gpio; > - status = of_platform_populate(node, NULL, twl_auxdata_lookup, > - &client->dev); > - } else { > - status = add_children(pdata, irq_base, id->driver_data); > - } > - > fail: > if (status < 0) > twl_remove(client); -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935435AbdACO55 (ORCPT ); Tue, 3 Jan 2017 09:57:57 -0500 Received: from mail-wm0-f45.google.com ([74.125.82.45]:35401 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935399AbdACO5A (ORCPT ); Tue, 3 Jan 2017 09:57:00 -0500 Date: Tue, 3 Jan 2017 15:00:40 +0000 From: Lee Jones To: Nicolae Rosia Cc: Mark Brown , Rob Herring , Mark Rutland , Tony Lindgren , Liam Girdwood , Paul Gortmaker , Graeme Gregory , Baruch Siach , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: Re: [PATCH 1/5] mfd: twl-core: make driver DT only Message-ID: <20170103150040.GG2977@dell> References: <20161126181326.14951-1-Nicolae_Rosia@mentor.com> <20161126181326.14951-2-Nicolae_Rosia@mentor.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20161126181326.14951-2-Nicolae_Rosia@mentor.com> User-Agent: Mutt/1.6.2 (2016-07-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 26 Nov 2016, Nicolae Rosia wrote: > All users are DT-only and it makes no sense to keep > unused code > > Signed-off-by: Nicolae Rosia > --- > drivers/mfd/Kconfig | 1 + > drivers/mfd/twl-core.c | 399 +------------------------------------------------ > 2 files changed, 8 insertions(+), 392 deletions(-) > > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig > index c6df644..c180f8b 100644 > --- a/drivers/mfd/Kconfig > +++ b/drivers/mfd/Kconfig > @@ -1333,6 +1333,7 @@ config MFD_TPS80031 > config TWL4030_CORE > bool "TI TWL4030/TWL5030/TWL6030/TPS659x0 Support" > depends on I2C=y > + depends on OF > select IRQ_DOMAIN > select REGMAP_I2C > help > diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c > index c64615d..48b0668 100644 > --- a/drivers/mfd/twl-core.c > +++ b/drivers/mfd/twl-core.c > @@ -13,6 +13,9 @@ > * Code cleanup and modifications to IRQ handler. > * by syed khasim > * > + * Code cleanup and modifications: > + * Copyright (C) 2016 Nicolae Rosia This header comment is not a changelog. There is no need for everyone who makes a change to adopt copyright. Removing !DT support is a big change regards to line diff, but it's not a re-write. Apart from that, patch looks good. For my own reference: Acked-for-MFD-by: Lee Jones > * 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 > @@ -604,376 +607,6 @@ int twl_get_hfclk_rate(void) > } > EXPORT_SYMBOL_GPL(twl_get_hfclk_rate); > > -static struct device * > -add_numbered_child(unsigned mod_no, const char *name, int num, > - void *pdata, unsigned pdata_len, > - bool can_wakeup, int irq0, int irq1) > -{ > - struct platform_device *pdev; > - struct twl_client *twl; > - int status, sid; > - > - if (unlikely(mod_no >= twl_get_last_module())) { > - pr_err("%s: invalid module number %d\n", DRIVER_NAME, mod_no); > - return ERR_PTR(-EPERM); > - } > - sid = twl_priv->twl_map[mod_no].sid; > - twl = &twl_priv->twl_modules[sid]; > - > - pdev = platform_device_alloc(name, num); > - if (!pdev) > - return ERR_PTR(-ENOMEM); > - > - pdev->dev.parent = &twl->client->dev; > - > - if (pdata) { > - status = platform_device_add_data(pdev, pdata, pdata_len); > - if (status < 0) { > - dev_dbg(&pdev->dev, "can't add platform_data\n"); > - goto put_device; > - } > - } > - > - if (irq0) { > - struct resource r[2] = { > - { .start = irq0, .flags = IORESOURCE_IRQ, }, > - { .start = irq1, .flags = IORESOURCE_IRQ, }, > - }; > - > - status = platform_device_add_resources(pdev, r, irq1 ? 2 : 1); > - if (status < 0) { > - dev_dbg(&pdev->dev, "can't add irqs\n"); > - goto put_device; > - } > - } > - > - status = platform_device_add(pdev); > - if (status) > - goto put_device; > - > - device_init_wakeup(&pdev->dev, can_wakeup); > - > - return &pdev->dev; > - > -put_device: > - platform_device_put(pdev); > - dev_err(&twl->client->dev, "failed to add device %s\n", name); > - return ERR_PTR(status); > -} > - > -static inline struct device *add_child(unsigned mod_no, const char *name, > - void *pdata, unsigned pdata_len, > - bool can_wakeup, int irq0, int irq1) > -{ > - return add_numbered_child(mod_no, name, -1, pdata, pdata_len, > - can_wakeup, irq0, irq1); > -} > - > -static struct device * > -add_regulator_linked(int num, struct regulator_init_data *pdata, > - struct regulator_consumer_supply *consumers, > - unsigned num_consumers, unsigned long features) > -{ > - struct twl_regulator_driver_data drv_data; > - > - /* regulator framework demands init_data ... */ > - if (!pdata) > - return NULL; > - > - if (consumers) { > - pdata->consumer_supplies = consumers; > - pdata->num_consumer_supplies = num_consumers; > - } > - > - if (pdata->driver_data) { > - /* If we have existing drv_data, just add the flags */ > - struct twl_regulator_driver_data *tmp; > - tmp = pdata->driver_data; > - tmp->features |= features; > - } else { > - /* add new driver data struct, used only during init */ > - drv_data.features = features; > - drv_data.set_voltage = NULL; > - drv_data.get_voltage = NULL; > - drv_data.data = NULL; > - pdata->driver_data = &drv_data; > - } > - > - /* NOTE: we currently ignore regulator IRQs, e.g. for short circuits */ > - return add_numbered_child(TWL_MODULE_PM_MASTER, "twl_reg", num, > - pdata, sizeof(*pdata), false, 0, 0); > -} > - > -static struct device * > -add_regulator(int num, struct regulator_init_data *pdata, > - unsigned long features) > -{ > - return add_regulator_linked(num, pdata, NULL, 0, features); > -} > - > -/* > - * NOTE: We know the first 8 IRQs after pdata->base_irq are > - * for the PIH, and the next are for the PWR_INT SIH, since > - * that's how twl_init_irq() sets things up. > - */ > - > -static int > -add_children(struct twl4030_platform_data *pdata, unsigned irq_base, > - unsigned long features) > -{ > - struct device *child; > - > - if (IS_ENABLED(CONFIG_GPIO_TWL4030) && pdata->gpio) { > - child = add_child(TWL4030_MODULE_GPIO, "twl4030_gpio", > - pdata->gpio, sizeof(*pdata->gpio), > - false, irq_base + GPIO_INTR_OFFSET, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_KEYBOARD_TWL4030) && pdata->keypad) { > - child = add_child(TWL4030_MODULE_KEYPAD, "twl4030_keypad", > - pdata->keypad, sizeof(*pdata->keypad), > - true, irq_base + KEYPAD_INTR_OFFSET, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_TWL4030_MADC) && pdata->madc && > - twl_class_is_4030()) { > - child = add_child(TWL4030_MODULE_MADC, "twl4030_madc", > - pdata->madc, sizeof(*pdata->madc), > - true, irq_base + MADC_INTR_OFFSET, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_RTC_DRV_TWL4030)) { > - /* > - * REVISIT platform_data here currently might expose the > - * "msecure" line ... but for now we just expect board > - * setup to tell the chip "it's always ok to SET_TIME". > - * Eventually, Linux might become more aware of such > - * HW security concerns, and "least privilege". > - */ > - child = add_child(TWL_MODULE_RTC, "twl_rtc", NULL, 0, > - true, irq_base + RTC_INTR_OFFSET, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_PWM_TWL)) { > - child = add_child(TWL_MODULE_PWM, "twl-pwm", NULL, 0, > - false, 0, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_PWM_TWL_LED)) { > - child = add_child(TWL_MODULE_LED, "twl-pwmled", NULL, 0, > - false, 0, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_TWL4030_USB) && pdata->usb && > - twl_class_is_4030()) { > - > - static struct regulator_consumer_supply usb1v5 = { > - .supply = "usb1v5", > - }; > - static struct regulator_consumer_supply usb1v8 = { > - .supply = "usb1v8", > - }; > - static struct regulator_consumer_supply usb3v1 = { > - .supply = "usb3v1", > - }; > - > - /* First add the regulators so that they can be used by transceiver */ > - if (IS_ENABLED(CONFIG_REGULATOR_TWL4030)) { > - /* this is a template that gets copied */ > - struct regulator_init_data usb_fixed = { > - .constraints.valid_modes_mask = > - REGULATOR_MODE_NORMAL > - | REGULATOR_MODE_STANDBY, > - .constraints.valid_ops_mask = > - REGULATOR_CHANGE_MODE > - | REGULATOR_CHANGE_STATUS, > - }; > - > - child = add_regulator_linked(TWL4030_REG_VUSB1V5, > - &usb_fixed, &usb1v5, 1, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator_linked(TWL4030_REG_VUSB1V8, > - &usb_fixed, &usb1v8, 1, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator_linked(TWL4030_REG_VUSB3V1, > - &usb_fixed, &usb3v1, 1, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - } > - > - child = add_child(TWL_MODULE_USB, "twl4030_usb", > - pdata->usb, sizeof(*pdata->usb), true, > - /* irq0 = USB_PRES, irq1 = USB */ > - irq_base + USB_PRES_INTR_OFFSET, > - irq_base + USB_INTR_OFFSET); > - > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - /* we need to connect regulators to this transceiver */ > - if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && child) { > - usb1v5.dev_name = dev_name(child); > - usb1v8.dev_name = dev_name(child); > - usb3v1.dev_name = dev_name(child); > - } > - } > - > - if (IS_ENABLED(CONFIG_TWL4030_WATCHDOG) && twl_class_is_4030()) { > - child = add_child(TWL_MODULE_PM_RECEIVER, "twl4030_wdt", NULL, > - 0, false, 0, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_INPUT_TWL4030_PWRBUTTON) && twl_class_is_4030()) { > - child = add_child(TWL_MODULE_PM_MASTER, "twl4030_pwrbutton", > - NULL, 0, true, irq_base + 8 + 0, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_MFD_TWL4030_AUDIO) && pdata->audio && > - twl_class_is_4030()) { > - child = add_child(TWL4030_MODULE_AUDIO_VOICE, "twl4030-audio", > - pdata->audio, sizeof(*pdata->audio), > - false, 0, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - /* twl4030 regulators */ > - if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && twl_class_is_4030()) { > - child = add_regulator(TWL4030_REG_VPLL1, pdata->vpll1, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VIO, pdata->vio, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VDD1, pdata->vdd1, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VDD2, pdata->vdd2, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VMMC1, pdata->vmmc1, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VDAC, pdata->vdac, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator((features & TWL4030_VAUX2) > - ? TWL4030_REG_VAUX2_4030 > - : TWL4030_REG_VAUX2, > - pdata->vaux2, features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VINTANA1, pdata->vintana1, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VINTANA2, pdata->vintana2, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VINTDIG, pdata->vintdig, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - /* maybe add LDOs that are omitted on cost-reduced parts */ > - if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && !(features & TPS_SUBSET) > - && twl_class_is_4030()) { > - child = add_regulator(TWL4030_REG_VPLL2, pdata->vpll2, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VMMC2, pdata->vmmc2, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VSIM, pdata->vsim, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VAUX1, pdata->vaux1, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VAUX3, pdata->vaux3, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - > - child = add_regulator(TWL4030_REG_VAUX4, pdata->vaux4, > - features); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_CHARGER_TWL4030) && pdata->bci && > - !(features & (TPS_SUBSET | TWL5031))) { > - child = add_child(TWL_MODULE_MAIN_CHARGE, "twl4030_bci", > - pdata->bci, sizeof(*pdata->bci), false, > - /* irq0 = CHG_PRES, irq1 = BCI */ > - irq_base + BCI_PRES_INTR_OFFSET, > - irq_base + BCI_INTR_OFFSET); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - if (IS_ENABLED(CONFIG_TWL4030_POWER) && pdata->power) { > - child = add_child(TWL_MODULE_PM_MASTER, "twl4030_power", > - pdata->power, sizeof(*pdata->power), false, > - 0, 0); > - if (IS_ERR(child)) > - return PTR_ERR(child); > - } > - > - return 0; > -} > - > -/*----------------------------------------------------------------------*/ > - > /* > * These three functions initialize the on-chip clock framework, > * letting it generate the right frequencies for USB, MADC, and > @@ -1000,8 +633,7 @@ static inline int __init unprotect_pm_master(void) > return e; > } > > -static void clocks_init(struct device *dev, > - struct twl4030_clock_init_data *clock) > +static void clocks_init(struct device *dev) > { > int e = 0; > struct clk *osc; > @@ -1031,8 +663,6 @@ static void clocks_init(struct device *dev, > } > > ctrl |= HIGH_PERF_SQ; > - if (clock && clock->ck32k_lowpwr_enable) > - ctrl |= CK32K_LOWPWR_EN; > > e |= unprotect_pm_master(); > /* effect->MADC+USB ck en */ > @@ -1071,16 +701,10 @@ static int twl_remove(struct i2c_client *client) > return 0; > } > > -static struct of_dev_auxdata twl_auxdata_lookup[] = { > - OF_DEV_AUXDATA("ti,twl4030-gpio", 0, "twl4030-gpio", NULL), > - { /* sentinel */ }, > -}; > - > /* NOTE: This driver only handles a single twl4030/tps659x0 chip */ > static int > twl_probe(struct i2c_client *client, const struct i2c_device_id *id) > { > - struct twl4030_platform_data *pdata = dev_get_platdata(&client->dev); > struct device_node *node = client->dev.of_node; > struct platform_device *pdev; > const struct regmap_config *twl_regmap_config; > @@ -1088,8 +712,8 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id) > int status; > unsigned i, num_slaves; > > - if (!node && !pdata) { > - dev_err(&client->dev, "no platform data\n"); > + if (!node) { > + dev_err(&client->dev, "no DT info\n"); > return -EINVAL; > } > > @@ -1177,7 +801,7 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id) > twl_priv->ready = true; > > /* setup clock framework */ > - clocks_init(&pdev->dev, pdata ? pdata->clock : NULL); > + clocks_init(&pdev->dev); > > /* read TWL IDCODE Register */ > if (twl_class_is_4030()) { > @@ -1225,15 +849,6 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id) > TWL4030_DCDC_GLOBAL_CFG); > } > > - if (node) { > - if (pdata) > - twl_auxdata_lookup[0].platform_data = pdata->gpio; > - status = of_platform_populate(node, NULL, twl_auxdata_lookup, > - &client->dev); > - } else { > - status = add_children(pdata, irq_base, id->driver_data); > - } > - > fail: > if (status < 0) > twl_remove(client); -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog