From mboxrd@z Thu Jan 1 00:00:00 1970 From: RongJun Ying Subject: [PATCH v4-resend 7/7] ASoC: sirf: Add bt-sco card Date: Wed, 26 Feb 2014 15:22:22 +0800 Message-ID: <1393399342-31177-8-git-send-email-rongjun.ying@csr.com> References: <1393399342-31177-1-git-send-email-rongjun.ying@csr.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pa0-f47.google.com (mail-pa0-f47.google.com [209.85.220.47]) by alsa0.perex.cz (Postfix) with ESMTP id 706B5265716 for ; Wed, 26 Feb 2014 08:26:03 +0100 (CET) Received: by mail-pa0-f47.google.com with SMTP id kp14so600192pab.6 for ; Tue, 25 Feb 2014 23:26:02 -0800 (PST) In-Reply-To: <1393399342-31177-1-git-send-email-rongjun.ying@csr.com> 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: Liam Girdwood , Mark Brown , rjying@gmail.com Cc: Takashi Iwai , Rongjun Ying , alsa-devel@alsa-project.org, workgroup.linux@csr.com List-Id: alsa-devel@alsa-project.org From: Rongjun Ying This connects platform DAI, USP(DSP mode) CPU DAI and bt-sco Codec DAI together and works as a mach driver. Signed-off-by: Rongjun Ying --- .../devicetree/bindings/sound/sirf-bt-sco.txt | 18 ++++ sound/soc/sirf/Kconfig | 6 + sound/soc/sirf/Makefile | 2 + sound/soc/sirf/sirf-bt-sco.c | 99 ++++++++++++++++++++ 4 files changed, 125 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/sirf-bt-sco.txt create mode 100644 sound/soc/sirf/sirf-bt-sco.c diff --git a/Documentation/devicetree/bindings/sound/sirf-bt-sco.txt b/Documentation/devicetree/bindings/sound/sirf-bt-sco.txt new file mode 100644 index 0000000..e51de20 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/sirf-bt-sco.txt @@ -0,0 +1,18 @@ +* SiRF atlas6/prima2 and bt-sco based audio setups + +Required properties: +- compatible: "sirf,sirf-bt-sco" +- sirf,usp-controller: The phandle of the SiRF usp controller. + +Optional properties: +- bt-sco-master: The phandle of who is master, if set, + the codec is master, Otherwiss, the soc is master. + +Example: + +sirf-bt-sco { + compatible = "sirf,sirf-bt-sco"; + sirf,usp-controller = <&usp0>; + bt-sco-master; +}; + diff --git a/sound/soc/sirf/Kconfig b/sound/soc/sirf/Kconfig index bdd5869..a24a992 100644 --- a/sound/soc/sirf/Kconfig +++ b/sound/soc/sirf/Kconfig @@ -21,6 +21,12 @@ config SND_SOC_SIRF_I2S select REGMAP_MMIO tristate +config SND_SOC_SIRF_BT_SCO + tristate "SoC Audio support for BT SCO" + depends on SND_SOC_SIRF + select SND_SOC_BT_SCO + select SND_SOC_SIRF_USP + config SND_SOC_SIRF_HDMI tristate "SoC Audio support for SiRF HDMI" depends on SND_SOC_SIRF diff --git a/sound/soc/sirf/Makefile b/sound/soc/sirf/Makefile index 1581b5a..0d4a6b7 100644 --- a/sound/soc/sirf/Makefile +++ b/sound/soc/sirf/Makefile @@ -2,10 +2,12 @@ snd-soc-sirf-audio-port-objs := sirf-audio-port.o snd-soc-sirf-audio-objs := sirf-audio.o snd-soc-sirf-usp-objs := sirf-usp.o snd-soc-sirf-i2s-objs := sirf-i2s.o +snd-soc-sirf-bt-sco-objs := sirf-bt-sco.o snd-soc-sirf-hdmi-objs := sirf-hdmi.o obj-$(CONFIG_SND_SOC_SIRF_AUDIO_PORT) += snd-soc-sirf-audio-port.o obj-$(CONFIG_SND_SOC_SIRF_AUDIO) += snd-soc-sirf-audio.o obj-$(CONFIG_SND_SOC_SIRF_USP) += snd-soc-sirf-usp.o obj-$(CONFIG_SND_SOC_SIRF_I2S) += snd-soc-sirf-i2s.o +obj-$(CONFIG_SND_SOC_SIRF_BT_SCO) += snd-soc-sirf-bt-sco.o obj-$(CONFIG_SND_SOC_SIRF_HDMI) += snd-soc-sirf-hdmi.o diff --git a/sound/soc/sirf/sirf-bt-sco.c b/sound/soc/sirf/sirf-bt-sco.c new file mode 100644 index 0000000..e01b280 --- /dev/null +++ b/sound/soc/sirf/sirf-bt-sco.c @@ -0,0 +1,99 @@ +/* + * SiRF bt sco ALSA SoC Audio board driver + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ +#include +#include + +#include + +static int sirf_bt_sco_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; + + /* Set cpu DAI configuration */ + 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_bt_sco_ops = { + .hw_params = sirf_bt_sco_hw_params, +}; + +/* Digital audio interface glue - connects codec <--> CPU */ +static struct snd_soc_dai_link sirf_bt_sco_dai_links[] = { + { + .name = "SiRF BT SCO", + .stream_name = "SiRF BT_SCO", + .codec_dai_name = "bt-sco-pcm", + .codec_name = "bt-sco", + .ops = &sirf_bt_sco_ops, + }, +}; + +static struct snd_soc_card snd_soc_sirf_bt_sco_card = { + .name = "SiRF BT SCO", + .owner = THIS_MODULE, + .dai_link = sirf_bt_sco_dai_links, + .num_links = ARRAY_SIZE(sirf_bt_sco_dai_links), +}; + +static int sirf_bt_sco_probe(struct platform_device *pdev) +{ + struct snd_soc_card *card = &snd_soc_sirf_bt_sco_card; + int ret; + + sirf_bt_sco_dai_links[0].cpu_of_node = + of_parse_phandle(pdev->dev.of_node, "sirf,usp-controller", 0); + sirf_bt_sco_dai_links[0].platform_of_node = + of_parse_phandle(pdev->dev.of_node, "sirf,usp-controller", 0); + if (of_property_read_bool(pdev->dev.of_node, "bt-sco-master")) + sirf_bt_sco_dai_links[0].dai_fmt = SND_SOC_DAIFMT_CBM_CFM; + else + sirf_bt_sco_dai_links[0].dai_fmt = SND_SOC_DAIFMT_CBS_CFS; + 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_bt_sco_of_match[] = { + { .compatible = "sirf,sirf-bt-sco", }, + {} +}; +MODULE_DEVICE_TABLE(of, sirf_bt_sco_of_match); + +static struct platform_driver sirf_bt_sco_driver = { + .driver = { + .name = "sirf-bt-sco", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = sirf_bt_sco_of_match, + }, + .probe = sirf_bt_sco_probe, +}; + +module_platform_driver(sirf_bt_sco_driver); + +MODULE_DESCRIPTION("SIRF BT SCO ALSA SoC Audio board driver"); +MODULE_AUTHOR("RongJun Ying "); +MODULE_LICENSE("GPL v2"); -- 1.7.5.4