From patchwork Mon Jan 29 23:05:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 10191045 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 658B860212 for ; Mon, 29 Jan 2018 23:05:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C3402785D for ; Mon, 29 Jan 2018 23:05:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4053127FA8; Mon, 29 Jan 2018 23:05:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_TVD_MIME_EPI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79C352785D for ; Mon, 29 Jan 2018 23:05:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751417AbeA2XFm (ORCPT ); Mon, 29 Jan 2018 18:05:42 -0500 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:59736 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751357AbeA2XFl (ORCPT ); Mon, 29 Jan 2018 18:05:41 -0500 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id 9CCDC8017D; Tue, 30 Jan 2018 00:05:39 +0100 (CET) Date: Tue, 30 Jan 2018 00:05:39 +0100 From: Pavel Machek To: lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, perex@perex.cz, tiwai@suse.com, bhumirks@gmail.com, pavel@ucw.cz, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, pali.rohar@gmail.com, sre@kernel.org, linux-arm-kernel , linux-omap@vger.kernel.org, tony@atomide.com, khilman@kernel.org, aaro.koskinen@iki.fi, ivo.g.dimitrov.75@gmail.com, patrikbachan@gmail.com, serge@hallyn.com, abcloriens@gmail.com, clayton@craftyguy.net, martijn@brixit.nl, sakari.ailus@linux.intel.com, Filip =?utf-8?Q?Matijevi=C4=87?= Subject: [PATCH] sound/tlv320dac33: Add device tree support Message-ID: <20180129230539.GA18280@amd> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This adds device tree support to tlv320dac33.c. Signed-off-by: Pavel Machek diff --git a/Documentation/devicetree/bindings/sound/tlv320dac33.txt b/Documentation/devicetree/bindings/sound/tlv320dac33.txt new file mode 100644 index 0000000..6cbd311 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/tlv320dac33.txt @@ -0,0 +1,32 @@ +Texas Instruments - tlv320dac33 Codec module + +The tlv320dac33 serial control bus communicates through I2C protocols. + +Required properties: + +- compatible - "ti,tlv320dac33" +- reg - I2C slave address + +Optional properties: + +- power-gpios - gpio pin to power the device, active high + +- interrupts - The interrupt output from the device. +- interrupt-parent - The parent interrupt controller. + +- ti,keep-bclk - Keep the BCLK running in FIFO modes +- ti,burst-bclkdiv - BCLK divider value in burst mode + +Example: + +tlv320dac33: audio-codec@19 { + compatible = "ti,tlv320dac33"; + reg = <0x19>; + + interrupt-parent = <&gpio2>; + interrupts = <21 1>; /* gpio_53, IRQF_TRIGGER_RISING */ + power-gpio = <&gpio2 28 0>; /* gpio_60 */ + + ti,keep-bclk; + ti,burst-bclkdiv = <3>; +}; diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c index 5b94a15..2a0fe06 100644 --- a/sound/soc/codecs/tlv320dac33.c +++ b/sound/soc/codecs/tlv320dac33.c @@ -30,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -105,7 +108,7 @@ struct tlv320dac33_priv { unsigned int nsample; /* burst read amount from host */ int mode1_latency; /* latency caused by the i2c writes in * us */ - u8 burst_bclkdiv; /* BCLK divider value in burst mode */ + u32 burst_bclkdiv; /* BCLK divider value in burst mode */ unsigned int burst_rate; /* Interface speed in Burst modes */ int keep_bclk; /* Keep the BCLK continuously running @@ -1484,16 +1487,11 @@ static struct snd_soc_dai_driver dac33_dai = { static int dac33_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { - struct tlv320dac33_platform_data *pdata; + struct tlv320dac33_platform_data *pdata = client->dev.platform_data; struct tlv320dac33_priv *dac33; + struct device_node *np = client->dev.of_node; int ret, i; - if (client->dev.platform_data == NULL) { - dev_err(&client->dev, "Platform data not set\n"); - return -ENODEV; - } - pdata = client->dev.platform_data; - dac33 = devm_kzalloc(&client->dev, sizeof(struct tlv320dac33_priv), GFP_KERNEL); if (dac33 == NULL) @@ -1505,10 +1503,26 @@ static int dac33_i2c_probe(struct i2c_client *client, i2c_set_clientdata(client, dac33); - dac33->power_gpio = pdata->power_gpio; - dac33->burst_bclkdiv = pdata->burst_bclkdiv; - dac33->keep_bclk = pdata->keep_bclk; - dac33->mode1_latency = pdata->mode1_latency; + if (pdata) { + dac33->power_gpio = pdata->power_gpio; + dac33->burst_bclkdiv = pdata->burst_bclkdiv; + dac33->keep_bclk = pdata->keep_bclk; + dac33->mode1_latency = pdata->mode1_latency; + } else if (np) { + ret = of_get_named_gpio(np, "power-gpios", 0); + if (ret >= 0) + dac33->power_gpio = ret; + else + dac33->power_gpio = -1; + + if (of_property_read_bool(np, "ti,keep-bclk")) + dac33->keep_bclk = true; + + of_property_read_u32(np, "ti,burst-bclkdiv", &dac33->burst_bclkdiv); + } else { + dev_err(&client->dev, "Platform data not set\n"); + return -ENODEV; + } if (!dac33->mode1_latency) dac33->mode1_latency = 10000; /* 10ms */ dac33->irq = client->irq; @@ -1574,9 +1588,16 @@ static const struct i2c_device_id tlv320dac33_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, tlv320dac33_i2c_id); +static const struct of_device_id tlv320dac33_of_match[] = { + { .compatible = "ti,tlv320dac33", }, + {}, +}; +MODULE_DEVICE_TABLE(i2c, tlv320dac33_of_match); + static struct i2c_driver tlv320dac33_i2c_driver = { .driver = { .name = "tlv320dac33-codec", + .of_match_table = of_match_ptr(tlv320dac33_of_match), }, .probe = dac33_i2c_probe, .remove = dac33_i2c_remove,