From patchwork Wed Mar 5 02:36:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rjying X-Patchwork-Id: 3769991 X-Patchwork-Delegate: broonie@sirena.org.uk Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 49577BF13A for ; Wed, 5 Mar 2014 02:41:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5E92C2022F for ; Wed, 5 Mar 2014 02:41:15 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 1EA9F2021C for ; Wed, 5 Mar 2014 02:41:14 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 293502658F3; Wed, 5 Mar 2014 03:41:12 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id B1E19265874; Wed, 5 Mar 2014 03:38:44 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 6F64A265880; Wed, 5 Mar 2014 03:38:43 +0100 (CET) Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com [209.85.160.53]) by alsa0.perex.cz (Postfix) with ESMTP id B3C1A265874 for ; Wed, 5 Mar 2014 03:37:41 +0100 (CET) Received: by mail-pb0-f53.google.com with SMTP id rp16so412136pbb.40 for ; Tue, 04 Mar 2014 18:37:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XgtQD+91HypT+5xc0PDNTshYyNnqzASyxE5N6OShCXQ=; b=l8p+/NB/kSCdYQGHkSjA2tVwnpfFzbTQFZ7R0WCpHpYI+7g1d7f5Zzj98UMjhmizxY US1Ku65oefr2nKDKFxkGO/zSCvagl1J/bVRFVgkVnKwFVe/roqFB5mp5xRVPnTqsDgbf p+eEAUOYVodgCNwfmHCALkEOcqk4VlYrPj19fuJrbEaYioKPs7GJV/VIsOdLo6FKMIs7 1wC5f/qN1iYZTTyAlUaqhaNcA/SDJfzIw9Ez+UT/2378IENY1Y0Au6lNleYGAi0ZfWgV 8AW6Ps32auiGyLknzsu2sIx9sTi4S1cZ6Dd/M2g6XL56m4eaTrYEY7tqb/MH4DmBfTVg kubw== X-Received: by 10.66.149.7 with SMTP id tw7mr3695899pab.72.1393987060741; Tue, 04 Mar 2014 18:37:40 -0800 (PST) Received: from localhost.localdomain ([120.204.35.210]) by mx.google.com with ESMTPSA id my6sm2110313pbc.36.2014.03.04.18.37.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Mar 2014 18:37:40 -0800 (PST) From: RongJun Ying To: Liam Girdwood , Mark Brown , rjying@gmail.com Date: Wed, 5 Mar 2014 10:36:25 +0800 Message-Id: <1393986987-20505-6-git-send-email-rongjun.ying@csr.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1393986987-20505-1-git-send-email-rongjun.ying@csr.com> References: <1393986987-20505-1-git-send-email-rongjun.ying@csr.com> Cc: Takashi Iwai , Rongjun Ying , alsa-devel@alsa-project.org, workgroup.linux@csr.com Subject: [alsa-devel] [PATCH v5 5/7] ASoC: sirf: Add hdmi card X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rongjun Ying This connects platform DAI, hdmi audio codec DAI and SiRF I2S DAI together and works as a mach driver. Signed-off-by: Rongjun Ying --- .../devicetree/bindings/sound/sirf-hdmi.txt | 15 +++ sound/soc/sirf/Kconfig | 6 + sound/soc/sirf/Makefile | 2 + sound/soc/sirf/sirf-hdmi.c | 98 ++++++++++++++++++++ 4 files changed, 121 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/sirf-hdmi.txt create mode 100644 sound/soc/sirf/sirf-hdmi.c diff --git a/Documentation/devicetree/bindings/sound/sirf-hdmi.txt b/Documentation/devicetree/bindings/sound/sirf-hdmi.txt new file mode 100644 index 0000000..3b6eb2a --- /dev/null +++ b/Documentation/devicetree/bindings/sound/sirf-hdmi.txt @@ -0,0 +1,15 @@ +* SiRF atlas6/prima2 hdmi audio codec based audio setups + +Required properties: +- compatible: "sirf,sirf-hdmi" +- sirf,i2s-controller: The phandle of the SiRF I2S controller. +- sirf,hdmi-audio-codec: The phandle of the hdmi audio codec. + +Example: + +sirf-hdmi { + compatible = "sirf,hdmi-card"; + sirf,i2s-controller = <&i2s>; + sirf,hdmi-audio-codec = <&hdmi_audio>; +}; + diff --git a/sound/soc/sirf/Kconfig b/sound/soc/sirf/Kconfig index e0b7157..66ed994 100644 --- a/sound/soc/sirf/Kconfig +++ b/sound/soc/sirf/Kconfig @@ -13,6 +13,12 @@ config SND_SOC_SIRF_AUDIO_PORT select REGMAP_MMIO tristate +config SND_SOC_SIRF_HDMI + tristate "SoC Audio support for SiRF HDMI" + depends on SND_SOC_SIRF + select SND_SOC_SIRF_I2S + select SND_SOC_HDMI_CODEC + config SND_SOC_SIRF_I2S select REGMAP_MMIO tristate diff --git a/sound/soc/sirf/Makefile b/sound/soc/sirf/Makefile index d06a39e..c961307 100644 --- a/sound/soc/sirf/Makefile +++ b/sound/soc/sirf/Makefile @@ -1,7 +1,9 @@ snd-soc-sirf-audio-objs := sirf-audio.o snd-soc-sirf-audio-port-objs := sirf-audio-port.o +snd-soc-sirf-hdmi-objs := sirf-hdmi.o snd-soc-sirf-i2s-objs := sirf-i2s.o obj-$(CONFIG_SND_SOC_SIRF_AUDIO) += snd-soc-sirf-audio.o obj-$(CONFIG_SND_SOC_SIRF_AUDIO_PORT) += snd-soc-sirf-audio-port.o +obj-$(CONFIG_SND_SOC_SIRF_HDMI) += snd-soc-sirf-hdmi.o obj-$(CONFIG_SND_SOC_SIRF_I2S) += snd-soc-sirf-i2s.o diff --git a/sound/soc/sirf/sirf-hdmi.c b/sound/soc/sirf/sirf-hdmi.c new file mode 100644 index 0000000..a581ec4 --- /dev/null +++ b/sound/soc/sirf/sirf-hdmi.c @@ -0,0 +1,98 @@ +/* + * SIRF HDMI ALSA SoC Audio board driver + * + * Copyright (c) 2013 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#include +#include + +#include + +static int sirf_hdmi_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 *cpu_dai = rtd->cpu_dai; + struct snd_soc_codec *codec = rtd->codec; + struct snd_soc_card *card = codec->card; + unsigned int fmt; + int ret; + + fmt = card->dai_link[0].dai_fmt; + + ret = snd_soc_dai_set_fmt(cpu_dai, fmt); + if (ret < 0) { + dev_err(card->dev, "can't set cpu DAI configuration\n"); + return ret; + } + + return 0; +} + +static struct snd_soc_ops sirf_hdmi_ops = { + .hw_params = sirf_hdmi_hw_params, +}; +/* Digital audio interface glue - connects codec <--> CPU */ +static struct snd_soc_dai_link sirf_hdmi_dai_links[] = { + { + .name = "SiRF HDMI", + .stream_name = "SiRF HDMI", + .codec_dai_name = "hdmi-hifi", + .ops = &sirf_hdmi_ops, + }, +}; + +static struct snd_soc_card snd_soc_sirf_hdmi_card = { + .name = "SiRF HDMI", + .owner = THIS_MODULE, + .dai_link = sirf_hdmi_dai_links, + .num_links = ARRAY_SIZE(sirf_hdmi_dai_links), +}; + +static int sirf_hdmi_card_probe(struct platform_device *pdev) +{ + struct snd_soc_card *card = &snd_soc_sirf_hdmi_card; + int ret; + sirf_hdmi_dai_links[0].cpu_of_node = + of_parse_phandle(pdev->dev.of_node, "sirf,i2s-controller", 0); + sirf_hdmi_dai_links[0].platform_of_node = + of_parse_phandle(pdev->dev.of_node, "sirf,i2s-controller", 0); + sirf_hdmi_dai_links[0].codec_of_node = + of_parse_phandle(pdev->dev.of_node, "sirf,hdmi-audio-codec", 0); + + sirf_hdmi_dai_links[0].dai_fmt = SND_SOC_DAIFMT_CBM_CFM | + SND_SOC_DAIFMT_I2S; + + card->dev = &pdev->dev; + + ret = devm_snd_soc_register_card(&pdev->dev, card); + if (ret) + dev_err(&pdev->dev, "snd_soc_register_card() failed:%d\n", ret); + + return ret; +} + +static const struct of_device_id sirf_hdmi_card_of_match[] = { + { .compatible = "sirf,hdmi-card", }, + {} +}; +MODULE_DEVICE_TABLE(of, sirf_hdmi_card_of_match); + +static struct platform_driver sirf_hdmi_card_driver = { + .driver = { + .name = "sirf-hdmi-card", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = sirf_hdmi_card_of_match, + }, + .probe = sirf_hdmi_card_probe, +}; + +module_platform_driver(sirf_hdmi_card_driver); + +MODULE_DESCRIPTION("SIRF HDMI ALSA SoC Audio board driver"); +MODULE_AUTHOR("RongJun Ying "); +MODULE_LICENSE("GPL v2");