From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [PATCH 1/3 v2] drm/i2c/adv7511: Add audio support Date: Fri, 01 Apr 2016 20:10:14 +0300 Message-ID: <5276355.2bQYPXCpz6@avalon> References: <15b1936d307912ba12df7fa09ec3a7a80ac5fcef.1459174494.git.joabreu@synopsys.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <15b1936d307912ba12df7fa09ec3a7a80ac5fcef.1459174494.git.joabreu@synopsys.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: tixy@linaro.org, mark.rutland@arm.com, alsa-devel@alsa-project.org, Alexey.Brodkin@synopsys.com, lgirdwood@gmail.com, yitian.bu@tangramtek.com, wsa+renesas@sang-engineering.com, laurent.pinchart+renesas@ideasonboard.com, tiwai@suse.com, nariman@opensource.wolfsonmicro.com, linux-snps-arc@lists.infradead.org, Jose Abreu , devicetree@vger.kernel.org, Maruthi.Bayyavarapu@amd.com, pawel.moll@arm.com, ijc+devicetree@hellion.org.uk, Vineet.Gupta1@synopsys.com, buyitian@gmail.com, robh+dt@kernel.org, perex@perex.cz, linux-kernel@vger.kernel.org, broonie@kernel.org, galak@codeaurora.org, alexander.deucher@amd.com, CARLOS.PALMINHA@synopsys.com List-Id: alsa-devel@alsa-project.org SGkgSm9zZSwKClRoYW5rIHlvdSBmb3IgdGhlIHBhdGNoLgoKT24gTW9uZGF5IDI4IE1hciAyMDE2 IDE1OjM2OjA5IEpvc2UgQWJyZXUgd3JvdGU6Cj4gVGhpcyBwYXRjaCBhZGRzIGF1ZGlvIHN1cHBv cnQgZm9yIHRoZSBBRFY3NTExIEhETUkgdHJhbnNtaXR0ZXIKPiB1c2luZyBBTFNBIFNvQy4KPiAK PiBUaGUgY29kZSB3YXMgcG9ydGVkIGZyb20gQW5hbG9nIERldmljZXMgbGludXggdHJlZSBmcm9t Cj4gY29tbWl0IDE3NzBjNGExZTMyYiAoIk1lcmdlIHJlbW90ZS10cmFja2luZyBicmFuY2gKPiAn eGlsaW54L21hc3RlcicgaW50byB4Y29tbV96eW5xIiksIHdoaWNoIGlzIGF2YWlsYWJsZSBhdDoK PiAJLSBodHRwczovL2dpdGh1Yi5jb20vYW5hbG9nZGV2aWNlc2luYy9saW51eC8KPiAKPiBUaGUg bWFpbiBjb3JlIGZpbGUgd2FzIHJlbmFtZWQgZnJvbSBhZHY3NTExLmMgdG8gYWR2NzUxMV9jb3Jl LmMKPiBzbyB0aGF0IGF1ZGlvIGFuZCB2aWRlbyBjb21waWxlIGludG8gYSBzaW5nbGUgYWR2NzUx MS5rbyBtb2R1bGUKPiBhbmQgdG8ga2VlcCB1cCB3aXRoIEFuYWxvZyBEZXZpY2VzIGtlcm5lbCB0 cmVlLgo+IAo+IFRoZSBhdWRpbyBjYW4gYmUgZGlzYWJsZWQgdXNpbmcgbWVudS1jb25maWcgc28g aXQgaXMgcG9zc2libGUKPiB0byB1c2Ugb25seSB2aWRlbyBtb2RlLgo+IAo+IFRoZSBIRE1JIG1v ZGUgaXMgYXV0b21hdGljYWxseSBzdGFydGVkIGF0IGJvb3QgYW5kIHRoZSBhdWRpbwo+ICh3aGVu IGVuYWJsZWQpIHJlZ2lzdGVycyBhcyBhIGNvZGVjIGludG8gQUxTQS4KPiAKPiBTUERJRiBEQUkg Zm9ybWF0IHdhcyBhbHNvIGFkZGVkIHRvIEFTb0MgYXMgaXQgaXMgcmVxdWlyZWQKPiBieSBhZHY3 NTExIGF1ZGlvLgo+IAo+IFNpZ25lZC1vZmYtYnk6IEpvc2UgQWJyZXUgPGpvYWJyZXVAc3lub3Bz eXMuY29tPgo+IC0tLQo+IAo+IE5vIGNoYW5nZXMgdjEgLT4gdjIuCj4gCj4gIGRyaXZlcnMvZ3B1 L2RybS9pMmMvS2NvbmZpZyAgICAgICAgIHwgICAxMSArCj4gIGRyaXZlcnMvZ3B1L2RybS9pMmMv TWFrZWZpbGUgICAgICAgIHwgICAgMiArCj4gIGRyaXZlcnMvZ3B1L2RybS9pMmMvYWR2NzUxMS5j ICAgICAgIHwgMTAyNCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCj4gIGRyaXZlcnMv Z3B1L2RybS9pMmMvYWR2NzUxMS5oICAgICAgIHwgICA0MSArKwo+ICBkcml2ZXJzL2dwdS9kcm0v aTJjL2Fkdjc1MTFfYXVkaW8uYyB8ICAzMTAgKysrKysrKysrKysKPiAgZHJpdmVycy9ncHUvZHJt L2kyYy9hZHY3NTExX2NvcmUuYyAgfCAxMDA1ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysr KwoKUGxlYXNlIHVzZSBnaXQtZm9ybWF0LXBhdGNoIC1NIHRvIGRldGVjdCByZW5hbWVzIGlmIHlv dSBzZW5kIGEgbmV3IHZlcnNpb24gb2YgCnRoaXMgc2VyaWVzLCBpdCB3aWxsIGhlbHAgd2l0aCBy ZXZpZXcuCgo+ICBpbmNsdWRlL3NvdW5kL3NvYy1kYWkuaCAgICAgICAgICAgICB8ICAgIDEgKwo+ ICA3IGZpbGVzIGNoYW5nZWQsIDEzNzAgaW5zZXJ0aW9ucygrKSwgMTAyNCBkZWxldGlvbnMoLSkK PiAgZGVsZXRlIG1vZGUgMTAwNjQ0IGRyaXZlcnMvZ3B1L2RybS9pMmMvYWR2NzUxMS5jCj4gIGNy ZWF0ZSBtb2RlIDEwMDY0NCBkcml2ZXJzL2dwdS9kcm0vaTJjL2Fkdjc1MTFfYXVkaW8uYwo+ICBj cmVhdGUgbW9kZSAxMDA2NDQgZHJpdmVycy9ncHUvZHJtL2kyYy9hZHY3NTExX2NvcmUuYwoKW3Nu aXBdCgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTJjL2Fkdjc1MTFfY29yZS5jCj4g Yi9kcml2ZXJzL2dwdS9kcm0vaTJjL2Fkdjc1MTFfY29yZS5jIG5ldyBmaWxlIG1vZGUgMTAwNjQ0 Cj4gaW5kZXggMDAwMDAwMC4uZDU0MjU2YQo+IC0tLSAvZGV2L251bGwKPiArKysgYi9kcml2ZXJz L2dwdS9kcm0vaTJjL2Fkdjc1MTFfY29yZS5jCgpbc25pcF0KCj4gK3N0YXRpYyBpbnQgYWR2NzUx MV9wcm9iZShzdHJ1Y3QgaTJjX2NsaWVudCAqaTJjLCBjb25zdCBzdHJ1Y3QgaTJjX2RldmljZV9p ZAo+ICppZCkgK3sKPiArCXN0cnVjdCBhZHY3NTExX2xpbmtfY29uZmlnIGxpbmtfY29uZmlnOwo+ ICsJc3RydWN0IGFkdjc1MTEgKmFkdjc1MTE7Cj4gKwlzdHJ1Y3QgZGV2aWNlICpkZXYgPSAmaTJj LT5kZXY7Cj4gKwl1bnNpZ25lZCBpbnQgdmFsOwo+ICsJaW50IHJldDsKPiArCj4gKwlpZiAoIWRl di0+b2Zfbm9kZSkKPiArCQlyZXR1cm4gLUVJTlZBTDsKPiArCj4gKwlhZHY3NTExID0gZGV2bV9r emFsbG9jKGRldiwgc2l6ZW9mKCphZHY3NTExKSwgR0ZQX0tFUk5FTCk7Cj4gKwlpZiAoIWFkdjc1 MTEpCj4gKwkJcmV0dXJuIC1FTk9NRU07Cj4gKwo+ICsJYWR2NzUxMS0+cG93ZXJlZCA9IGZhbHNl Owo+ICsJYWR2NzUxMS0+c3RhdHVzID0gY29ubmVjdG9yX3N0YXR1c19kaXNjb25uZWN0ZWQ7Cj4g Kwo+ICsJcmV0ID0gYWR2NzUxMV9wYXJzZV9kdChkZXYtPm9mX25vZGUsICZsaW5rX2NvbmZpZyk7 Cj4gKwlpZiAocmV0KQo+ICsJCXJldHVybiByZXQ7Cj4gKwo+ICsJLyoKPiArCSAqIFRoZSBwb3dl ciBkb3duIEdQSU8gaXMgb3B0aW9uYWwuIElmIHByZXNlbnQsIHRvZ2dsZSBpdCBmcm9tIGFjdGl2 ZSB0bwo+ICsJICogaW5hY3RpdmUgdG8gd2FrZSB1cCB0aGUgZW5jb2Rlci4KPiArCSAqLwo+ICsJ YWR2NzUxMS0+Z3Bpb19wZCA9IGRldm1fZ3Bpb2RfZ2V0X29wdGlvbmFsKGRldiwgInBkIiwgR1BJ T0RfT1VUX0hJR0gpOwo+ICsJaWYgKElTX0VSUihhZHY3NTExLT5ncGlvX3BkKSkKPiArCQlyZXR1 cm4gUFRSX0VSUihhZHY3NTExLT5ncGlvX3BkKTsKPiArCj4gKwlpZiAoYWR2NzUxMS0+Z3Bpb19w ZCkgewo+ICsJCW1kZWxheSg1KTsKPiArCQlncGlvZF9zZXRfdmFsdWVfY2Fuc2xlZXAoYWR2NzUx MS0+Z3Bpb19wZCwgMCk7Cj4gKwl9Cj4gKwo+ICsJYWR2NzUxMS0+cmVnbWFwID0gZGV2bV9yZWdt YXBfaW5pdF9pMmMoaTJjLCAmYWR2NzUxMV9yZWdtYXBfY29uZmlnKTsKPiArCWlmIChJU19FUlIo YWR2NzUxMS0+cmVnbWFwKSkKPiArCQlyZXR1cm4gUFRSX0VSUihhZHY3NTExLT5yZWdtYXApOwo+ ICsKPiArCXJldCA9IHJlZ21hcF9yZWFkKGFkdjc1MTEtPnJlZ21hcCwgQURWNzUxMV9SRUdfQ0hJ UF9SRVZJU0lPTiwgJnZhbCk7Cj4gKwlpZiAocmV0KQo+ICsJCXJldHVybiByZXQ7Cj4gKwlkZXZf ZGJnKGRldiwgIlJldi4gJWRcbiIsIHZhbCk7Cj4gKwo+ICsJcmV0ID0gcmVnbWFwX3JlZ2lzdGVy X3BhdGNoKGFkdjc1MTEtPnJlZ21hcCwgYWR2NzUxMV9maXhlZF9yZWdpc3RlcnMsCj4gKwkJCQkg ICAgQVJSQVlfU0laRShhZHY3NTExX2ZpeGVkX3JlZ2lzdGVycykpOwo+ICsJaWYgKHJldCkKPiAr CQlyZXR1cm4gcmV0Owo+ICsKPiArCXJlZ21hcF93cml0ZShhZHY3NTExLT5yZWdtYXAsIEFEVjc1 MTFfUkVHX0VESURfSTJDX0FERFIsIGVkaWRfaTJjX2FkZHIpOwo+ICsJcmVnbWFwX3dyaXRlKGFk djc1MTEtPnJlZ21hcCwgQURWNzUxMV9SRUdfUEFDS0VUX0kyQ19BRERSLAo+ICsJCSAgICAgcGFj a2V0X2kyY19hZGRyKTsKPiArCXJlZ21hcF93cml0ZShhZHY3NTExLT5yZWdtYXAsIEFEVjc1MTFf UkVHX0NFQ19JMkNfQUREUiwgY2VjX2kyY19hZGRyKTsKPiArCWFkdjc1MTFfcGFja2V0X2Rpc2Fi bGUoYWR2NzUxMSwgMHhmZmZmKTsKPiArCj4gKwlhZHY3NTExLT5pMmNfbWFpbiA9IGkyYzsKPiAr CWFkdjc1MTEtPmkyY19lZGlkID0gaTJjX25ld19kdW1teShpMmMtPmFkYXB0ZXIsIGVkaWRfaTJj X2FkZHIgPj4gMSk7Cj4gKwlpZiAoIWFkdjc1MTEtPmkyY19lZGlkKQo+ICsJCXJldHVybiAtRU5P TUVNOwo+ICsKPiArCWlmIChpMmMtPmlycSkgewo+ICsJCWluaXRfd2FpdHF1ZXVlX2hlYWQoJmFk djc1MTEtPndxKTsKPiArCj4gKwkJcmV0ID0gZGV2bV9yZXF1ZXN0X3RocmVhZGVkX2lycShkZXYs IGkyYy0+aXJxLCBOVUxMLAo+ICsJCQkJCQlhZHY3NTExX2lycV9oYW5kbGVyLAo+ICsJCQkJCQlJ UlFGX09ORVNIT1QsIGRldl9uYW1lKGRldiksCj4gKwkJCQkJCWFkdjc1MTEpOwo+ICsJCWlmIChy ZXQpCj4gKwkJCWdvdG8gZXJyX2kyY191bnJlZ2lzdGVyX2RldmljZTsKPiArCX0KPiArCj4gKwkv KiBDRUMgaXMgdW51c2VkIGZvciBub3cgKi8KPiArCXJlZ21hcF93cml0ZShhZHY3NTExLT5yZWdt YXAsIEFEVjc1MTFfUkVHX0NFQ19DVFJMLAo+ICsJCSAgICAgQURWNzUxMV9DRUNfQ1RSTF9QT1dF Ul9ET1dOKTsKPiArCj4gKwlhZHY3NTExX3Bvd2VyX29mZihhZHY3NTExKTsKPiArCj4gKwlpMmNf c2V0X2NsaWVudGRhdGEoaTJjLCBhZHY3NTExKTsKPiArCj4gKyNpZmRlZiBDT05GSUdfRFJNX0ky Q19BRFY3NTExX0FVRElPCj4gKwlhZHY3NTExX2F1ZGlvX2luaXQoJmkyYy0+ZGV2KTsKPiArI2Vu ZGlmCgpTaG91bGRuJ3Qgd2UgY29uZGl0aW9uIHRoaXMgdG8gdGhlIGF1ZGlvIGNoYW5uZWwgYmVp bmcgc29tZWhvdyBkZXNjcmliZWQgaW4gRFQgCj8gSWYgYSBib2FyZCBkb2Vzbid0IHJvdXRlIGF1 ZGlvIHNpZ25hbHMgdG8gdGhlIEFEVjc1MTEgYXVkaW8gaW5wdXQsIHRoZXJlJ3MgCm5vIG5lZWQg dG8gcmVnaXN0ZXIgYW4gYXVkaW8gY29kZWMuCgo+ICsKPiArCWFkdjc1MTFfc2V0X2xpbmtfY29u ZmlnKGFkdjc1MTEsICZsaW5rX2NvbmZpZyk7Cj4gKwo+ICsJLyogRW5hYmxlIEhETUkgbW9kZSAq Lwo+ICsJcmVnbWFwX3VwZGF0ZV9iaXRzKGFkdjc1MTEtPnJlZ21hcCwgQURWNzUxMV9SRUdfSERD UF9IRE1JX0NGRywKPiArCQkJQURWNzUxMV9IRE1JX0NGR19NT0RFX01BU0ssCj4gKwkJCUFEVjc1 MTFfSERNSV9DRkdfTU9ERV9IRE1JKTsKPiArCj4gKwlyZXR1cm4gMDsKPiArCj4gK2Vycl9pMmNf dW5yZWdpc3Rlcl9kZXZpY2U6Cj4gKwlpMmNfdW5yZWdpc3Rlcl9kZXZpY2UoYWR2NzUxMS0+aTJj X2VkaWQpOwo+ICsKPiArCXJldHVybiByZXQ7Cj4gK30KCi0tIApSZWdhcmRzLAoKTGF1cmVudCBQ aW5jaGFydAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K ZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: laurent.pinchart@ideasonboard.com (Laurent Pinchart) Date: Fri, 01 Apr 2016 20:10:14 +0300 Subject: [PATCH 1/3 v2] drm/i2c/adv7511: Add audio support In-Reply-To: <15b1936d307912ba12df7fa09ec3a7a80ac5fcef.1459174494.git.joabreu@synopsys.com> References: <15b1936d307912ba12df7fa09ec3a7a80ac5fcef.1459174494.git.joabreu@synopsys.com> List-ID: Message-ID: <5276355.2bQYPXCpz6@avalon> To: linux-snps-arc@lists.infradead.org Hi Jose, Thank you for the patch. On Monday 28 Mar 2016 15:36:09 Jose Abreu wrote: > This patch adds audio support for the ADV7511 HDMI transmitter > using ALSA SoC. > > The code was ported from Analog Devices linux tree from > commit 1770c4a1e32b ("Merge remote-tracking branch > 'xilinx/master' into xcomm_zynq"), which is available at: > - https://github.com/analogdevicesinc/linux/ > > The main core file was renamed from adv7511.c to adv7511_core.c > so that audio and video compile into a single adv7511.ko module > and to keep up with Analog Devices kernel tree. > > The audio can be disabled using menu-config so it is possible > to use only video mode. > > The HDMI mode is automatically started at boot and the audio > (when enabled) registers as a codec into ALSA. > > SPDIF DAI format was also added to ASoC as it is required > by adv7511 audio. > > Signed-off-by: Jose Abreu > --- > > No changes v1 -> v2. > > drivers/gpu/drm/i2c/Kconfig | 11 + > drivers/gpu/drm/i2c/Makefile | 2 + > drivers/gpu/drm/i2c/adv7511.c | 1024 ------------------------------- > drivers/gpu/drm/i2c/adv7511.h | 41 ++ > drivers/gpu/drm/i2c/adv7511_audio.c | 310 +++++++++++ > drivers/gpu/drm/i2c/adv7511_core.c | 1005 ++++++++++++++++++++++++++++++ Please use git-format-patch -M to detect renames if you send a new version of this series, it will help with review. > include/sound/soc-dai.h | 1 + > 7 files changed, 1370 insertions(+), 1024 deletions(-) > delete mode 100644 drivers/gpu/drm/i2c/adv7511.c > create mode 100644 drivers/gpu/drm/i2c/adv7511_audio.c > create mode 100644 drivers/gpu/drm/i2c/adv7511_core.c [snip] > diff --git a/drivers/gpu/drm/i2c/adv7511_core.c > b/drivers/gpu/drm/i2c/adv7511_core.c new file mode 100644 > index 0000000..d54256a > --- /dev/null > +++ b/drivers/gpu/drm/i2c/adv7511_core.c [snip] > +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 val; > + int ret; > + > + if (!dev->of_node) > + return -EINVAL; > + > + adv7511 = devm_kzalloc(dev, sizeof(*adv7511), GFP_KERNEL); > + if (!adv7511) > + return -ENOMEM; > + > + adv7511->powered = false; > + adv7511->status = connector_status_disconnected; > + > + ret = adv7511_parse_dt(dev->of_node, &link_config); > + if (ret) > + return ret; > + > + /* > + * The power down GPIO is optional. If present, toggle it from active to > + * inactive to wake up the encoder. > + */ > + adv7511->gpio_pd = devm_gpiod_get_optional(dev, "pd", GPIOD_OUT_HIGH); > + if (IS_ERR(adv7511->gpio_pd)) > + return PTR_ERR(adv7511->gpio_pd); > + > + if (adv7511->gpio_pd) { > + mdelay(5); > + gpiod_set_value_cansleep(adv7511->gpio_pd, 0); > + } > + > + adv7511->regmap = devm_regmap_init_i2c(i2c, &adv7511_regmap_config); > + if (IS_ERR(adv7511->regmap)) > + return PTR_ERR(adv7511->regmap); > + > + ret = regmap_read(adv7511->regmap, ADV7511_REG_CHIP_REVISION, &val); > + if (ret) > + return ret; > + dev_dbg(dev, "Rev. %d\n", val); > + > + ret = regmap_register_patch(adv7511->regmap, adv7511_fixed_registers, > + ARRAY_SIZE(adv7511_fixed_registers)); > + if (ret) > + return ret; > + > + 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); > + adv7511_packet_disable(adv7511, 0xffff); > + > + adv7511->i2c_main = i2c; > + adv7511->i2c_edid = i2c_new_dummy(i2c->adapter, edid_i2c_addr >> 1); > + if (!adv7511->i2c_edid) > + return -ENOMEM; > + > + if (i2c->irq) { > + init_waitqueue_head(&adv7511->wq); > + > + ret = devm_request_threaded_irq(dev, i2c->irq, NULL, > + adv7511_irq_handler, > + IRQF_ONESHOT, dev_name(dev), > + adv7511); > + if (ret) > + goto err_i2c_unregister_device; > + } > + > + /* CEC is unused for now */ > + regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL, > + ADV7511_CEC_CTRL_POWER_DOWN); > + > + adv7511_power_off(adv7511); > + > + i2c_set_clientdata(i2c, adv7511); > + > +#ifdef CONFIG_DRM_I2C_ADV7511_AUDIO > + adv7511_audio_init(&i2c->dev); > +#endif Shouldn't we condition this to the audio channel being somehow described in DT ? If a board doesn't route audio signals to the ADV7511 audio input, there's no need to register an audio codec. > + > + adv7511_set_link_config(adv7511, &link_config); > + > + /* Enable HDMI mode */ > + regmap_update_bits(adv7511->regmap, ADV7511_REG_HDCP_HDMI_CFG, > + ADV7511_HDMI_CFG_MODE_MASK, > + ADV7511_HDMI_CFG_MODE_HDMI); > + > + return 0; > + > +err_i2c_unregister_device: > + i2c_unregister_device(adv7511->i2c_edid); > + > + return ret; > +} -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752707AbcDARKS (ORCPT ); Fri, 1 Apr 2016 13:10:18 -0400 Received: from galahad.ideasonboard.com ([185.26.127.97]:46320 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751209AbcDARKP (ORCPT ); Fri, 1 Apr 2016 13:10:15 -0400 From: Laurent Pinchart To: dri-devel@lists.freedesktop.org Cc: Jose Abreu , linux-snps-arc@lists.infradead.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, tixy@linaro.org, mark.rutland@arm.com, broonie@kernel.org, Alexey.Brodkin@synopsys.com, lgirdwood@gmail.com, yitian.bu@tangramtek.com, wsa+renesas@sang-engineering.com, laurent.pinchart+renesas@ideasonboard.com, nariman@opensource.wolfsonmicro.com, Maruthi.Bayyavarapu@amd.com, pawel.moll@arm.com, ijc+devicetree@hellion.org.uk, Vineet.Gupta1@synopsys.com, buyitian@gmail.com, perex@perex.cz, tiwai@suse.com, robh+dt@kernel.org, galak@codeaurora.org, alexander.deucher@amd.com, CARLOS.PALMINHA@synopsys.com Subject: Re: [PATCH 1/3 v2] drm/i2c/adv7511: Add audio support Date: Fri, 01 Apr 2016 20:10:14 +0300 Message-ID: <5276355.2bQYPXCpz6@avalon> User-Agent: KMail/4.14.10 (Linux/4.1.15-gentoo-r1; KDE/4.14.16; x86_64; ; ) In-Reply-To: <15b1936d307912ba12df7fa09ec3a7a80ac5fcef.1459174494.git.joabreu@synopsys.com> References: <15b1936d307912ba12df7fa09ec3a7a80ac5fcef.1459174494.git.joabreu@synopsys.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jose, Thank you for the patch. On Monday 28 Mar 2016 15:36:09 Jose Abreu wrote: > This patch adds audio support for the ADV7511 HDMI transmitter > using ALSA SoC. > > The code was ported from Analog Devices linux tree from > commit 1770c4a1e32b ("Merge remote-tracking branch > 'xilinx/master' into xcomm_zynq"), which is available at: > - https://github.com/analogdevicesinc/linux/ > > The main core file was renamed from adv7511.c to adv7511_core.c > so that audio and video compile into a single adv7511.ko module > and to keep up with Analog Devices kernel tree. > > The audio can be disabled using menu-config so it is possible > to use only video mode. > > The HDMI mode is automatically started at boot and the audio > (when enabled) registers as a codec into ALSA. > > SPDIF DAI format was also added to ASoC as it is required > by adv7511 audio. > > Signed-off-by: Jose Abreu > --- > > No changes v1 -> v2. > > drivers/gpu/drm/i2c/Kconfig | 11 + > drivers/gpu/drm/i2c/Makefile | 2 + > drivers/gpu/drm/i2c/adv7511.c | 1024 ------------------------------- > drivers/gpu/drm/i2c/adv7511.h | 41 ++ > drivers/gpu/drm/i2c/adv7511_audio.c | 310 +++++++++++ > drivers/gpu/drm/i2c/adv7511_core.c | 1005 ++++++++++++++++++++++++++++++ Please use git-format-patch -M to detect renames if you send a new version of this series, it will help with review. > include/sound/soc-dai.h | 1 + > 7 files changed, 1370 insertions(+), 1024 deletions(-) > delete mode 100644 drivers/gpu/drm/i2c/adv7511.c > create mode 100644 drivers/gpu/drm/i2c/adv7511_audio.c > create mode 100644 drivers/gpu/drm/i2c/adv7511_core.c [snip] > diff --git a/drivers/gpu/drm/i2c/adv7511_core.c > b/drivers/gpu/drm/i2c/adv7511_core.c new file mode 100644 > index 0000000..d54256a > --- /dev/null > +++ b/drivers/gpu/drm/i2c/adv7511_core.c [snip] > +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 val; > + int ret; > + > + if (!dev->of_node) > + return -EINVAL; > + > + adv7511 = devm_kzalloc(dev, sizeof(*adv7511), GFP_KERNEL); > + if (!adv7511) > + return -ENOMEM; > + > + adv7511->powered = false; > + adv7511->status = connector_status_disconnected; > + > + ret = adv7511_parse_dt(dev->of_node, &link_config); > + if (ret) > + return ret; > + > + /* > + * The power down GPIO is optional. If present, toggle it from active to > + * inactive to wake up the encoder. > + */ > + adv7511->gpio_pd = devm_gpiod_get_optional(dev, "pd", GPIOD_OUT_HIGH); > + if (IS_ERR(adv7511->gpio_pd)) > + return PTR_ERR(adv7511->gpio_pd); > + > + if (adv7511->gpio_pd) { > + mdelay(5); > + gpiod_set_value_cansleep(adv7511->gpio_pd, 0); > + } > + > + adv7511->regmap = devm_regmap_init_i2c(i2c, &adv7511_regmap_config); > + if (IS_ERR(adv7511->regmap)) > + return PTR_ERR(adv7511->regmap); > + > + ret = regmap_read(adv7511->regmap, ADV7511_REG_CHIP_REVISION, &val); > + if (ret) > + return ret; > + dev_dbg(dev, "Rev. %d\n", val); > + > + ret = regmap_register_patch(adv7511->regmap, adv7511_fixed_registers, > + ARRAY_SIZE(adv7511_fixed_registers)); > + if (ret) > + return ret; > + > + 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); > + adv7511_packet_disable(adv7511, 0xffff); > + > + adv7511->i2c_main = i2c; > + adv7511->i2c_edid = i2c_new_dummy(i2c->adapter, edid_i2c_addr >> 1); > + if (!adv7511->i2c_edid) > + return -ENOMEM; > + > + if (i2c->irq) { > + init_waitqueue_head(&adv7511->wq); > + > + ret = devm_request_threaded_irq(dev, i2c->irq, NULL, > + adv7511_irq_handler, > + IRQF_ONESHOT, dev_name(dev), > + adv7511); > + if (ret) > + goto err_i2c_unregister_device; > + } > + > + /* CEC is unused for now */ > + regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL, > + ADV7511_CEC_CTRL_POWER_DOWN); > + > + adv7511_power_off(adv7511); > + > + i2c_set_clientdata(i2c, adv7511); > + > +#ifdef CONFIG_DRM_I2C_ADV7511_AUDIO > + adv7511_audio_init(&i2c->dev); > +#endif Shouldn't we condition this to the audio channel being somehow described in DT ? If a board doesn't route audio signals to the ADV7511 audio input, there's no need to register an audio codec. > + > + adv7511_set_link_config(adv7511, &link_config); > + > + /* Enable HDMI mode */ > + regmap_update_bits(adv7511->regmap, ADV7511_REG_HDCP_HDMI_CFG, > + ADV7511_HDMI_CFG_MODE_MASK, > + ADV7511_HDMI_CFG_MODE_HDMI); > + > + return 0; > + > +err_i2c_unregister_device: > + i2c_unregister_device(adv7511->i2c_edid); > + > + return ret; > +} -- Regards, Laurent Pinchart