From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.codeaurora.org ([198.145.29.96]:42371 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932094AbcILIJo (ORCPT ); Mon, 12 Sep 2016 04:09:44 -0400 Subject: Re: [PATCH v2] drm/bridge: adv7511: add support for the 2nd chip To: Sergei Shtylyov , airlied@linux.ie, dri-devel@lists.freedesktop.org References: <1580212.O1LYdJFM97@wasted.cogentembedded.com> Cc: linux-renesas-soc@vger.kernel.org From: Archit Taneja Message-ID: <57D662C2.9090304@codeaurora.org> Date: Mon, 12 Sep 2016 13:39:38 +0530 MIME-Version: 1.0 In-Reply-To: <1580212.O1LYdJFM97@wasted.cogentembedded.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-renesas-soc-owner@vger.kernel.org List-ID: On 09/06/2016 01:13 AM, Sergei Shtylyov wrote: > The Renesas Wheat board has 2 ADV7513 chips on the same I2C bus, however > the ADV751x driver only supports 1 chip as it tries to assign the packet/ > EDID/CEC memory I2C devices to the fixed I2C addresses. Assign these I2C > addresses at the fixed offsets (derived from the programming guide) from > the main register map address instead... Looks good now. Queued to topic/drm-misc after cleaning up the spacing in the commit message. Thanks, Archit > > Signed-off-by: Sergei Shtylyov > > --- > The patch is against David Airlie's 'linux.git' repo's 'drm-next' branch. > > Changes in version 2: > - added support for ADV7533 CEC alternate address. > > drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 12 ++++++------ > drivers/gpu/drm/bridge/adv7511/adv7533.c | 5 ++--- > 2 files changed, 8 insertions(+), 9 deletions(-) > > Index: linux/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > =================================================================== > --- linux.orig/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > +++ linux/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > @@ -922,15 +922,13 @@ static int adv7511_parse_dt(struct devic > return 0; > } > > -static const int edid_i2c_addr = 0x7e; > -static const int packet_i2c_addr = 0x70; > -static const int cec_i2c_addr = 0x78; > - > static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) > { > struct adv7511_link_config link_config; > struct adv7511 *adv7511; > struct device *dev = &i2c->dev; > + unsigned int main_i2c_addr = i2c->addr << 1; > + unsigned int edid_i2c_addr = main_i2c_addr + 4; > unsigned int val; > int ret; > > @@ -991,8 +989,10 @@ static int adv7511_probe(struct i2c_clie > > regmap_write(adv7511->regmap, ADV7511_REG_EDID_I2C_ADDR, edid_i2c_addr); > regmap_write(adv7511->regmap, ADV7511_REG_PACKET_I2C_ADDR, > - packet_i2c_addr); > - regmap_write(adv7511->regmap, ADV7511_REG_CEC_I2C_ADDR, cec_i2c_addr); > + main_i2c_addr - 0xa); > + regmap_write(adv7511->regmap, ADV7511_REG_CEC_I2C_ADDR, > + main_i2c_addr - 2); > + > adv7511_packet_disable(adv7511, 0xffff); > > adv7511->i2c_main = i2c; > Index: linux/drivers/gpu/drm/bridge/adv7511/adv7533.c > =================================================================== > --- linux.orig/drivers/gpu/drm/bridge/adv7511/adv7533.c > +++ linux/drivers/gpu/drm/bridge/adv7511/adv7533.c > @@ -149,13 +149,12 @@ void adv7533_uninit_cec(struct adv7511 * > i2c_unregister_device(adv->i2c_cec); > } > > -static const int cec_i2c_addr = 0x78; > - > int adv7533_init_cec(struct adv7511 *adv) > { > int ret; > > - adv->i2c_cec = i2c_new_dummy(adv->i2c_main->adapter, cec_i2c_addr >> 1); > + adv->i2c_cec = i2c_new_dummy(adv->i2c_main->adapter, > + adv->i2c_main->addr - 1); > if (!adv->i2c_cec) > return -ENOMEM; > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel > -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project From mboxrd@z Thu Jan 1 00:00:00 1970 From: Archit Taneja Subject: Re: [PATCH v2] drm/bridge: adv7511: add support for the 2nd chip Date: Mon, 12 Sep 2016 13:39:38 +0530 Message-ID: <57D662C2.9090304@codeaurora.org> References: <1580212.O1LYdJFM97@wasted.cogentembedded.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9CB566E382 for ; Mon, 12 Sep 2016 08:09:43 +0000 (UTC) In-Reply-To: <1580212.O1LYdJFM97@wasted.cogentembedded.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Sergei Shtylyov , airlied@linux.ie, dri-devel@lists.freedesktop.org Cc: linux-renesas-soc@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org CgpPbiAwOS8wNi8yMDE2IDAxOjEzIEFNLCBTZXJnZWkgU2h0eWx5b3Ygd3JvdGU6Cj4gVGhlIFJl bmVzYXMgV2hlYXQgYm9hcmQgaGFzIDIgQURWNzUxMyBjaGlwcyBvbiB0aGUgc2FtZSBJMkMgYnVz LCBob3dldmVyCj4gdGhlIEFEVjc1MXggZHJpdmVyIG9ubHkgc3VwcG9ydHMgMSBjaGlwIGFzICBp dCB0cmllcyB0byBhc3NpZ24gdGhlIHBhY2tldC8KPiBFRElEL0NFQyAgbWVtb3J5IEkyQyBkZXZp Y2VzICB0byB0aGUgZml4ZWQgSTJDIGFkZHJlc3Nlcy4gQXNzaWduIHRoZXNlIEkyQwo+IGFkZHJl c3NlcyBhdCB0aGUgZml4ZWQgb2Zmc2V0cyAoZGVyaXZlZCBmcm9tIHRoZSBwcm9ncmFtbWluZyBn dWlkZSkgZnJvbQo+IHRoZSAgbWFpbiByZWdpc3RlciBtYXAgYWRkcmVzcyAgaW5zdGVhZC4uLgoK TG9va3MgZ29vZCBub3cuIFF1ZXVlZCB0byB0b3BpYy9kcm0tbWlzYyBhZnRlciBjbGVhbmluZyB1 cCB0aGUgc3BhY2luZwppbiB0aGUgY29tbWl0IG1lc3NhZ2UuCgpUaGFua3MsCkFyY2hpdAoKPgo+ IFNpZ25lZC1vZmYtYnk6IFNlcmdlaSBTaHR5bHlvdiA8c2VyZ2VpLnNodHlseW92QGNvZ2VudGVt YmVkZGVkLmNvbT4KPgo+IC0tLQo+IFRoZSBwYXRjaCBpcyBhZ2FpbnN0IERhdmlkIEFpcmxpZSdz ICdsaW51eC5naXQnIHJlcG8ncyAnZHJtLW5leHQnIGJyYW5jaC4KPgo+IENoYW5nZXMgaW4gdmVy c2lvbiAyOgo+IC0gYWRkZWQgc3VwcG9ydCBmb3IgQURWNzUzMyBDRUMgYWx0ZXJuYXRlIGFkZHJl c3MuCj4KPiAgIGRyaXZlcnMvZ3B1L2RybS9icmlkZ2UvYWR2NzUxMS9hZHY3NTExX2Rydi5jIHwg ICAxMiArKysrKystLS0tLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9icmlkZ2UvYWR2NzUxMS9hZHY3 NTMzLmMgICAgIHwgICAgNSArKy0tLQo+ICAgMiBmaWxlcyBjaGFuZ2VkLCA4IGluc2VydGlvbnMo KyksIDkgZGVsZXRpb25zKC0pCj4KPiBJbmRleDogbGludXgvZHJpdmVycy9ncHUvZHJtL2JyaWRn ZS9hZHY3NTExL2Fkdjc1MTFfZHJ2LmMKPiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Cj4gLS0tIGxpbnV4Lm9yaWcvZHJp dmVycy9ncHUvZHJtL2JyaWRnZS9hZHY3NTExL2Fkdjc1MTFfZHJ2LmMKPiArKysgbGludXgvZHJp dmVycy9ncHUvZHJtL2JyaWRnZS9hZHY3NTExL2Fkdjc1MTFfZHJ2LmMKPiBAQCAtOTIyLDE1ICs5 MjIsMTMgQEAgc3RhdGljIGludCBhZHY3NTExX3BhcnNlX2R0KHN0cnVjdCBkZXZpYwo+ICAgCXJl dHVybiAwOwo+ICAgfQo+Cj4gLXN0YXRpYyBjb25zdCBpbnQgZWRpZF9pMmNfYWRkciA9IDB4N2U7 Cj4gLXN0YXRpYyBjb25zdCBpbnQgcGFja2V0X2kyY19hZGRyID0gMHg3MDsKPiAtc3RhdGljIGNv bnN0IGludCBjZWNfaTJjX2FkZHIgPSAweDc4Owo+IC0KPiAgIHN0YXRpYyBpbnQgYWR2NzUxMV9w cm9iZShzdHJ1Y3QgaTJjX2NsaWVudCAqaTJjLCBjb25zdCBzdHJ1Y3QgaTJjX2RldmljZV9pZCAq aWQpCj4gICB7Cj4gICAJc3RydWN0IGFkdjc1MTFfbGlua19jb25maWcgbGlua19jb25maWc7Cj4g ICAJc3RydWN0IGFkdjc1MTEgKmFkdjc1MTE7Cj4gICAJc3RydWN0IGRldmljZSAqZGV2ID0gJmky Yy0+ZGV2Owo+ICsJdW5zaWduZWQgaW50IG1haW5faTJjX2FkZHIgPSBpMmMtPmFkZHIgPDwgMTsK PiArCXVuc2lnbmVkIGludCBlZGlkX2kyY19hZGRyID0gbWFpbl9pMmNfYWRkciArIDQ7Cj4gICAJ dW5zaWduZWQgaW50IHZhbDsKPiAgIAlpbnQgcmV0Owo+Cj4gQEAgLTk5MSw4ICs5ODksMTAgQEAg c3RhdGljIGludCBhZHY3NTExX3Byb2JlKHN0cnVjdCBpMmNfY2xpZQo+Cj4gICAJcmVnbWFwX3dy aXRlKGFkdjc1MTEtPnJlZ21hcCwgQURWNzUxMV9SRUdfRURJRF9JMkNfQUREUiwgZWRpZF9pMmNf YWRkcik7Cj4gICAJcmVnbWFwX3dyaXRlKGFkdjc1MTEtPnJlZ21hcCwgQURWNzUxMV9SRUdfUEFD S0VUX0kyQ19BRERSLAo+IC0JCSAgICAgcGFja2V0X2kyY19hZGRyKTsKPiAtCXJlZ21hcF93cml0 ZShhZHY3NTExLT5yZWdtYXAsIEFEVjc1MTFfUkVHX0NFQ19JMkNfQUREUiwgY2VjX2kyY19hZGRy KTsKPiArCQkgICAgIG1haW5faTJjX2FkZHIgLSAweGEpOwo+ICsJcmVnbWFwX3dyaXRlKGFkdjc1 MTEtPnJlZ21hcCwgQURWNzUxMV9SRUdfQ0VDX0kyQ19BRERSLAo+ICsJCSAgICAgbWFpbl9pMmNf YWRkciAtIDIpOwo+ICsKPiAgIAlhZHY3NTExX3BhY2tldF9kaXNhYmxlKGFkdjc1MTEsIDB4ZmZm Zik7Cj4KPiAgIAlhZHY3NTExLT5pMmNfbWFpbiA9IGkyYzsKPiBJbmRleDogbGludXgvZHJpdmVy cy9ncHUvZHJtL2JyaWRnZS9hZHY3NTExL2Fkdjc1MzMuYwo+ID09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KPiAtLS0gbGlu dXgub3JpZy9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL2Fkdjc1MTEvYWR2NzUzMy5jCj4gKysrIGxp bnV4L2RyaXZlcnMvZ3B1L2RybS9icmlkZ2UvYWR2NzUxMS9hZHY3NTMzLmMKPiBAQCAtMTQ5LDEz ICsxNDksMTIgQEAgdm9pZCBhZHY3NTMzX3VuaW5pdF9jZWMoc3RydWN0IGFkdjc1MTEgKgo+ICAg CWkyY191bnJlZ2lzdGVyX2RldmljZShhZHYtPmkyY19jZWMpOwo+ICAgfQo+Cj4gLXN0YXRpYyBj b25zdCBpbnQgY2VjX2kyY19hZGRyID0gMHg3ODsKPiAtCj4gICBpbnQgYWR2NzUzM19pbml0X2Nl YyhzdHJ1Y3QgYWR2NzUxMSAqYWR2KQo+ICAgewo+ICAgCWludCByZXQ7Cj4KPiAtCWFkdi0+aTJj X2NlYyA9IGkyY19uZXdfZHVtbXkoYWR2LT5pMmNfbWFpbi0+YWRhcHRlciwgY2VjX2kyY19hZGRy ID4+IDEpOwo+ICsJYWR2LT5pMmNfY2VjID0gaTJjX25ld19kdW1teShhZHYtPmkyY19tYWluLT5h ZGFwdGVyLAo+ICsJCQkJICAgICBhZHYtPmkyY19tYWluLT5hZGRyIC0gMSk7Cj4gICAJaWYgKCFh ZHYtPmkyY19jZWMpCj4gICAJCXJldHVybiAtRU5PTUVNOwo+Cj4KPiBfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK PiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwKPgoKLS0gClF1YWxjb21tIElubm92 YXRpb24gQ2VudGVyLCBJbmMuIGlzIGEgbWVtYmVyIG9mIENvZGUgQXVyb3JhIEZvcnVtLAphIExp bnV4IEZvdW5kYXRpb24gQ29sbGFib3JhdGl2ZSBQcm9qZWN0Cl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=