From patchwork Thu Mar 19 21:57:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 46120 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C69E221515 for ; Thu, 19 Mar 2015 21:57:09 +0000 (UTC) Received: by lbiz11 with SMTP id z11sf14787014lbi.2 for ; Thu, 19 Mar 2015 14:57:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=/T/kND4Tq6ceL8SmapQxq5KwQD4YEVG17MwbhjhdooA=; b=kxON3MRCYd1UBDgSgXVZWisp2GiWEz7ddL1LaBRyKytMpYXQ1UntsZiHMDgyfGzKZr 5VzgRtVKMEVwPrB9tpq00Bw+oH0rf2cSo39HQ2aPqTX3IzoNbpXZJK4ojHZB/6ZpS5XL iRrhoTvZ3gkQPxxo2zXlyIIxkTAAGu2eox8mBr6IupLHiT+X+qdxepw7w0+qJkYzKkK7 rz0Bui+xyw/IXikMQ+dGgGrds49VC64e1vIyZPw8vkErL2ahzG79XlP90TeZUxaDreWq 3t1WE1vM1Rcs5AOgGb3C70bUKG3OF3iO+alBT5Mk5S1qMCmtympeDOCxxpYUcgnPOiTo ytOg== X-Gm-Message-State: ALoCoQkjAFyWbehWClKi8ScFmb36EboeNLZhsvSZsSWH8R0ZWqH3tUbllXiPIT3aLV0cuv7uvgho X-Received: by 10.152.8.73 with SMTP id p9mr8095869laa.6.1426802228531; Thu, 19 Mar 2015 14:57:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.200 with SMTP id d8ls151299laa.34.gmail; Thu, 19 Mar 2015 14:57:08 -0700 (PDT) X-Received: by 10.112.41.236 with SMTP id i12mr42514243lbl.14.1426802228379; Thu, 19 Mar 2015 14:57:08 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id p8si1830516laf.145.2015.03.19.14.57.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Mar 2015 14:57:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by lbnq5 with SMTP id q5so34733537lbn.0 for ; Thu, 19 Mar 2015 14:57:08 -0700 (PDT) X-Received: by 10.152.116.11 with SMTP id js11mr48741892lab.106.1426802228192; Thu, 19 Mar 2015 14:57:08 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.35.133 with SMTP id h5csp660210lbj; Thu, 19 Mar 2015 14:57:06 -0700 (PDT) X-Received: by 10.66.65.138 with SMTP id x10mr176486701pas.152.1426802225866; Thu, 19 Mar 2015 14:57:05 -0700 (PDT) Received: from mail-pa0-f44.google.com (mail-pa0-f44.google.com. [209.85.220.44]) by mx.google.com with ESMTPS id xw3si5463990pab.71.2015.03.19.14.57.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Mar 2015 14:57:05 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.44 as permitted sender) client-ip=209.85.220.44; Received: by pacwe9 with SMTP id we9so87747799pac.1 for ; Thu, 19 Mar 2015 14:57:04 -0700 (PDT) X-Received: by 10.70.138.105 with SMTP id qp9mr39035696pdb.67.1426802224806; Thu, 19 Mar 2015 14:57:04 -0700 (PDT) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id zd14sm4663676pab.20.2015.03.19.14.57.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Mar 2015 14:57:04 -0700 (PDT) From: John Stultz To: mark greer Cc: John Stultz Subject: [PATCH] greybus: gb-audio: Add integrated greybus audio driver Date: Thu, 19 Mar 2015 14:57:01 -0700 Message-Id: <1426802221-2504-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , So this is still an early attempt at merging my dummy driver into the greybus driver code. Things are coming along, but its not ready for merging yet. This patch requires the kernel config include the SND_GB_AUDIO patch I also submitted since it requires the simple card infrastructure and codec support. Since folks may not test this on a tegra, I added spdif codec support, which is baiscally an empty codec. We can switch back to the rt56xx codecs when we start talking to actual modules. I've gotten things tied in with the greybus initialization logic, and somewhat tested via gbsim, although there are still bugs with module removal. The patch still doesn't handle audio transmission properly, currently using a fixed rate timer to send chunks of audio. This will need to be tweaked so we're sending the right chunks of audio at the right interval for the given bitrate. This patch was generated on top of the queue MarkG sent me, and while I don't think it depends on anything he added, it may not apply cleanly w/o. Signed-off-by: John Stultz --- Makefile | 3 +- audio.c | 661 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 663 insertions(+), 1 deletion(-) create mode 100644 audio.c diff --git a/Makefile b/Makefile index e2c1939..91203f2 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,6 @@ gb-phy-y := gpb.o \ i2c.o \ spi.o \ i2s_mgmt.o \ - i2s_transmitter.o \ usb.o # Prefix all modules with gb- @@ -26,6 +25,7 @@ gb-vibrator-y := vibrator.o gb-battery-y := battery.o gb-es1-y := es1.o gb-es2-y := es2.o +gb-audio-y := audio.o obj-m += greybus.o obj-m += gb-phy.o @@ -33,6 +33,7 @@ obj-m += gb-vibrator.o obj-m += gb-battery.o obj-m += gb-es1.o obj-m += gb-es2.o +obj-m += gb-audio.o KERNELVER ?= $(shell uname -r) KERNELDIR ?= /lib/modules/$(KERNELVER)/build diff --git a/audio.c b/audio.c new file mode 100644 index 0000000..7143278 --- /dev/null +++ b/audio.c @@ -0,0 +1,661 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "greybus.h" +#include "i2s_mgmt_client.h" + +#define GB_AUDIO_DRIVER_NAME "gb_audio" + +#define GB_RATES SNDRV_PCM_RATE_8000_48000 +#define GB_FMTS SNDRV_PCM_FMTBIT_S16_LE +#define GB_MAX_LENGTH 256L +#define PREALLOC_BUFFER (32 * 1024) +#define PREALLOC_BUFFER_MAX (32 * 1024) + + +#define CONFIG_SAMPLES_PER_MSG 48 /* assuming 1 ms samples @ 48KHz */ +#define CONFIG_PERIOD_NS 1000000 /* send msg every 1ms */ + +#define CONFIG_COUNT_MAX 32 +#define CONFIG_I2S_REMOTE_DATA_CPORT 4 + +/* Switch between dummy spdif and jetson rt5645 codec */ +#define USE_RT5645 1 + +/* XXX remove this once MarkG's code lands */ +#ifndef GB_I2S_DATA_TYPE_SEND_DATA +#define GB_I2S_DATA_TYPE_SEND_DATA 0x02 +#define GB_I2S_MGMT_TYPE_ACTIVATE_CPORT 0x07 +#define GB_I2S_MGMT_TYPE_DEACTIVATE_CPORT 0x08 +#endif + + + +static int gb_i2s_mgmt_activate_cport(struct gb_connection *connection, + uint16_t cport) +{ + struct gb_i2s_mgmt_activate_cport_request request; + + request.cport = cport; + + return gb_operation_sync(connection, GB_I2S_MGMT_TYPE_ACTIVATE_CPORT, + &request, sizeof(request), NULL, 0); +} + +static int gb_i2s_mgmt_deactivate_cport(struct gb_connection *connection, + uint16_t cport) +{ + struct gb_i2s_mgmt_deactivate_cport_request request; + + request.cport = cport; + + return gb_operation_sync(connection, GB_I2S_MGMT_TYPE_DEACTIVATE_CPORT, + &request, sizeof(request), NULL, 0); +} + +static int gb_i2s_mgmt_get_supported_configurations( + struct gb_connection *connection, + struct gb_i2s_mgmt_get_supported_configurations_response *get_cfg, + size_t size) +{ + return gb_operation_sync(connection, GB_I2S_MGMT_TYPE_GET_SUPPORTED_CONFIGURATIONS, + NULL, 0, get_cfg, size); +} + +static int gb_i2s_mgmt_set_supported_configuration( + struct gb_connection *connection, + struct gb_i2s_mgmt_set_configuration_request *set_cfg) +{ + return gb_operation_sync(connection, + GB_I2S_MGMT_TYPE_SET_CONFIGURATION, + set_cfg, sizeof(*set_cfg), NULL, 0); +} + +static int gb_i2s_mgmt_set_configuration(struct gb_connection *connection, + struct gb_i2s_mgmt_set_configuration_request *set_cfg) +{ + return gb_operation_sync(connection, GB_I2S_MGMT_TYPE_SET_CONFIGURATION, + set_cfg, sizeof(*set_cfg), NULL, 0); +} + + +static int gb_i2s_mgmt_set_samples_per_message( + struct gb_connection *connection, + uint16_t samples_per_message) +{ + struct gb_i2s_mgmt_set_samples_per_message_request request; + request.samples_per_message = samples_per_message; + + return gb_operation_sync(connection, + GB_I2S_MGMT_TYPE_SET_SAMPLES_PER_MESSAGE, + &request, sizeof(request), NULL, 0); +} + + + + + +static int gb_i2s_mgmt_setup(struct gb_connection *connection) +{ + struct gb_i2s_mgmt_get_supported_configurations_response *get_cfg; + struct gb_i2s_mgmt_set_configuration_request set_cfg; + struct gb_i2s_mgmt_configuration *cfg; + size_t size; + int i, ret; + + size = sizeof(*get_cfg) + (CONFIG_COUNT_MAX * sizeof(get_cfg->config[0])); + + get_cfg = kzalloc(size, GFP_KERNEL); + if (!get_cfg) { + pr_err("get_cfg alloc failed\n"); + return -ENOMEM; + } + + ret = gb_i2s_mgmt_get_supported_configurations(connection, get_cfg, size); + if (ret) { + pr_err("get_supported_config failed: %d\n", ret); + goto free_get_cfg; + } + + /* Pick 48KHz 16-bits/channel */ + for (i = 0, cfg = get_cfg->config; i < CONFIG_COUNT_MAX; i++, cfg++) { + if ((cfg->sample_frequency == 48000) && + (cfg->num_channels == 2) && + (cfg->bytes_per_channel == 2) && + (cfg->byte_order & GB_I2S_MGMT_BYTE_ORDER_LE) && + (cfg->spatial_locations == + (GB_I2S_MGMT_SPATIAL_LOCATION_FL | + GB_I2S_MGMT_SPATIAL_LOCATION_FR)) && + (cfg->ll_protocol & GB_I2S_MGMT_PROTOCOL_I2S) && + (cfg->ll_bclk_role & GB_I2S_MGMT_ROLE_MASTER) && + (cfg->ll_wclk_role & GB_I2S_MGMT_ROLE_MASTER) && + (cfg->ll_wclk_polarity & GB_I2S_MGMT_POLARITY_NORMAL) && + (cfg->ll_wclk_polarity & GB_I2S_MGMT_POLARITY_NORMAL) && + (cfg->ll_wclk_change_edge & GB_I2S_MGMT_EDGE_FALLING) && + (cfg->ll_wclk_tx_edge & GB_I2S_MGMT_EDGE_FALLING) && + (cfg->ll_wclk_rx_edge & GB_I2S_MGMT_EDGE_RISING) && + (cfg->ll_data_offset == 1)) + break; + } + + if (i >= CONFIG_COUNT_MAX) { + pr_err("No valid configuration\n"); + ret = -EINVAL; + goto free_get_cfg; + } + + memcpy(&set_cfg, cfg, sizeof(set_cfg)); + + set_cfg.config.byte_order = GB_I2S_MGMT_BYTE_ORDER_LE; + set_cfg.config.ll_protocol = GB_I2S_MGMT_PROTOCOL_I2S; + set_cfg.config.ll_bclk_role = GB_I2S_MGMT_ROLE_MASTER; + set_cfg.config.ll_wclk_role = GB_I2S_MGMT_ROLE_MASTER; + set_cfg.config.ll_wclk_polarity = GB_I2S_MGMT_POLARITY_NORMAL; + set_cfg.config.ll_wclk_change_edge = GB_I2S_MGMT_EDGE_RISING; + set_cfg.config.ll_wclk_tx_edge = GB_I2S_MGMT_EDGE_FALLING; + set_cfg.config.ll_wclk_rx_edge = GB_I2S_MGMT_EDGE_RISING; + + ret = gb_i2s_mgmt_set_configuration(connection, &set_cfg); + if (ret) { + pr_err("get_supported_config failed: %d\n", ret); + goto free_get_cfg; + } + + ret = gb_i2s_mgmt_set_samples_per_message(connection, + CONFIG_SAMPLES_PER_MSG); + if (ret) { + pr_err("set_samples_per_msg failed: %d\n", ret); + goto free_get_cfg; + } + + /* XXX Add start delay here (probably 1ms) */ + + ret = gb_i2s_mgmt_activate_cport(connection, + CONFIG_I2S_REMOTE_DATA_CPORT); + if (ret) { + pr_err("activate_cport failed: %d\n", ret); + goto free_get_cfg; + } + +free_get_cfg: + kfree(get_cfg); + return ret; +} + +/*************************************************************** + * This is the gb_snd structure which ties everything together + * and fakes DMA interrupts via a timer. + ***************************************************************/ +struct gb_snd { + struct platform_device *card; + struct platform_device *cpu_dai; + struct gb_connection *mgmt_connection; + struct gb_connection *i2s_tx_connection; + struct gb_connection *i2s_rx_connection; + int gb_bundle_id; + int device_count; + struct snd_pcm_substream *substream; + struct hrtimer timer; + int hwptr_done; + struct list_head list; +}; + + +/* XXX needs a lock! */ +static LIST_HEAD(gb_snd_list); +int device_count; + +static struct gb_snd *gb_find_snd(int bundle_id) +{ + struct gb_snd *tmp; + list_for_each_entry(tmp, &gb_snd_list, list) + if (tmp->gb_bundle_id == bundle_id) + return tmp; + return NULL; +} + +static struct gb_snd *gb_get_snd(int bundle_id) +{ + struct gb_snd *snd_dev; + snd_dev = gb_find_snd(bundle_id); + if(snd_dev) { + return snd_dev; + } + + snd_dev = kzalloc(sizeof(*snd_dev), GFP_KERNEL); + if(!snd_dev) + return -ENOMEM; + + snd_dev->device_count = device_count++; + snd_dev->gb_bundle_id = bundle_id; + list_add(&snd_dev->list, &gb_snd_list); + return snd_dev; +} + +static void gb_free_snd(struct gb_snd* snd) +{ + list_del(&snd->list); + kfree(snd); +} + + +/********************************************************* + * timer logic + *********************************************************/ +static enum hrtimer_restart dummy_timer_function(struct hrtimer *hrtimer) +{ + struct gb_snd *snd_dev = container_of(hrtimer, struct gb_snd, timer); + struct snd_pcm_substream *substream = snd_dev->substream; + struct snd_pcm_runtime *runtime = substream->runtime; + char* address; + long len; + int ret; + + address = runtime->dma_area + snd_dev->hwptr_done; + len = frames_to_bytes(runtime, runtime->buffer_size) - snd_dev->hwptr_done; + len = min(len, GB_MAX_LENGTH); + + ret = gb_operation_sync(snd_dev->i2s_tx_connection, GB_I2S_DATA_TYPE_SEND_DATA, + address, len, NULL, 0); + snd_dev->hwptr_done += len; + + snd_pcm_period_elapsed(substream); + return HRTIMER_RESTART; +} + + +/****************************************** + * dai op functions) + ******************************************/ + +static int gb_dai_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + return 0; +} + +static void gb_dai_shutdown(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ +} + +static int gb_dai_trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *dai) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct gb_snd *snd_dev; + + + snd_dev = snd_soc_dai_get_drvdata(rtd->cpu_dai); + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + gb_i2s_mgmt_activate_cport(snd_dev->mgmt_connection, 1); + hrtimer_start(&snd_dev->timer, ktime_set(0, CONFIG_PERIOD_NS), + HRTIMER_MODE_REL); + break; + case SNDRV_PCM_TRIGGER_STOP: + hrtimer_cancel(&snd_dev->timer); + gb_i2s_mgmt_deactivate_cport(snd_dev->mgmt_connection, 1); + break; + default: + return -EINVAL; + } + return 0; +} + +static int gb_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) +{ + return 0; +} + +static int gb_dai_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + return 0; +} + + +static const struct snd_soc_dai_ops gb_dai_ops = { + .startup = gb_dai_startup, + .shutdown = gb_dai_shutdown, + .trigger = gb_dai_trigger, + .set_fmt = gb_dai_set_fmt, + .hw_params = gb_dai_hw_params, +}; + +static struct snd_soc_dai_driver gb_cpu_dai = { + .name = "gb-cpu-dai", + .playback = { + .rates = GB_RATES, + .formats = GB_FMTS, + .channels_min = 2, + .channels_max = 2, + }, + .ops = &gb_dai_ops, +}; + +/****************************************************** + * gb pcm logic + *****************************************************/ +static struct snd_pcm_hardware gb_plat_pcm_hardware = { + .info = SNDRV_PCM_INFO_INTERLEAVED, + .formats = GB_FMTS, + .rates = GB_RATES, + .rate_min = 8000, + .rate_max = 48000, + .channels_min = 2, + .channels_max = 2, + /* XXX - All the values below are junk */ + .buffer_bytes_max = 64 * 1024, + .period_bytes_min = 32, + .period_bytes_max = 8192, + .periods_min = 1, + .periods_max = 32, + .fifo_size = 256, +}; + +static snd_pcm_uframes_t gb_pcm_pointer(struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct gb_snd *snd_dev; + + snd_dev = snd_soc_dai_get_drvdata(rtd->cpu_dai); + + return snd_dev->hwptr_done; +} + +static int gb_pcm_prepare(struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct gb_snd *snd_dev; + + snd_dev = snd_soc_dai_get_drvdata(rtd->cpu_dai); + snd_dev->hwptr_done = 0; + + return 0; +} + +static int gb_pcm_open(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct gb_snd *snd_dev; + + + snd_dev = snd_soc_dai_get_drvdata(rtd->cpu_dai); + + runtime->private_data = snd_dev; + snd_dev->substream = substream; + hrtimer_init(&snd_dev->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + snd_dev->timer.function = dummy_timer_function; + + snd_soc_set_runtime_hwparams(substream, &gb_plat_pcm_hardware); + return snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS); +} + +static int gb_pcm_close(struct snd_pcm_substream *substream) +{ + if (substream->runtime->private_data) + kfree(substream->runtime->private_data); + substream->runtime->private_data = NULL; + return 0; +} + +static int gb_pcm_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *hw_params) +{ + printk("gb_pcm_hw_params\n"); + return snd_pcm_lib_malloc_pages(substream, + params_buffer_bytes(hw_params)); +} + +static int gb_pcm_hw_free(struct snd_pcm_substream *substream) +{ + return snd_pcm_lib_free_pages(substream); +} + +static struct snd_pcm_ops gb_pcm_ops = { + .open = gb_pcm_open, + .close = gb_pcm_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = gb_pcm_hw_params, + .hw_free = gb_pcm_hw_free, + .prepare = gb_pcm_prepare, + .pointer = gb_pcm_pointer, +}; + +static void gb_pcm_free(struct snd_pcm *pcm) +{ + snd_pcm_lib_preallocate_free_for_all(pcm); +} + +static int gb_pcm_new(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_pcm *pcm = rtd->pcm; + + return snd_pcm_lib_preallocate_pages_for_all( + pcm, + SNDRV_DMA_TYPE_CONTINUOUS, + snd_dma_continuous_data(GFP_KERNEL), + PREALLOC_BUFFER, PREALLOC_BUFFER_MAX); +} + +static struct snd_soc_platform_driver gb_soc_platform = { + .ops = &gb_pcm_ops, + .pcm_new = gb_pcm_new, + .pcm_free = gb_pcm_free, +}; + + +/************************************************************ + * This is the aosc simple card junk which binds the platform + * codec, cpu and codec-dais etc togheter, also all the + * nested gross platfrom driver/device junk is here. + ************************************************************/ +static const struct snd_soc_component_driver gb_soc_component = { + .name = "gb-component", +}; + +static int gb_plat_probe(struct platform_device *pdev) +{ + struct gb_snd *snd_dev; + int ret; + + snd_dev = (struct gb_snd *)pdev->dev.platform_data; + dev_set_drvdata(&pdev->dev, snd_dev); + + ret = snd_soc_register_platform(&pdev->dev, &gb_soc_platform); + ret = snd_soc_register_component(&pdev->dev, &gb_soc_component, + &gb_cpu_dai, 1); + return ret; +} + +static struct platform_driver gb_plat_driver = { + .driver = { + .name = "gb-pcm-audio", + }, + .probe = gb_plat_probe, +}; + + +static struct asoc_simple_card_info gb_card_info = { + .name = "Greybus Audio Module", + .card = "gb-card", +#if USE_RT5645 + .codec = "rt5645.0-001c", /* XXX this will need to be dynamic*/ + .daifmt = GB_FMTS, +#else + .codec = "spdif-dit", +#endif + .platform = "gb-pcm-audio.0", + .cpu_dai = { + .name = "gb-pcm-audio.0", + .fmt = GB_FMTS, + }, + .codec_dai = { +#if USE_RT5645 + .name = "rt5645-aif1", + .fmt = SND_SOC_DAIFMT_CBM_CFM, + .sysclk = 11289600, +#else + .name = "dit-hifi", +#endif + } +}; + + + +/**************************************************************** + * GB hooks + ****************************************************************/ +static int gb_i2s_transmitter_connection_init(struct gb_connection *connection) +{ + struct gb_snd *snd_dev; + int ret; + + printk("JDB: gb_i2s_transmitter_connection_init!\n"); + + snd_dev = gb_get_snd(connection->bundle->id); + if(!snd_dev) + return -ENOMEM; + + snd_dev->cpu_dai = platform_device_alloc("gb-pcm-audio", snd_dev->device_count); + if (!snd_dev->cpu_dai) { + ret = ENOMEM; + goto out; + } + + snd_dev->card = platform_device_alloc("asoc-simple-card", snd_dev->device_count); + if (!snd_dev->card) { + ret = ENOMEM; + goto out_dai; + } + + snd_dev->i2s_tx_connection = connection; + + snd_dev->card->dev.platform_data = &gb_card_info; /*XXX - prob should generate this dynamically*/ + snd_dev->cpu_dai->dev.platform_data = snd_dev; + snd_dev->i2s_tx_connection->private = snd_dev; + + ret = platform_device_add(snd_dev->cpu_dai); + if (ret) { + goto out_dai; + } + ret = platform_device_add(snd_dev->card); + if (ret) { + /* XXX errrr.. figure out the right thing here... */ + //platform_device_unregister(snd_dev->cpu_dai); + goto out_card; + } + return 0; + +out_card: + platform_device_put(snd_dev->card); +out_dai: + platform_device_put(snd_dev->cpu_dai); +out: + gb_free_snd(snd_dev); + return ret; +} + +static void gb_i2s_transmitter_connection_exit(struct gb_connection *connection) +{ + struct gb_snd *snd_dev; + + snd_dev = (struct gb_snd *)connection->private; + + platform_device_unregister(snd_dev->card); + platform_device_unregister(snd_dev->cpu_dai); + gb_free_snd(snd_dev); +} + +static int gb_i2s_mgmt_connection_init(struct gb_connection *connection) +{ + struct gb_snd *snd_dev; + + printk("JDB: gb_i2s_mgmt_connectino_init!\n"); + /* XXX So here we need to do something to connect + * the transmitter structures to the mgmt structure + */ + snd_dev = gb_get_snd(connection->bundle->id); + if(!snd_dev) + return -ENOMEM; + + snd_dev->mgmt_connection = connection; + connection->private = snd_dev; + + // XXX - Readd this as needed + //gb_i2s_mgmt_setup(connection); + return 0; +} + +static void gb_i2s_mgmt_connection_exit(struct gb_connection *connection) +{ +} + +static struct gb_protocol gb_i2s_receiver_protocol = { + .name = GB_AUDIO_DRIVER_NAME, + .id = GREYBUS_PROTOCOL_I2S_RECEIVER, + .major = 0, + .minor = 1, + .connection_init = gb_i2s_transmitter_connection_init, + .connection_exit = gb_i2s_transmitter_connection_exit, + .request_recv = NULL, +}; + +static struct gb_protocol gb_i2s_mgmt_protocol = { + .name = GB_AUDIO_DRIVER_NAME, + .id = GREYBUS_PROTOCOL_I2S_MGMT, + .major = 0, + .minor = 1, + .connection_init = gb_i2s_mgmt_connection_init, + .connection_exit = gb_i2s_mgmt_connection_exit, + .request_recv = NULL, +}; + +/****************************************************************** + * This is the basic hook to let me get things initialized + ******************************************************************/ +static int __init devices_setup(void) +{ + int err; + struct platform_device *device; + + err = gb_protocol_register(&gb_i2s_mgmt_protocol); + if (err) { + pr_err("Can't register i2s mgmt protocol driver: %d\n", -err); + return err; + } + + err = gb_protocol_register(&gb_i2s_receiver_protocol); + if (err) { + pr_err("Can't register Audio protocol driver: %d\n", -err); + goto err_unregister_i2s_mgmt; + } + + err = platform_driver_register(&gb_plat_driver); + if (err) { + pr_err("Can't register platform driver: %d\n", -err); + goto err_unregister_audio; + } + + device = platform_device_register_simple("spdif-dit", -1, NULL, 0); + return 0; + +err_unregister_audio: + gb_protocol_deregister(&gb_i2s_receiver_protocol); +err_unregister_i2s_mgmt: + gb_protocol_deregister(&gb_i2s_mgmt_protocol); + return err; +} +device_initcall(devices_setup); +MODULE_LICENSE("GPL");