From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753493AbbATTng (ORCPT ); Tue, 20 Jan 2015 14:43:36 -0500 Received: from smtp6-g21.free.fr ([212.27.42.6]:21922 "EHLO smtp6-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753335AbbATTnd (ORCPT ); Tue, 20 Jan 2015 14:43:33 -0500 X-Mailbox-Line: From 18425fc3a59ca2f1fed6cf056c3d2700adee7d4a Mon Sep 17 00:00:00 2001 Message-Id: <18425fc3a59ca2f1fed6cf056c3d2700adee7d4a.1421782532.git.moinejf@free.fr> In-Reply-To: References: From: Jean-Francois Moine Date: Mon, 19 Jan 2015 19:50:54 +0100 Subject: [PATCH v10 3/9] ASoC: kirkwood: accept the DAI definitions from a graph of ports To: Mark Brown , Russell King - ARM Linux Cc: Dave Airlie , Andrew Jackson , Jyri Sarha , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org By default, both output ports 0 (I2S) and 1 (S/PDIF) are defined. A graph of port permits to define only the really connected ports of the board and to identify the remote ends. Signed-off-by: Jean-Francois Moine --- .../devicetree/bindings/sound/mvebu-audio.txt | 30 ++++++++++++++++ sound/soc/kirkwood/kirkwood-i2s.c | 41 ++++++++++++++++++---- sound/soc/kirkwood/kirkwood.h | 3 +- 3 files changed, 67 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/mvebu-audio.txt b/Documentation/devicetree/bindings/sound/mvebu-audio.txt index cb8c07c..ae81bf1 100644 --- a/Documentation/devicetree/bindings/sound/mvebu-audio.txt +++ b/Documentation/devicetree/bindings/sound/mvebu-audio.txt @@ -23,6 +23,19 @@ Required properties: "internal" for the internal clock "extclk" for the external clock +Optional nodes: + +- port: one or two ports. + Each port must contain the following property: + + - port-type: must be "i2s" or "spdif" + + and the following node: + + - endpoint: reference of the remote endpoint - see [1] + +[1] Documentation/devicetree/bindings/graph.txt + Example: i2s1: audio-controller@b4000 { @@ -31,4 +44,21 @@ i2s1: audio-controller@b4000 { interrupts = <21>, <22>; clocks = <&gate_clk 13>; clock-names = "internal"; + + port@0 { + port-type = "spdif"; + audio1_spdif0: endpoint@0 { + remote-endpoint = <&spdif_out>; + }; + audio1_spdif1: endpoint@1 { + remote-endpoint = <&tda998x_spdif>; + }; + }; + port@1 { + port-type = "i2s"; + audio1_i2s: endpoint { + remote-endpoint = <&tda998x_i2s>; + }; + }; + }; diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 357f963..8e62bb8 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -466,13 +466,42 @@ static const struct snd_soc_component_driver kirkwood_i2s_component = { }; /* create the DAIs */ -static int kirkwood_i2s_create_dais(struct kirkwood_dma_data *priv) +static int kirkwood_i2s_create_dais(struct device_node *np, + struct kirkwood_dma_data *priv) { - int i, ndai, dai[2]; + struct device_node *of_port; + const char *name; + int i, ret, ndai, dai[2]; - ndai = 2; - dai[0] = 0; /* i2s(0) - spdif(1) */ - dai[1] = 1; + ndai = 0; + if (np) { + for_each_child_of_node(np, of_port) { + if (!of_port->name || + of_node_cmp(of_port->name, "port") != 0) + continue; + ret = of_property_read_string(of_port, + "port-type", + &name); + if (ret) + continue; + if (strcmp(name, "i2s") == 0) { + dai[ndai] = 0; + } else if (strcmp(name, "spdif") == 0) { + dai[ndai] = 1; + } else { + continue; + } + if (++ndai >= 2) + break; + } + } + if (ndai == 0) { /* no DT or no port */ + ndai = 2; + dai[0] = 0; /* i2s(0) - spdif(1) */ + dai[1] = 1; + } else { + priv->is_graph = 1; /* graph of the ports */ + } for (i = 0; i < ndai; i++) { memcpy(&priv->dais[i], &kirkwood_i2s_dai_i2s_ext, sizeof(priv->dais[0])); @@ -570,7 +599,7 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) priv->ctl_rec |= KIRKWOOD_RECCTL_BURST_128; } - ndais = kirkwood_i2s_create_dais(priv); + ndais = kirkwood_i2s_create_dais(np, priv); err = snd_soc_register_component(&pdev->dev, &kirkwood_i2s_component, priv->dais, ndais); diff --git a/sound/soc/kirkwood/kirkwood.h b/sound/soc/kirkwood/kirkwood.h index a24d2c2..b4cbefe 100644 --- a/sound/soc/kirkwood/kirkwood.h +++ b/sound/soc/kirkwood/kirkwood.h @@ -141,7 +141,8 @@ struct kirkwood_dma_data { struct snd_pcm_substream *substream_play; struct snd_pcm_substream *substream_rec; int irq; - int burst; + short burst; + short is_graph; }; extern struct snd_soc_platform_driver kirkwood_soc_platform; -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean-Francois Moine Subject: [PATCH v10 3/9] ASoC: kirkwood: accept the DAI definitions from a graph of ports Date: Mon, 19 Jan 2015 19:50:54 +0100 Message-ID: <18425fc3a59ca2f1fed6cf056c3d2700adee7d4a.1421782532.git.moinejf@free.fr> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Mark Brown , Russell King - ARM Linux Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Andrew Jackson , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Jyri Sarha List-Id: devicetree@vger.kernel.org QnkgZGVmYXVsdCwgYm90aCBvdXRwdXQgcG9ydHMgMCAoSTJTKSBhbmQgMSAoUy9QRElGKSBhcmUg ZGVmaW5lZC4KQSBncmFwaCBvZiBwb3J0IHBlcm1pdHMgdG8gZGVmaW5lIG9ubHkgdGhlIHJlYWxs eSBjb25uZWN0ZWQgcG9ydHMgb2YKdGhlIGJvYXJkIGFuZCB0byBpZGVudGlmeSB0aGUgcmVtb3Rl IGVuZHMuCgpTaWduZWQtb2ZmLWJ5OiBKZWFuLUZyYW5jb2lzIE1vaW5lIDxtb2luZWpmQGZyZWUu ZnI+Ci0tLQogLi4uL2RldmljZXRyZWUvYmluZGluZ3Mvc291bmQvbXZlYnUtYXVkaW8udHh0ICAg ICAgfCAzMCArKysrKysrKysrKysrKysrCiBzb3VuZC9zb2Mva2lya3dvb2Qva2lya3dvb2QtaTJz LmMgICAgICAgICAgICAgICAgICB8IDQxICsrKysrKysrKysrKysrKysrKy0tLS0KIHNvdW5kL3Nv Yy9raXJrd29vZC9raXJrd29vZC5oICAgICAgICAgICAgICAgICAgICAgIHwgIDMgKy0KIDMgZmls ZXMgY2hhbmdlZCwgNjcgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9Eb2N1bWVudGF0aW9uL2RldmljZXRyZWUvYmluZGluZ3Mvc291bmQvbXZlYnUtYXVkaW8udHh0 IGIvRG9jdW1lbnRhdGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL3NvdW5kL212ZWJ1LWF1ZGlvLnR4 dAppbmRleCBjYjhjMDdjLi5hZTgxYmYxIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2Rldmlj ZXRyZWUvYmluZGluZ3Mvc291bmQvbXZlYnUtYXVkaW8udHh0CisrKyBiL0RvY3VtZW50YXRpb24v ZGV2aWNldHJlZS9iaW5kaW5ncy9zb3VuZC9tdmVidS1hdWRpby50eHQKQEAgLTIzLDYgKzIzLDE5 IEBAIFJlcXVpcmVkIHByb3BlcnRpZXM6CiAJImludGVybmFsIiBmb3IgdGhlIGludGVybmFsIGNs b2NrCiAJImV4dGNsayIgZm9yIHRoZSBleHRlcm5hbCBjbG9jawogCitPcHRpb25hbCBub2RlczoK KworLSBwb3J0OiBvbmUgb3IgdHdvIHBvcnRzLgorICBFYWNoIHBvcnQgbXVzdCBjb250YWluIHRo ZSBmb2xsb3dpbmcgcHJvcGVydHk6CisKKyAgLSBwb3J0LXR5cGU6IG11c3QgYmUgImkycyIgb3Ig InNwZGlmIgorCisgIGFuZCB0aGUgZm9sbG93aW5nIG5vZGU6CisKKyAgLSBlbmRwb2ludDogcmVm ZXJlbmNlIG9mIHRoZSByZW1vdGUgZW5kcG9pbnQgLSBzZWUgWzFdCisKK1sxXSBEb2N1bWVudGF0 aW9uL2RldmljZXRyZWUvYmluZGluZ3MvZ3JhcGgudHh0CisKIEV4YW1wbGU6CiAKIGkyczE6IGF1 ZGlvLWNvbnRyb2xsZXJAYjQwMDAgewpAQCAtMzEsNCArNDQsMjEgQEAgaTJzMTogYXVkaW8tY29u dHJvbGxlckBiNDAwMCB7CiAJaW50ZXJydXB0cyA9IDwyMT4sIDwyMj47CiAJY2xvY2tzID0gPCZn YXRlX2NsayAxMz47CiAJY2xvY2stbmFtZXMgPSAiaW50ZXJuYWwiOworCisJcG9ydEAwIHsKKwkJ cG9ydC10eXBlID0gInNwZGlmIjsKKwkJYXVkaW8xX3NwZGlmMDogZW5kcG9pbnRAMCB7CisJCQly ZW1vdGUtZW5kcG9pbnQgPSA8JnNwZGlmX291dD47CisJCX07CisJCWF1ZGlvMV9zcGRpZjE6IGVu ZHBvaW50QDEgeworCQkJcmVtb3RlLWVuZHBvaW50ID0gPCZ0ZGE5OTh4X3NwZGlmPjsKKwkJfTsK Kwl9OworCXBvcnRAMSB7CisJCXBvcnQtdHlwZSA9ICJpMnMiOworCQlhdWRpbzFfaTJzOiBlbmRw b2ludCB7CisJCQlyZW1vdGUtZW5kcG9pbnQgPSA8JnRkYTk5OHhfaTJzPjsKKwkJfTsKKwl9Owor CiB9OwpkaWZmIC0tZ2l0IGEvc291bmQvc29jL2tpcmt3b29kL2tpcmt3b29kLWkycy5jIGIvc291 bmQvc29jL2tpcmt3b29kL2tpcmt3b29kLWkycy5jCmluZGV4IDM1N2Y5NjMuLjhlNjJiYjggMTAw NjQ0Ci0tLSBhL3NvdW5kL3NvYy9raXJrd29vZC9raXJrd29vZC1pMnMuYworKysgYi9zb3VuZC9z b2Mva2lya3dvb2Qva2lya3dvb2QtaTJzLmMKQEAgLTQ2NiwxMyArNDY2LDQyIEBAIHN0YXRpYyBj b25zdCBzdHJ1Y3Qgc25kX3NvY19jb21wb25lbnRfZHJpdmVyIGtpcmt3b29kX2kyc19jb21wb25l bnQgPSB7CiB9OwogCiAvKiBjcmVhdGUgdGhlIERBSXMgKi8KLXN0YXRpYyBpbnQga2lya3dvb2Rf aTJzX2NyZWF0ZV9kYWlzKHN0cnVjdCBraXJrd29vZF9kbWFfZGF0YSAqcHJpdikKK3N0YXRpYyBp bnQga2lya3dvb2RfaTJzX2NyZWF0ZV9kYWlzKHN0cnVjdCBkZXZpY2Vfbm9kZSAqbnAsCisJCQkJ c3RydWN0IGtpcmt3b29kX2RtYV9kYXRhICpwcml2KQogewotCWludCBpLCBuZGFpLCBkYWlbMl07 CisJc3RydWN0IGRldmljZV9ub2RlICpvZl9wb3J0OworCWNvbnN0IGNoYXIgKm5hbWU7CisJaW50 IGksIHJldCwgbmRhaSwgZGFpWzJdOwogCi0JbmRhaSA9IDI7Ci0JZGFpWzBdID0gMDsJCS8qIGky cygwKSAtIHNwZGlmKDEpICovCi0JZGFpWzFdID0gMTsKKwluZGFpID0gMDsKKwlpZiAobnApIHsK KwkJZm9yX2VhY2hfY2hpbGRfb2Zfbm9kZShucCwgb2ZfcG9ydCkgeworCQkJaWYgKCFvZl9wb3J0 LT5uYW1lIHx8CisJCQkgICAgIG9mX25vZGVfY21wKG9mX3BvcnQtPm5hbWUsICJwb3J0IikgIT0g MCkKKwkJCQljb250aW51ZTsKKwkJCXJldCA9IG9mX3Byb3BlcnR5X3JlYWRfc3RyaW5nKG9mX3Bv cnQsCisJCQkJCQkicG9ydC10eXBlIiwKKwkJCQkJCSZuYW1lKTsKKwkJCWlmIChyZXQpCisJCQkJ Y29udGludWU7CisJCQlpZiAoc3RyY21wKG5hbWUsICJpMnMiKSA9PSAwKSB7CisJCQkJZGFpW25k YWldID0gMDsKKwkJCX0gZWxzZSBpZiAoc3RyY21wKG5hbWUsICJzcGRpZiIpID09IDApIHsKKwkJ CQlkYWlbbmRhaV0gPSAxOworCQkJfSBlbHNlIHsKKwkJCQljb250aW51ZTsKKwkJCX0KKwkJCWlm ICgrK25kYWkgPj0gMikKKwkJCQlicmVhazsKKwkJfQorCX0KKwlpZiAobmRhaSA9PSAwKSB7CQkv KiBubyBEVCBvciBubyBwb3J0ICovCisJCW5kYWkgPSAyOworCQlkYWlbMF0gPSAwOwkJLyogaTJz KDApIC0gc3BkaWYoMSkgKi8KKwkJZGFpWzFdID0gMTsKKwl9IGVsc2UgeworCQlwcml2LT5pc19n cmFwaCA9IDE7CS8qIGdyYXBoIG9mIHRoZSBwb3J0cyAqLworCX0KIAlmb3IgKGkgPSAwOyBpIDwg bmRhaTsgaSsrKSB7CiAJCW1lbWNweSgmcHJpdi0+ZGFpc1tpXSwgJmtpcmt3b29kX2kyc19kYWlf aTJzX2V4dCwKIAkJCQlzaXplb2YocHJpdi0+ZGFpc1swXSkpOwpAQCAtNTcwLDcgKzU5OSw3IEBA IHN0YXRpYyBpbnQga2lya3dvb2RfaTJzX2Rldl9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNl ICpwZGV2KQogCQlwcml2LT5jdGxfcmVjIHw9IEtJUktXT09EX1JFQ0NUTF9CVVJTVF8xMjg7CiAJ fQogCi0JbmRhaXMgPSBraXJrd29vZF9pMnNfY3JlYXRlX2RhaXMocHJpdik7CisJbmRhaXMgPSBr aXJrd29vZF9pMnNfY3JlYXRlX2RhaXMobnAsIHByaXYpOwogCiAJZXJyID0gc25kX3NvY19yZWdp c3Rlcl9jb21wb25lbnQoJnBkZXYtPmRldiwgJmtpcmt3b29kX2kyc19jb21wb25lbnQsCiAJCQkJ CSBwcml2LT5kYWlzLCBuZGFpcyk7CmRpZmYgLS1naXQgYS9zb3VuZC9zb2Mva2lya3dvb2Qva2ly a3dvb2QuaCBiL3NvdW5kL3NvYy9raXJrd29vZC9raXJrd29vZC5oCmluZGV4IGEyNGQyYzIuLmI0 Y2JlZmUgMTAwNjQ0Ci0tLSBhL3NvdW5kL3NvYy9raXJrd29vZC9raXJrd29vZC5oCisrKyBiL3Nv dW5kL3NvYy9raXJrd29vZC9raXJrd29vZC5oCkBAIC0xNDEsNyArMTQxLDggQEAgc3RydWN0IGtp cmt3b29kX2RtYV9kYXRhIHsKIAlzdHJ1Y3Qgc25kX3BjbV9zdWJzdHJlYW0gKnN1YnN0cmVhbV9w bGF5OwogCXN0cnVjdCBzbmRfcGNtX3N1YnN0cmVhbSAqc3Vic3RyZWFtX3JlYzsKIAlpbnQgaXJx OwotCWludCBidXJzdDsKKwlzaG9ydCBidXJzdDsKKwlzaG9ydCBpc19ncmFwaDsKIH07CiAKIGV4 dGVybiBzdHJ1Y3Qgc25kX3NvY19wbGF0Zm9ybV9kcml2ZXIga2lya3dvb2Rfc29jX3BsYXRmb3Jt OwotLSAKMi4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs Cg==