From patchwork Fri Sep 12 07:32:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianqun Xu X-Patchwork-Id: 4892301 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4765E9F537 for ; Fri, 12 Sep 2014 07:32:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7BC412027D for ; Fri, 12 Sep 2014 07:37:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4363720260 for ; Fri, 12 Sep 2014 07:37:37 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XSLON-0007if-SA; Fri, 12 Sep 2014 07:35:39 +0000 Received: from regular2.263xmail.com ([211.157.152.3]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XSLOJ-0007SG-Cv for linux-arm-kernel@lists.infradead.org; Fri, 12 Sep 2014 07:35:36 +0000 Received: from regular1.263xmail.com (unknown [192.168.165.183]) by regular2.263xmail.com (Postfix) with ESMTP id 243E41D8D0 for ; Fri, 12 Sep 2014 15:35:09 +0800 (CST) Received: from jay.xu?rock-chips.com (unknown [192.168.167.97]) by regular1.263xmail.com (Postfix) with SMTP id 08EDD43A0; Fri, 12 Sep 2014 15:34:57 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-ABS-CHECKED: 4 X-KSVirus-check: 0 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id D6CFF25D3D; Fri, 12 Sep 2014 15:34:52 +0800 (CST) X-RL-SENDER: jay.xu@rock-chips.com X-FST-TO: robh+dt@kernel.org X-SENDER-IP: 127.0.0.1 X-LOGIN-NAME: jay.xu@rock-chips.com X-UNIQUE-TAG: <5fef1d8cb180add54cfe177fbc5b561b> X-ATTACHMENT-NUM: 0 X-SENDER: xjq@rock-chips.com X-DNS-TYPE: 1 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.263.net (Postfix) whith ESMTP id 29793GJ6DQG; Fri, 12 Sep 2014 15:34:52 +0800 (CST) From: Jianqun To: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, heiko@sntech.de, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.de, grant.likely@linaro.org, jay.xu@rock-chips.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] ASoC: rockchip-max98090: add driver for rockchip board using a max98090 Date: Fri, 12 Sep 2014 15:32:53 +0800 Message-Id: <1410507173-15492-1-git-send-email-jay.xu@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1410506806-15327-1-git-send-email-jay.xu@rock-chips.com> References: <1410506806-15327-1-git-send-email-jay.xu@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140912_003535_927652_D330C136 X-CRM114-Status: GOOD ( 18.62 ) X-Spam-Score: -0.0 (/) Cc: huangtao@rock-chips.com, cf@rock-chips.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The driver is used for rockchip board using a max98090. Test on RK3288 with max98090. Signed-off-by: Jianqun Xu --- sound/soc/rockchip/Kconfig | 9 + sound/soc/rockchip/Makefile | 5 +- sound/soc/rockchip/rockchip_max98090.c | 308 +++++++++++++++++++++++++++++++++ 3 files changed, 321 insertions(+), 1 deletion(-) create mode 100644 sound/soc/rockchip/rockchip_max98090.c diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig index 78fc159..f82fbf5 100644 --- a/sound/soc/rockchip/Kconfig +++ b/sound/soc/rockchip/Kconfig @@ -9,3 +9,12 @@ config SND_SOC_ROCKCHIP config SND_SOC_ROCKCHIP_I2S tristate + +config SND_SOC_ROCKCHIP_MAX98090 + tristate "ASoC support for Rockchip boards using a MAX98090 codec" + depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB + select SND_SOC_ROCKCHIP_I2S + select SND_SOC_MAX98090 + help + Say Y or M here if you want to add support for SoC audio on Rockchip + boards using the MAX98090 codec, such as Veyron. diff --git a/sound/soc/rockchip/Makefile b/sound/soc/rockchip/Makefile index b921909..c324411 100644 --- a/sound/soc/rockchip/Makefile +++ b/sound/soc/rockchip/Makefile @@ -1,4 +1,7 @@ # ROCKCHIP Platform Support snd-soc-i2s-objs := rockchip_i2s.o - obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-i2s.o + +# ROCKCHIP Machine Support +snd-soc-rockchip-max98090-objs := rockchip_max98090.o +obj-$(CONFIG_SND_SOC_ROCKCHIP_MAX98090) += snd-soc-rockchip-max98090.o diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c new file mode 100644 index 0000000..8a7b7ba --- /dev/null +++ b/sound/soc/rockchip/rockchip_max98090.c @@ -0,0 +1,308 @@ +/* + * Rockchip machine ASoC driver for boards using a MAX90809 CODEC. + * + * Copyright (c) 2014, ROCKCHIP CORPORATION. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "rockchip_i2s.h" + +#define DRV_NAME "rockchip-snd-max98090" + +struct rockchip_max98090 { + int gpio_hp_det; + int gpio_mic_det; +}; + +static int rockchip_max98090_asoc_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + struct snd_soc_codec *codec = codec_dai->codec; + struct snd_soc_card *card = codec->card; + int mclk, ret; + unsigned int dai_fmt = rtd->dai_link->dai_fmt; + + /* set codec DAI configuration */ + ret = snd_soc_dai_set_fmt(codec_dai, dai_fmt); + if (ret < 0) { + dev_err(card->dev, "codec_dai format not set, %d\n", ret); + return ret; + } + + /* set cpu DAI configuration */ + ret = snd_soc_dai_set_fmt(cpu_dai, dai_fmt); + if (ret < 0) { + dev_err(card->dev, "cpu_dai format not set, %d\n", ret); + return ret; + } + + switch (params_rate(params)) { + case 8000: + case 16000: + case 24000: + case 32000: + case 48000: + case 64000: + case 96000: + mclk = 12288000; + break; + case 11025: + case 22050: + case 44100: + case 88200: + mclk = 11289600; + break; + default: + return -EINVAL; + } + mclk = 12000000; + ret = snd_soc_dai_set_sysclk(cpu_dai, 0, mclk, + SND_SOC_CLOCK_OUT); + if (ret < 0) { + dev_err(card->dev, "cpu_dai clock not set, %d\n", ret); + return ret; + } + + ret = snd_soc_dai_set_sysclk(codec_dai, 0, mclk, + SND_SOC_CLOCK_IN); + if (ret < 0) { + dev_err(card->dev, "codec_dai clock not set, %d\n", ret); + return ret; + } + + return ret; +} + +static struct snd_soc_ops rockchip_max98090_ops = { + .hw_params = rockchip_max98090_asoc_hw_params, +}; + +static struct snd_soc_jack rockchip_max98090_hp_jack; +static struct snd_soc_jack_pin rockchip_max98090_hp_jack_pins[] = { + { + .pin = "Headphones", + .mask = SND_JACK_HEADPHONE, + }, +}; + +static struct snd_soc_jack_gpio rockchip_max98090_hp_jack_gpio = { + .name = "Headphone detection", + .report = SND_JACK_HEADPHONE, + .debounce_time = 150, + .invert = 1, +}; + +static struct snd_soc_jack rockchip_max98090_mic_jack; +static struct snd_soc_jack_pin rockchip_max98090_mic_jack_pins[] = { + { + .pin = "Mic Jack", + .mask = SND_JACK_MICROPHONE, + }, +}; + +static struct snd_soc_jack_gpio rockchip_max98090_mic_jack_gpio = { + .name = "mic detect", + .report = SND_JACK_MICROPHONE, + .debounce_time = 150, + .invert = 0, +}; + +static const struct snd_soc_dapm_widget rockchip_max98090_dapm_widgets[] = { + SND_SOC_DAPM_HP("Headphones", NULL), + SND_SOC_DAPM_SPK("Speakers", NULL), + SND_SOC_DAPM_MIC("Mic Jack", NULL), +}; + +static const struct snd_kcontrol_new rockchip_max98090_controls[] = { + SOC_DAPM_PIN_SWITCH("Speakers"), +}; + +static int rockchip_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_codec *codec = rtd->codec; + struct snd_soc_card *card = codec->card; + struct device_node *dn = card->dev->of_node; + + if (dn) { + enum of_gpio_flags flags; + + rockchip_max98090_mic_jack_gpio.gpio = of_get_named_gpio_flags( + dn, "rockchip,mic-det-gpios", 0, &flags); + rockchip_max98090_mic_jack_gpio.invert = + !!(flags & OF_GPIO_ACTIVE_LOW); + + rockchip_max98090_hp_jack_gpio.gpio = of_get_named_gpio_flags( + dn, "rockchip,hp-det-gpios", 0, &flags); + rockchip_max98090_hp_jack_gpio.invert = + !!(flags & OF_GPIO_ACTIVE_LOW); + } + + if (gpio_is_valid(rockchip_max98090_mic_jack_gpio.gpio)) { + snd_soc_jack_new(codec, "Mic Jack", SND_JACK_MICROPHONE, + &rockchip_max98090_mic_jack); + snd_soc_jack_add_pins(&rockchip_max98090_mic_jack, + 1, rockchip_max98090_mic_jack_pins); + snd_soc_jack_add_gpios(&rockchip_max98090_mic_jack, 1, + &rockchip_max98090_mic_jack_gpio); + } + + if (gpio_is_valid(rockchip_max98090_hp_jack_gpio.gpio)) { + snd_soc_jack_new(codec, "Headphone Jack", + SND_JACK_HEADPHONE, + &rockchip_max98090_hp_jack); + snd_soc_jack_add_pins(&rockchip_max98090_hp_jack, + 1, rockchip_max98090_hp_jack_pins); + snd_soc_jack_add_gpios(&rockchip_max98090_hp_jack, 1, + &rockchip_max98090_hp_jack_gpio); + } + + return 0; +} + +static struct snd_soc_dai_link rockchip_max98090_dai = { + .name = "max98090", + .stream_name = "max98090 PCM", + .codec_dai_name = "HiFi", + .init = rockchip_max98090_asoc_init, + .ops = &rockchip_max98090_ops, + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM, +}; + +static struct snd_soc_card snd_soc_rockchip_max98090 = { + .name = "ROCKCHIP-I2S", + .owner = THIS_MODULE, + .dai_link = &rockchip_max98090_dai, + .num_links = 1, + .controls = rockchip_max98090_controls, + .num_controls = ARRAY_SIZE(rockchip_max98090_controls), + .dapm_widgets = rockchip_max98090_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(rockchip_max98090_dapm_widgets), + .fully_routed = true, +}; + +static int rockchip_max98090_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + struct snd_soc_card *card = &snd_soc_rockchip_max98090; + struct rockchip_max98090 *machine; + int ret; + + machine = devm_kzalloc(&pdev->dev, sizeof(*machine), GFP_KERNEL); + if (!machine) { + dev_err(&pdev->dev, "Can't allocate rockchip_max98090\n"); + return -ENOMEM; + } + + card->dev = &pdev->dev; + platform_set_drvdata(pdev, card); + snd_soc_card_set_drvdata(card, machine); + + machine->gpio_hp_det = of_get_named_gpio(np, + "rockchip,hp-det-gpios", 0); + if (machine->gpio_hp_det == -EPROBE_DEFER) + return -EPROBE_DEFER; + + ret = snd_soc_of_parse_card_name(card, "rockchip,model"); + if (ret) + goto err; + + ret = snd_soc_of_parse_audio_routing(card, "rockchip,audio-routing"); + if (ret) + goto err; + + rockchip_max98090_dai.codec_of_node = of_parse_phandle(np, + "rockchip,audio-codec", 0); + if (!rockchip_max98090_dai.codec_of_node) { + dev_err(&pdev->dev, + "Property 'rockchip,audio-codec' missing or invalid\n"); + ret = -EINVAL; + goto err; + } + + rockchip_max98090_dai.cpu_of_node = of_parse_phandle(np, + "rockchip,i2s-controller", 0); + if (!rockchip_max98090_dai.cpu_of_node) { + dev_err(&pdev->dev, + "Property 'rockchip,i2s-controller' missing or invalid\n"); + ret = -EINVAL; + goto err; + } + + rockchip_max98090_dai.platform_of_node = + rockchip_max98090_dai.cpu_of_node; + + ret = snd_soc_register_card(card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", + ret); + goto err; + } + + return 0; + +err: + return ret; +} + +static int rockchip_max98090_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); + + snd_soc_jack_free_gpios(&rockchip_max98090_hp_jack, 1, + &rockchip_max98090_hp_jack_gpio); + + snd_soc_unregister_card(card); + + return 0; +} + +static const struct of_device_id rockchip_max98090_of_match[] = { + { .compatible = "rockchip,rockchip-audio-max98090", }, + {}, +}; + +static struct platform_driver rockchip_max98090_driver = { + .driver = { + .name = DRV_NAME, + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = rockchip_max98090_of_match, + }, + .probe = rockchip_max98090_probe, + .remove = rockchip_max98090_remove, +}; +module_platform_driver(rockchip_max98090_driver); + +MODULE_AUTHOR("jianqun "); +MODULE_DESCRIPTION("Rockchip max98090 machine ASoC driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); +MODULE_DEVICE_TABLE(of, rockchip_max98090_of_match);