From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Ujfalusi Subject: Re: [PATCH 2/2] davinci-mcasp: add option to use AHCLKX pin as clock in Date: Fri, 6 Feb 2015 13:49:14 +0200 Message-ID: <54D4AA3A.8010904@ti.com> References: <1423212723-15307-1-git-send-email-urs.fassler@bytesatwork.ch> <54D487C1.1010901@bytesatwork.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by alsa0.perex.cz (Postfix) with ESMTP id 0486B2605C8 for ; Fri, 6 Feb 2015 12:49:19 +0100 (CET) In-Reply-To: <54D487C1.1010901@bytesatwork.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: =?UTF-8?B?VXJzIEbDpHNzbGVy?= , perex@perex.cz, tiwai@suse.de Cc: alsa-devel@alsa-project.org, lgirdwood@gmail.com, jsarha@ti.com, linux-kernel@vger.kernel.org, broonie@kernel.org, misael.lopez@ti.com List-Id: alsa-devel@alsa-project.org T24gMDIvMDYvMjAxNSAxMToyMiBBTSwgVXJzIEbDpHNzbGVyIHdyb3RlOgo+IFNpZ25lZC1vZmYt Ynk6IFVycyBGw6Rzc2xlciA8dXJzLmZhc3NsZXJAYnl0ZXNhdHdvcmsuY2g+Cj4gLS0tCj4gIC4u Li9iaW5kaW5ncy9zb3VuZC9kYXZpbmNpLW1jYXNwLWF1ZGlvLnR4dCAgICAgICAgIHwgIDEgKwo+ ICBzb3VuZC9zb2MvZGF2aW5jaS9kYXZpbmNpLW1jYXNwLmMgICAgICAgICAgICAgICAgICB8IDI2 Cj4gKysrKysrKysrKysrKysrKysrKy0tLQo+ICAyIGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlv bnMoKyksIDMgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdAo+IGEvRG9jdW1lbnRhdGlvbi9k ZXZpY2V0cmVlL2JpbmRpbmdzL3NvdW5kL2RhdmluY2ktbWNhc3AtYXVkaW8udHh0Cj4gYi9Eb2N1 bWVudGF0aW9uL2RldmljZXRyZWUvYmluZGluZ3Mvc291bmQvZGF2aW5jaS1tY2FzcC1hdWRpby50 eHQKPiBpbmRleCA0NmJjOTgyLi4yMmE5MWQyIDEwMDY0NAo+IC0tLSBhL0RvY3VtZW50YXRpb24v ZGV2aWNldHJlZS9iaW5kaW5ncy9zb3VuZC9kYXZpbmNpLW1jYXNwLWF1ZGlvLnR4dAo+ICsrKyBi L0RvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9zb3VuZC9kYXZpbmNpLW1jYXNwLWF1 ZGlvLnR4dAo+IEBAIC0zOSw2ICszOSw3IEBAIE9wdGlvbmFsIHByb3BlcnRpZXM6Cj4gICAgCQkg cGxlYXNlIHJlZmVyIHRvIHBpbmN0cmwtYmluZGluZ3MudHh0Cj4gIC0gZmNrX3BhcmVudCA6IFNo b3VsZCBjb250YWluIGEgdmFsaWQgY2xvY2sgbmFtZSB3aGljaCB3aWxsIGJlIHVzZWQgYXMKPiBw YXJlbnQKPiAgCSAgICAgICBmb3IgdGhlIE1jQVNQIGZjawo+ICstIGFoY2xreC1waW4gOiBpZiBz ZXQgdXNlIEFIQ0xLWCBwaW4gZm9yIGNsb2NrIGluIGluc3RlYWQgb2YgQUNMS1gKPiAgIEV4YW1w bGU6Cj4gIGRpZmYgLS1naXQgYS9zb3VuZC9zb2MvZGF2aW5jaS9kYXZpbmNpLW1jYXNwLmMKPiBi L3NvdW5kL3NvYy9kYXZpbmNpL2RhdmluY2ktbWNhc3AuYwo+IGluZGV4IDM5NmNkZWMuLjM3MzAy ODggMTAwNjQ0Cj4gLS0tIGEvc291bmQvc29jL2RhdmluY2kvZGF2aW5jaS1tY2FzcC5jCj4gKysr IGIvc291bmQvc29jL2RhdmluY2kvZGF2aW5jaS1tY2FzcC5jCj4gQEAgLTg1LDYgKzg1LDcgQEAg c3RydWN0IGRhdmluY2lfbWNhc3Agewo+ICAgCWludAlzeXNjbGtfZnJlcTsKPiAgCWJvb2wJYmNs a19tYXN0ZXI7Cj4gKwlib29sCWFoY2xreF9waW47Cj4gICAJLyogTWNBU1AgRklGTyByZWxhdGVk ICovCj4gIAl1OAl0eG51bWV2dDsKPiBAQCAtNDI5LDcgKzQzMCwxMiBAQCBzdGF0aWMgaW50IGRh dmluY2lfbWNhc3Bfc2V0X2RhaV9mbXQoc3RydWN0Cj4gc25kX3NvY19kYWkgKmNwdV9kYWksCj4g IAkJYnJlYWs7Cj4gIAljYXNlIFNORF9TT0NfREFJRk1UX0NCTV9DRlM6Cj4gIAkJLyogY29kZWMg aXMgY2xvY2sgbWFzdGVyIGFuZCBmcmFtZSBzbGF2ZSAqLwo+IC0JCW1jYXNwX2Nscl9iaXRzKG1j YXNwLCBEQVZJTkNJX01DQVNQX0FDTEtYQ1RMX1JFRywgQUNMS1hFKTsKPiArCQlpZiAobWNhc3At PmFoY2xreF9waW4pCj4gKwkJCW1jYXNwX3NldF9iaXRzKG1jYXNwLCBEQVZJTkNJX01DQVNQX0FD TEtYQ1RMX1JFRywKPiArCQkJCUFDTEtYRSk7Cj4gKwkJZWxzZQo+ICsJCQltY2FzcF9jbHJfYml0 cyhtY2FzcCwgREFWSU5DSV9NQ0FTUF9BQ0xLWENUTF9SRUcsCj4gKwkJCQlBQ0xLWEUpOwoKVGhp cyBpcyBub3QgY29ycmVjdC4gQUNMS1hFIGJpdCBvZiBBQ0xLWENUTCByZWdpc3RlciBjb25maWd1 cmVzIHRoZSB0cmFuc21pdApiaXQgY2xvY2sgc291cmNlLgpXaXRoIENCTV9DRnggaXQgaGFzIHRv IGJlIHNldCB0byAwIChjb2RlYyBpcyBwcm92aWRpbmcgdGhlIGJpdCBjbG9jayB2aWEgQUNMS1gK cGluKQphbmQgd2hlbiBDQlNfQ0Z4IGl0IG5lZWQgdG8gYmUgMSAoTWNBU1Agd2lsbCBwcm92aWRl IHRoZSBiaXQgY2xvY2spCgo+ICAJCW1jYXNwX3NldF9iaXRzKG1jYXNwLCBEQVZJTkNJX01DQVNQ X1RYRk1DVExfUkVHLCBBRlNYRSk7Cj4gICAJCW1jYXNwX2Nscl9iaXRzKG1jYXNwLCBEQVZJTkNJ X01DQVNQX0FDTEtSQ1RMX1JFRywgQUNMS1JFKTsKPiBAQCAtNDQxLDcgKzQ0NywxMiBAQCBzdGF0 aWMgaW50IGRhdmluY2lfbWNhc3Bfc2V0X2RhaV9mbXQoc3RydWN0Cj4gc25kX3NvY19kYWkgKmNw dV9kYWksCj4gIAkJYnJlYWs7Cj4gIAljYXNlIFNORF9TT0NfREFJRk1UX0NCTV9DRk06Cj4gIAkJ LyogY29kZWMgaXMgY2xvY2sgYW5kIGZyYW1lIG1hc3RlciAqLwo+IC0JCW1jYXNwX2Nscl9iaXRz KG1jYXNwLCBEQVZJTkNJX01DQVNQX0FDTEtYQ1RMX1JFRywgQUNMS1hFKTsKPiArCQlpZiAobWNh c3AtPmFoY2xreF9waW4pCj4gKwkJCW1jYXNwX3NldF9iaXRzKG1jYXNwLCBEQVZJTkNJX01DQVNQ X0FDTEtYQ1RMX1JFRywKPiArCQkJCUFDTEtYRSk7Cj4gKwkJZWxzZQo+ICsJCQltY2FzcF9jbHJf Yml0cyhtY2FzcCwgREFWSU5DSV9NQ0FTUF9BQ0xLWENUTF9SRUcsCj4gKwkJCQlBQ0xLWEUpOwoK c2FtZSBoZXJlCgo+ICAJCW1jYXNwX2Nscl9iaXRzKG1jYXNwLCBEQVZJTkNJX01DQVNQX1RYRk1D VExfUkVHLCBBRlNYRSk7Cj4gICAJCW1jYXNwX2Nscl9iaXRzKG1jYXNwLCBEQVZJTkNJX01DQVNQ X0FDTEtSQ1RMX1JFRywgQUNMS1JFKTsKPiBAQCAtNTQyLDcgKzU1MywxMiBAQCBzdGF0aWMgaW50 IGRhdmluY2lfbWNhc3Bfc2V0X3N5c2NsayhzdHJ1Y3QKPiBzbmRfc29jX2RhaSAqZGFpLCBpbnQg Y2xrX2lkLAo+ICAJc3RydWN0IGRhdmluY2lfbWNhc3AgKm1jYXNwID0gc25kX3NvY19kYWlfZ2V0 X2RydmRhdGEoZGFpKTsKPiAgIAlpZiAobWNhc3AtPmJjbGtfbWFzdGVyKSB7Cj4gLQkJbWNhc3Bf c2V0X2JpdHMobWNhc3AsIERBVklOQ0lfTUNBU1BfQUhDTEtYQ1RMX1JFRywgQUhDTEtYRSk7Cj4g KwkJaWYgKG1jYXNwLT5haGNsa3hfcGluKQo+ICsJCQltY2FzcF9jbHJfYml0cyhtY2FzcCwgREFW SU5DSV9NQ0FTUF9BSENMS1hDVExfUkVHLAo+ICsJCQkJQUhDTEtYRSk7Cj4gKwkJZWxzZQo+ICsJ CQltY2FzcF9zZXRfYml0cyhtY2FzcCwgREFWSU5DSV9NQ0FTUF9BSENMS1hDVExfUkVHLAo+ICsJ CQkJQUhDTEtYRSk7Cgpub3Qgc3VyZSB3aHkgeW91IG5lZWQgdG8gZG8gdGhpcy4uLgoKWW91IGNh biBqdXN0IHNlbGVjdCB0aGUgc3lzY2xrIChBSENMS1gpIGZyb20gdGhlIG1hY2hpbmUgZHJpdmVy OgpzbmRfc29jX2RhaV9zZXRfc3lzY2xrKGNwdV9kYWksIDAsIHN5c2NsaywgU05EX1NPQ19DTE9D S19JTik7CgoKPiAgCQltY2FzcF9zZXRfYml0cyhtY2FzcCwgREFWSU5DSV9NQ0FTUF9BSENMS1JD VExfUkVHLCBBSENMS1JFKTsKPiAgCQltY2FzcF9zZXRfYml0cyhtY2FzcCwgREFWSU5DSV9NQ0FT UF9QRElSX1JFRywgQUhDTEtYKTsKPiAgCX0gZWxzZSB7Cj4gQEAgLTEzNDAsNiArMTM1Niw4IEBA IHN0YXRpYyBzdHJ1Y3QgZGF2aW5jaV9tY2FzcF9wZGF0YQo+ICpkYXZpbmNpX21jYXNwX3NldF9w ZGF0YV9mcm9tX29mKAo+ICAJaWYgKHJldCA+PSAwKQo+ICAJCXBkYXRhLT5zcmFtX3NpemVfY2Fw dHVyZSA9IHZhbDsKPiAgKwlwZGF0YS0+Y2xrX2lucHV0X3BpbiA9IG9mX3Byb3BlcnR5X3JlYWRf Ym9vbChucCwgImFoY2xreC1waW4iKTsKPiArCj4gIAlyZXR1cm4gIHBkYXRhOwo+ICAgbm9kYXRh Ogo+IEBAIC0xNDEyLDYgKzE0MzAsOCBAQCBzdGF0aWMgaW50IGRhdmluY2lfbWNhc3BfcHJvYmUo c3RydWN0Cj4gcGxhdGZvcm1fZGV2aWNlICpwZGV2KQo+ICAJCWdvdG8gZXJyOwo+ICAJfQo+ICAr CW1jYXNwLT5haGNsa3hfcGluID0gcGRhdGEtPmNsa19pbnB1dF9waW47Cj4gKwo+ICAJbWNhc3At Pm9wX21vZGUgPSBwZGF0YS0+b3BfbW9kZTsKPiAgCS8qIHNhbml0eSBjaGVjayBmb3IgdGRtIHNs b3RzIHBhcmFtZXRlciAqLwo+ICAJaWYgKG1jYXNwLT5vcF9tb2RlID09IERBVklOQ0lfTUNBU1Bf SUlTX01PREUpIHsKPiAKCgotLSAKUMOpdGVyCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkFsc2EtZGV2ZWwgbWFpbGluZyBsaXN0CkFsc2EtZGV2ZWxAYWxz YS1wcm9qZWN0Lm9yZwpodHRwOi8vbWFpbG1hbi5hbHNhLXByb2plY3Qub3JnL21haWxtYW4vbGlz dGluZm8vYWxzYS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752945AbbBFLtm (ORCPT ); Fri, 6 Feb 2015 06:49:42 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:33152 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751168AbbBFLtk (ORCPT ); Fri, 6 Feb 2015 06:49:40 -0500 Message-ID: <54D4AA3A.8010904@ti.com> Date: Fri, 6 Feb 2015 13:49:14 +0200 From: Peter Ujfalusi User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: =?UTF-8?B?VXJzIEbDpHNzbGVy?= , , CC: , , , , , Subject: Re: [PATCH 2/2] davinci-mcasp: add option to use AHCLKX pin as clock in References: <1423212723-15307-1-git-send-email-urs.fassler@bytesatwork.ch> <54D487C1.1010901@bytesatwork.ch> In-Reply-To: <54D487C1.1010901@bytesatwork.ch> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/06/2015 11:22 AM, Urs Fässler wrote: > Signed-off-by: Urs Fässler > --- > .../bindings/sound/davinci-mcasp-audio.txt | 1 + > sound/soc/davinci/davinci-mcasp.c | 26 > +++++++++++++++++++--- > 2 files changed, 24 insertions(+), 3 deletions(-) > > diff --git > a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt > b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt > index 46bc982..22a91d2 100644 > --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt > +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt > @@ -39,6 +39,7 @@ Optional properties: > please refer to pinctrl-bindings.txt > - fck_parent : Should contain a valid clock name which will be used as > parent > for the McASP fck > +- ahclkx-pin : if set use AHCLKX pin for clock in instead of ACLKX > Example: > diff --git a/sound/soc/davinci/davinci-mcasp.c > b/sound/soc/davinci/davinci-mcasp.c > index 396cdec..3730288 100644 > --- a/sound/soc/davinci/davinci-mcasp.c > +++ b/sound/soc/davinci/davinci-mcasp.c > @@ -85,6 +85,7 @@ struct davinci_mcasp { > int sysclk_freq; > bool bclk_master; > + bool ahclkx_pin; > /* McASP FIFO related */ > u8 txnumevt; > @@ -429,7 +430,12 @@ static int davinci_mcasp_set_dai_fmt(struct > snd_soc_dai *cpu_dai, > break; > case SND_SOC_DAIFMT_CBM_CFS: > /* codec is clock master and frame slave */ > - mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, ACLKXE); > + if (mcasp->ahclkx_pin) > + mcasp_set_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, > + ACLKXE); > + else > + mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, > + ACLKXE); This is not correct. ACLKXE bit of ACLKXCTL register configures the transmit bit clock source. With CBM_CFx it has to be set to 0 (codec is providing the bit clock via ACLKX pin) and when CBS_CFx it need to be 1 (McASP will provide the bit clock) > mcasp_set_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, AFSXE); > mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKRCTL_REG, ACLKRE); > @@ -441,7 +447,12 @@ static int davinci_mcasp_set_dai_fmt(struct > snd_soc_dai *cpu_dai, > break; > case SND_SOC_DAIFMT_CBM_CFM: > /* codec is clock and frame master */ > - mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, ACLKXE); > + if (mcasp->ahclkx_pin) > + mcasp_set_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, > + ACLKXE); > + else > + mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, > + ACLKXE); same here > mcasp_clr_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, AFSXE); > mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKRCTL_REG, ACLKRE); > @@ -542,7 +553,12 @@ static int davinci_mcasp_set_sysclk(struct > snd_soc_dai *dai, int clk_id, > struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai); > if (mcasp->bclk_master) { > - mcasp_set_bits(mcasp, DAVINCI_MCASP_AHCLKXCTL_REG, AHCLKXE); > + if (mcasp->ahclkx_pin) > + mcasp_clr_bits(mcasp, DAVINCI_MCASP_AHCLKXCTL_REG, > + AHCLKXE); > + else > + mcasp_set_bits(mcasp, DAVINCI_MCASP_AHCLKXCTL_REG, > + AHCLKXE); not sure why you need to do this... You can just select the sysclk (AHCLKX) from the machine driver: snd_soc_dai_set_sysclk(cpu_dai, 0, sysclk, SND_SOC_CLOCK_IN); > mcasp_set_bits(mcasp, DAVINCI_MCASP_AHCLKRCTL_REG, AHCLKRE); > mcasp_set_bits(mcasp, DAVINCI_MCASP_PDIR_REG, AHCLKX); > } else { > @@ -1340,6 +1356,8 @@ static struct davinci_mcasp_pdata > *davinci_mcasp_set_pdata_from_of( > if (ret >= 0) > pdata->sram_size_capture = val; > + pdata->clk_input_pin = of_property_read_bool(np, "ahclkx-pin"); > + > return pdata; > nodata: > @@ -1412,6 +1430,8 @@ static int davinci_mcasp_probe(struct > platform_device *pdev) > goto err; > } > + mcasp->ahclkx_pin = pdata->clk_input_pin; > + > mcasp->op_mode = pdata->op_mode; > /* sanity check for tdm slots parameter */ > if (mcasp->op_mode == DAVINCI_MCASP_IIS_MODE) { > -- Péter