[PATCH RFC 0/9] Beaglebone-Black HDMI audio

List overview All Threads
Download

newer

older

[PATCH v5] ACPI: Fix...

[PATCH 1/3] drm/radeon: fix VMID...

Jyri Sarha

19 Nov 2013 19 Nov '13

12:12 p.m.

This set of patches implements PCM HDMI audio driver for Beaglebone-Black HDMI output. The patches have been rebased on top of: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound topic/davinci

There is couple of earlier RFC versions of the clk patch floating around, but the one here is the latest version.

I'll send the associated dts changes shortly as a separate patch.

Best regards, Jyri

Jyri Sarha (9): clk: add gpio controlled clock ASoC: davinci-evm: Add named clock reference to DT bindings ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus ASoC: hdmi-codec: Add devicetree binding with documentation ASoC: hdmi-codec: Add SNDRV_PCM_FMTBIT_32_LE playback format ASoC: davinci: HDMI audio build for AM33XX and TDA998x drm/tilcdc: Add I2C HDMI audio config for tda998x ARM: OMAP2+: omap2plus_defconfig: Enable tilcdc and TDA998X HDMI support ARM: OMAP2+: omap2plus_defconfig: Enable BeagleBone Black HDMI audio support

.../devicetree/bindings/clock/gpio-clock.txt | 21 ++ .../bindings/sound/davinci-evm-audio.txt | 12 +- Documentation/devicetree/bindings/sound/hdmi.txt | 17 ++ arch/arm/configs/omap2plus_defconfig | 5 + drivers/clk/Makefile | 1 + drivers/clk/clk-gpio.c | 209 ++++++++++++++++++ drivers/gpu/drm/tilcdc/tilcdc_slave.c | 24 ++- include/linux/clk-provider.h | 25 +++ sound/soc/codecs/hdmi.c | 12 +- sound/soc/davinci/Kconfig | 12 ++ sound/soc/davinci/Makefile | 1 + sound/soc/davinci/davinci-evm.c | 227 +++++++++++++++++++- 12 files changed, 558 insertions(+), 8 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/gpio-clock.txt create mode 100644 Documentation/devicetree/bindings/sound/hdmi.txt create mode 100644 drivers/clk/clk-gpio.c

-- 1.7.9.5

Show replies by date

Jyri Sarha

19 Nov 19 Nov

12:12 p.m.

New subject: [PATCH RFC 1/9] clk: add gpio controlled clock

The added clk-gpio is a basic clock that can be enabled and disabled trough a gpio output. The DT binding document for the clock is also added. For EPROBE_DEFER handling the registering of the clock has to be delayed until of_clk_get() call time.

Signed-off-by: Jyri Sarha jsarha@ti.com cc: mturquette@linaro.org --- .../devicetree/bindings/clock/gpio-clock.txt | 21 ++ drivers/clk/Makefile | 1 + drivers/clk/clk-gpio.c | 209 ++++++++++++++++++++ include/linux/clk-provider.h | 25 +++ 4 files changed, 256 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/gpio-clock.txt create mode 100644 drivers/clk/clk-gpio.c

diff --git a/Documentation/devicetree/bindings/clock/gpio-clock.txt b/Documentation/devicetree/bindings/clock/gpio-clock.txt new file mode 100644 index 0000000..54fea39 --- /dev/null +++ b/Documentation/devicetree/bindings/clock/gpio-clock.txt @@ -0,0 +1,21 @@ +Binding for simple gpio controlled clock. + +This binding uses the common clock binding[1]. + +[1] Documentation/devicetree/bindings/clock/clock-bindings.txt + +Required properties: +- compatible : shall be "gpio-clock". +- #clock-cells : from common clock binding; shall be set to 0. +- enable-gpios : GPIO reference for enabling and disabling the clock. + +Optional properties: +- clocks: Maximum of one parent clock is supported. + +Example: + clock { + compatible = "gpio-clock"; + clocks = <&parentclk>; + #clock-cells = <0>; + enable-gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; + }; diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 7b11106..568b7be 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_COMMON_CLK) += clk-fixed-rate.o obj-$(CONFIG_COMMON_CLK) += clk-gate.o obj-$(CONFIG_COMMON_CLK) += clk-mux.o obj-$(CONFIG_COMMON_CLK) += clk-composite.o +obj-$(CONFIG_COMMON_CLK) += clk-gpio.o

# SoCs specific obj-$(CONFIG_ARCH_BCM2835) += clk-bcm2835.o diff --git a/drivers/clk/clk-gpio.c b/drivers/clk/clk-gpio.c new file mode 100644 index 0000000..992d13f --- /dev/null +++ b/drivers/clk/clk-gpio.c @@ -0,0 +1,209 @@ +/* + * Copyright (C) 2012 Texas Instruments + * Author: Jyri Sarha jsarha@ti.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Gpio controlled clock implementation + */ + +#include <linux/clk-provider.h> +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/gpio.h> +#include <linux/of_gpio.h> +#include <linux/err.h> +#include <linux/device.h> + +/** + * DOC: basic gpio controlled clock which can be enabled and disabled + * with gpio output + * Traits of this clock: + * prepare - clk_(un)prepare only ensures parent is (un)prepared + * enable - clk_enable and clk_disable are functional & control gpio + * rate - inherits rate from parent. No clk_set_rate support + * parent - fixed parent. No clk_set_parent support + */ + +#define to_clk_gpio(_hw) container_of(_hw, struct clk_gpio, hw) + +static int clk_gpio_enable(struct clk_hw *hw) +{ + struct clk_gpio *gpio = to_clk_gpio(hw); + int value = gpio->active_low ? 0 : 1; + + gpio_set_value(gpio->gpio, value); + + return 0; +} + +static void clk_gpio_disable(struct clk_hw *hw) +{ + struct clk_gpio *gpio = to_clk_gpio(hw); + int value = gpio->active_low ? 1 : 0; + + gpio_set_value(gpio->gpio, value); +} + +static int clk_gpio_is_enabled(struct clk_hw *hw) +{ + struct clk_gpio *gpio = to_clk_gpio(hw); + int value = gpio_get_value(gpio->gpio); + + return gpio->active_low ? !value : value; +} + +const struct clk_ops clk_gpio_ops = { + .enable = clk_gpio_enable, + .disable = clk_gpio_disable, + .is_enabled = clk_gpio_is_enabled, +}; +EXPORT_SYMBOL_GPL(clk_gpio_ops); + +/** + * clk_register_gpio - register a gpip clock with the clock framework + * @dev: device that is registering this clock + * @name: name of this clock + * @parent_name: name of this clock's parent + * @flags: framework-specific flags for this clock + * @gpio: gpio to control this clock + * @active_low: gpio polarity + */ +struct clk *clk_register_gpio(struct device *dev, const char *name, + const char *parent_name, unsigned long flags, + unsigned int gpio, bool active_low) +{ + struct clk_gpio *clk_gpio; + struct clk *clk = ERR_PTR(-EINVAL); + struct clk_init_data init = { NULL }; + unsigned long gpio_flags; + int err; + + if (active_low) + gpio_flags = GPIOF_OUT_INIT_LOW; + else + gpio_flags = GPIOF_OUT_INIT_HIGH; + + err = gpio_request_one(gpio, gpio_flags, name); + + if (err) { + pr_err("%s: %s: Error requesting clock control gpio %u\n", + __func__, name, gpio); + clk = ERR_PTR(err); + goto clk_register_gpio_err; + } + + clk_gpio = kzalloc(sizeof(*clk_gpio), GFP_KERNEL); + + if (!clk_gpio) { + pr_err("%s: %s: could not allocate gpio clk\n", __func__, name); + clk = ERR_PTR(-ENOMEM); + goto clk_register_gpio_err; + } + + init.name = name; + init.ops = &clk_gpio_ops; + init.flags = flags | CLK_IS_BASIC; + init.parent_names = (parent_name ? &parent_name : NULL); + init.num_parents = (parent_name ? 1 : 0); + + clk_gpio->gpio = gpio; + clk_gpio->active_low = active_low; + clk_gpio->hw.init = &init; + + clk = clk_register(dev, &clk_gpio->hw); + + if (!IS_ERR(clk)) + return clk; + + kfree(clk_gpio); + +clk_register_gpio_err: + gpio_free(gpio); + + return clk; +} +EXPORT_SYMBOL_GPL(clk_register_gpio); + +#ifdef CONFIG_OF +/** + * The clk_register_gpio has to be delayed, because the EPROBE_DEFER + * can not be handled properly at of_clk_init() call time. + */ + +struct clk_gpio_delayed_register_data { + struct device_node *node; + struct mutex lock; /* Protect delayed clk registering */ + struct clk *clk; +}; + +struct clk *of_clk_gpio_delayed_register_get(struct of_phandle_args *clkspec, + void *_data) +{ + struct clk_gpio_delayed_register_data *data = + (struct clk_gpio_delayed_register_data *)_data; + struct clk *clk; + const char *clk_name = data->node->name; + const char *parent_name; + enum of_gpio_flags gpio_flags; + int gpio; + bool active_low; + + mutex_lock(&data->lock); + + if (data->clk) { + mutex_unlock(&data->lock); + return data->clk; + } + + gpio = of_get_named_gpio_flags(data->node, "enable-gpios", 0, + &gpio_flags); + + if (gpio < 0) { + mutex_unlock(&data->lock); + if (gpio != -EPROBE_DEFER) + pr_err("%s: %s: Can't get 'enable-gpios' DT property\n", + __func__, clk_name); + return ERR_PTR(gpio); + } + + active_low = gpio_flags & OF_GPIO_ACTIVE_LOW; + + parent_name = of_clk_get_parent_name(data->node, 0); + + clk = clk_register_gpio(NULL, clk_name, parent_name, 0, + gpio, active_low); + if (IS_ERR(clk)) { + mutex_unlock(&data->lock); + return clk; + } + + data->clk = clk; + mutex_unlock(&data->lock); + + return clk; +} + +/** + * of_gpio_clk_setup() - Setup function for gpio controlled clock + */ +void __init of_gpio_clk_setup(struct device_node *node) +{ + struct clk_gpio_delayed_register_data *data; + + data = kzalloc(sizeof(*data), GFP_KERNEL); + if (!data) { + pr_err("%s: could not allocate gpio clk\n", __func__); + return; + } + + data->node = node; + mutex_init(&data->lock); + + of_clk_add_provider(node, of_clk_gpio_delayed_register_get, data); +} +EXPORT_SYMBOL_GPL(of_gpio_clk_setup); +CLK_OF_DECLARE(gpio_clk, "gpio-clock", of_gpio_clk_setup); +#endif diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 73bdb69..9d433f7 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -407,6 +407,31 @@ struct clk *clk_register_composite(struct device *dev, const char *name, struct clk_hw *gate_hw, const struct clk_ops *gate_ops, unsigned long flags);

+/*** + * struct clk_gpio - gpio controlled clock + * + * @hw: handle between common and hardware-specific interfaces + * @gpio: gpio + * @active_low: gpio polarity + * + * Clock with a gpio control for enabling and disabling the parent clock. + * Implements .enable, .disable and .is_enabled + */ + +struct clk_gpio { + struct clk_hw hw; + unsigned int gpio; + bool active_low; +}; + +extern const struct clk_ops clk_gpio_ops; + +struct clk *clk_register_gpio(struct device *dev, const char *name, + const char *parent_name, unsigned long flags, + unsigned int gpio, bool active_low); + +void of_gpio_clk_setup(struct device_node *node); + /** * clk_register - allocate a new clock, register it and return an opaque cookie * @dev: device that is registering this clock

-- 1.7.9.5

Jyri Sarha

12:12 p.m.

New subject: [PATCH RFC 2/9] ASoC: davinci-evm: Add named clock reference to DT bindings

The referenced clock is used to get codec clock rate and the clock is disabled and enabled in startup and shutdown snd_soc_ops call backs. The change is also documented in DT bindigs document.

Signed-off-by: Jyri Sarha jsarha@ti.com --- .../bindings/sound/davinci-evm-audio.txt | 9 ++- sound/soc/davinci/davinci-evm.c | 60 +++++++++++++++++++- 2 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt index 865178d..4aa00f6 100644 --- a/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt +++ b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt @@ -5,12 +5,19 @@ Required properties: - ti,model : The user-visible name of this sound complex. - ti,audio-codec : The phandle of the TLV320AIC3x audio codec - ti,mcasp-controller : The phandle of the McASP controller -- ti,codec-clock-rate : The Codec Clock rate (in Hz) applied to the Codec - ti,audio-routing : A list of the connections between audio components. Each entry is a pair of strings, the first being the connection's sink, the second being the connection's source. Valid names for sources and sinks are the codec's pins, and the jacks on the board:

+Optional properties: +- ti,codec-clock-rate : The Codec Clock rate (in Hz) applied to the Codec. +- clocks : Reference to the clock used as codec clock +- clock-names : The codec clock should be named "ti,codec-clock" +- Either codec-clock-rate or the codec-clock reference has to be defined. If + the both are defined the driver attempts to set referenced clock to the + defined rate and takes the rate from the clock reference. + Board connectors:

* Headphone Jack diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 70ff377..b28c9fd 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -17,6 +17,7 @@ #include <linux/platform_data/edma.h> #include <linux/i2c.h> #include <linux/of_platform.h> +#include <linux/clk.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> @@ -30,9 +31,30 @@ #include "davinci-i2s.h"

struct snd_soc_card_drvdata_davinci { + struct clk *mclk; unsigned sysclk; };

+static int evm_startup(struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_card *soc_card = rtd->codec->card; + struct clk *mclk = ((struct snd_soc_card_drvdata_davinci *) + snd_soc_card_get_drvdata(soc_card))->mclk; + + return clk_prepare_enable(mclk); +} + +static void evm_shutdown(struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_card *soc_card = rtd->codec->card; + struct clk *mclk = ((struct snd_soc_card_drvdata_davinci *) + snd_soc_card_get_drvdata(soc_card))->mclk; + + clk_disable_unprepare(mclk); +} + static int evm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -59,6 +81,8 @@ static int evm_hw_params(struct snd_pcm_substream *substream, }

static struct snd_soc_ops evm_ops = { + .startup = evm_startup, + .shutdown = evm_shutdown, .hw_params = evm_hw_params, };

@@ -348,6 +372,7 @@ static int davinci_evm_probe(struct platform_device *pdev) of_match_device(of_match_ptr(davinci_evm_dt_ids), &pdev->dev); struct snd_soc_dai_link *dai = (struct snd_soc_dai_link *) match->data; struct snd_soc_card_drvdata_davinci *drvdata = NULL; + struct clk *mclk; int ret = 0;

evm_soc_card.dai_link = dai; @@ -367,13 +392,38 @@ static int davinci_evm_probe(struct platform_device *pdev) if (ret) return ret;

+ mclk = of_clk_get_by_name(np, "ti,codec-clock"); + if (PTR_ERR(mclk) == -EPROBE_DEFER) { + return -EPROBE_DEFER; + } else if (IS_ERR(mclk)) { + dev_dbg(&pdev->dev, "Codec clock not found.\n"); + mclk = NULL; + } + drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) return -ENOMEM;

+ drvdata->mclk = mclk; + ret = of_property_read_u32(np, "ti,codec-clock-rate", &drvdata->sysclk); - if (ret < 0) - return -EINVAL; + + if (ret < 0) { + if (!drvdata->mclk) { + dev_err(&pdev->dev, + "No clock or clock rate defined.\n"); + return -EINVAL; + } + drvdata->sysclk = clk_get_rate(drvdata->mclk); + } else if (drvdata->mclk) { + unsigned int requestd_rate = drvdata->sysclk; + clk_set_rate(drvdata->mclk, drvdata->sysclk); + drvdata->sysclk = clk_get_rate(drvdata->mclk); + if (drvdata->sysclk != requestd_rate) + dev_warn(&pdev->dev, + "Could not get requested rate %u using %u.\n", + requestd_rate, drvdata->sysclk); + }

snd_soc_card_set_drvdata(&evm_soc_card, drvdata); ret = devm_snd_soc_register_card(&pdev->dev, &evm_soc_card); @@ -387,6 +437,12 @@ static int davinci_evm_probe(struct platform_device *pdev) static int davinci_evm_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); + struct snd_soc_card_drvdata_davinci *drvdata = + (struct snd_soc_card_drvdata_davinci *) + snd_soc_card_get_drvdata(card); + + if (drvdata->mclk) + clk_put(drvdata->mclk);

snd_soc_unregister_card(card);

-- 1.7.9.5

Mark Brown

6:18 p.m.

New subject: [PATCH RFC 2/9] ASoC: davinci-evm: Add named clock reference to DT bindings

On Tue, Nov 19, 2013 at 02:12:22PM +0200, Jyri Sarha wrote:

...

.../bindings/sound/davinci-evm-audio.txt | 9 ++- sound/soc/davinci/davinci-evm.c | 60 +++++++++++++++++++-

Again this looks sensible but ought to go to the DT folks.

Jyri Sarha

12:12 p.m.

New subject: [PATCH RFC 3/9] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus

Add machine driver support for BeagleBone-Black and other boards with tilcdc support and NXP TDA998X HDMI transmitter connected to McASP port in I2S mode. The 44100 Hz sample-rate and it's multiples can not be supported on Beaglebone-Black because of limited clock-rate support. The only supported sample format is SNDRV_PCM_FORMAT_S32_LE. The 8 least significant bits are ignored.

Signed-off-by: Jyri Sarha jsarha@ti.com --- .../bindings/sound/davinci-evm-audio.txt | 3 +- sound/soc/davinci/davinci-evm.c | 167 +++++++++++++++++++- 2 files changed, 167 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt index 4aa00f6..2abc4c2 100644 --- a/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt +++ b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt @@ -1,7 +1,8 @@ * Texas Instruments SoC audio setups with TLV320AIC3X Codec

Required properties: -- compatible : "ti,da830-evm-audio" : forDM365/DA8xx/OMAPL1x/AM33xx +- compatible : "ti,da830-evm-audio" : for DM365/DA8xx/OMAPL1x/AM33xx + "ti,am33xx-beaglebone-black" : for Beaglebone-black HDMI audio - ti,model : The user-visible name of this sound complex. - ti,audio-codec : The phandle of the TLV320AIC3x audio codec - ti,mcasp-controller : The phandle of the McASP controller diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index b28c9fd..71496b6 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -21,6 +21,7 @@ #include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> +#include <sound/pcm_params.h>

#include <asm/dma.h> #include <asm/mach-types.h> @@ -33,8 +34,13 @@ struct snd_soc_card_drvdata_davinci { struct clk *mclk; unsigned sysclk; + struct snd_pcm_hw_constraint_list *rate_constraint; };

+/* If changing sample format the tda998x configuration (REG_CTS_N) needs + to be changed. */ +#define TDA998X_SAMPLE_FORMAT SNDRV_PCM_FORMAT_S32_LE + static int evm_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; @@ -80,12 +86,80 @@ static int evm_hw_params(struct snd_pcm_substream *substream, return 0; }

+static int evm_tda998x_startup(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_card *soc_card = rtd->codec->card; + struct snd_soc_card_drvdata_davinci *drvdata = + (struct snd_soc_card_drvdata_davinci *) + snd_soc_card_get_drvdata(soc_card); + struct snd_mask *fmt = constrs_mask(&runtime->hw_constraints, + SNDRV_PCM_HW_PARAM_FORMAT); + snd_mask_none(fmt); + snd_mask_set(fmt, TDA998X_SAMPLE_FORMAT); + + runtime->hw.rate_min = drvdata->rate_constraint->list[0]; + runtime->hw.rate_max = drvdata->rate_constraint->list[ + drvdata->rate_constraint->count - 1]; + runtime->hw.rates = SNDRV_PCM_RATE_KNOT; + + snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, + drvdata->rate_constraint); + snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_CHANNELS, + 2, 2); + + return evm_startup(substream); +} + +static unsigned int evm_get_bclk(struct snd_pcm_hw_params *params) +{ + int sample_size = snd_pcm_format_width(params_format(params)); + int rate = params_rate(params); + int channels = params_channels(params); + + return sample_size * channels * rate; +} + +static int evm_tda998x_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 *soc_card = codec->card; + struct platform_device *pdev = to_platform_device(soc_card->dev); + unsigned int bclk_freq = evm_get_bclk(params); + unsigned sysclk = ((struct snd_soc_card_drvdata_davinci *) + snd_soc_card_get_drvdata(soc_card))->sysclk; + int ret; + + ret = snd_soc_dai_set_clkdiv(cpu_dai, 1, sysclk / bclk_freq); + if (ret < 0) { + dev_err(&pdev->dev, "can't set CPU DAI clock divider %d\n", + ret); + return ret; + } + + ret = snd_soc_dai_set_sysclk(cpu_dai, 0, sysclk, SND_SOC_CLOCK_IN); + if (ret < 0) + return ret; + + return ret; +} + static struct snd_soc_ops evm_ops = { .startup = evm_startup, .shutdown = evm_shutdown, .hw_params = evm_hw_params, };

+static struct snd_soc_ops evm_tda998x_ops = { + .startup = evm_tda998x_startup, + .shutdown = evm_shutdown, + .hw_params = evm_tda998x_hw_params, +}; + /* davinci-evm machine dapm widgets */ static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = { SND_SOC_DAPM_HP("Headphone Jack", NULL), @@ -152,6 +226,81 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd) return 0; }

+static unsigned int tda998x_hdmi_rates[] = { + 32000, + 44100, + 48000, + 88200, + 96000, +}; + +static struct snd_pcm_hw_constraint_list *evm_tda998x_rate_constraint( + struct snd_soc_card *soc_card) +{ + struct platform_device *pdev = to_platform_device(soc_card->dev); + unsigned sysclk = ((struct snd_soc_card_drvdata_davinci *) + snd_soc_card_get_drvdata(soc_card))->sysclk; + struct snd_pcm_hw_constraint_list *ret; + unsigned int *rates; + int i = 0, j = 0; + + ret = devm_kzalloc(soc_card->dev, sizeof(*ret) + + sizeof(tda998x_hdmi_rates), GFP_KERNEL); + if (!ret) { + dev_err(&pdev->dev, "Unable to allocate rate constraint!\n"); + return NULL; + } + + rates = (unsigned int *)&ret[1]; + ret->list = rates; + ret->mask = 0; + for (; i < ARRAY_SIZE(tda998x_hdmi_rates); i++) { + unsigned int bclk_freq = tda998x_hdmi_rates[i] * 2 * + snd_pcm_format_width(TDA998X_SAMPLE_FORMAT); + if (sysclk % bclk_freq == 0) { + rates[j++] = tda998x_hdmi_rates[i]; + dev_dbg(soc_card->dev, "Allowing rate %u\n", + tda998x_hdmi_rates[i]); + } + } + ret->count = j; + return ret; +} + +static const struct snd_soc_dapm_widget tda998x_dapm_widgets[] = { + SND_SOC_DAPM_OUTPUT("HDMI Out"), +}; + +static int evm_tda998x_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + struct snd_soc_dapm_context *dapm = &rtd->codec->dapm; + struct snd_soc_card *soc_card = rtd->codec->card; + struct snd_soc_card_drvdata_davinci *drvdata = + (struct snd_soc_card_drvdata_davinci *) + snd_soc_card_get_drvdata(soc_card); + int ret; + + ret = snd_soc_dai_set_clkdiv(cpu_dai, 0, 1); + if (ret < 0) + return ret; + + drvdata->rate_constraint = evm_tda998x_rate_constraint(soc_card); + + snd_soc_dapm_new_controls(dapm, tda998x_dapm_widgets, + ARRAY_SIZE(tda998x_dapm_widgets)); + + ret = snd_soc_of_parse_audio_routing(soc_card, "ti,audio-routing"); + + /* not connected */ + snd_soc_dapm_disable_pin(dapm, "RX"); + + /* always connected */ + snd_soc_dapm_enable_pin(dapm, "HDMI Out"); + + return 0; +} + /* davinci-evm digital audio interface glue - connects codec <--> CPU */ static struct snd_soc_dai_link dm6446_evm_dai = { .name = "TLV320AIC3X", @@ -337,7 +486,7 @@ static struct snd_soc_card da850_snd_soc_card = { #if defined(CONFIG_OF)

/* - * The struct is used as place holder. It will be completely + * The structs are used as place holders. They will be completely * filled with data from dt node. */ static struct snd_soc_dai_link evm_dai_tlv320aic3x = { @@ -350,10 +499,24 @@ static struct snd_soc_dai_link evm_dai_tlv320aic3x = { SND_SOC_DAIFMT_IB_NF, };

+static struct snd_soc_dai_link evm_dai_tda998x_hdmi = { + .name = "NXP TDA998x HDMI Chip", + .stream_name = "HDMI", + .codec_dai_name = "hdmi-hifi", + .ops = &evm_tda998x_ops, + .init = evm_tda998x_init, + .dai_fmt = (SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_IB_NF), +}; + static const struct of_device_id davinci_evm_dt_ids[] = { { .compatible = "ti,da830-evm-audio", - .data = (void *) &evm_dai_tlv320aic3x, + .data = &evm_dai_tlv320aic3x, + }, + { + .compatible = "ti,am33xx-beaglebone-black", + .data = &evm_dai_tda998x_hdmi, }, { /* sentinel */ } };

-- 1.7.9.5

Thomas Petazzoni

3:07 p.m.

New subject: [PATCH RFC 3/9] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus

Dear Jyri Sarha,

On Tue, 19 Nov 2013 14:12:23 +0200, Jyri Sarha wrote:

...

-- compatible : "ti,da830-evm-audio" : forDM365/DA8xx/OMAPL1x/AM33xx +- compatible : "ti,da830-evm-audio" : for DM365/DA8xx/OMAPL1x/AM33xx
          "ti,am33xx-beaglebone-black" : for Beaglebone-black HDMI audio

The compatible string namespace is a global namespace, and in the compatible string you've chosen, there's nothing that makes it specific to audio. "ti,am33xx-beaglebone-black" could be used for any other device, or even for the board as a whole, no? Maybe you need to suffix it with "-audio", like the existing compatible string for audio in this driver.

Thomas

-- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com

Jyri Sarha

12:12 p.m.

New subject: [PATCH RFC 4/9] ASoC: hdmi-codec: Add devicetree binding with documentation

Signed-off-by: Jyri Sarha jsarha@ti.com --- Documentation/devicetree/bindings/sound/hdmi.txt | 17 +++++++++++++++++ sound/soc/codecs/hdmi.c | 10 ++++++++++ 2 files changed, 27 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/hdmi.txt

diff --git a/Documentation/devicetree/bindings/sound/hdmi.txt b/Documentation/devicetree/bindings/sound/hdmi.txt new file mode 100644 index 0000000..31af7bc --- /dev/null +++ b/Documentation/devicetree/bindings/sound/hdmi.txt @@ -0,0 +1,17 @@ +Device-Tree bindings for dummy HDMI codec + +Required properties: + - compatible: should be "linux,hdmi-audio". + +CODEC output pins: + * TX + +CODEC input pins: + * RX + +Example node: + + hdmi_audio: hdmi_audio@0 { + compatible = "linux,hdmi-audio"; + status = "okay"; + }; diff --git a/sound/soc/codecs/hdmi.c b/sound/soc/codecs/hdmi.c index 68342b1..6d2fcf1 100644 --- a/sound/soc/codecs/hdmi.c +++ b/sound/soc/codecs/hdmi.c @@ -20,6 +20,7 @@ */ #include <linux/module.h> #include <sound/soc.h> +#include <linux/of_device.h>

#define DRV_NAME "hdmi-audio-codec"

@@ -60,6 +61,14 @@ static struct snd_soc_dai_driver hdmi_codec_dai = {

};

+#ifdef CONFIG_OF +static const struct of_device_id hdmi_audio_codec_ids[] = { + { .compatible = "linux,hdmi-audio", }, + { } +}; +MODULE_DEVICE_TABLE(of, hdmi_audio_codec_ids); +#endif + static struct snd_soc_codec_driver hdmi_codec = { .dapm_widgets = hdmi_widgets, .num_dapm_widgets = ARRAY_SIZE(hdmi_widgets), @@ -83,6 +92,7 @@ static struct platform_driver hdmi_codec_driver = { .driver = { .name = DRV_NAME, .owner = THIS_MODULE, + .of_match_table = of_match_ptr(hdmi_audio_codec_ids), },

.probe = hdmi_codec_probe,

-- 1.7.9.5

Mark Brown

5:50 p.m.

New subject: [PATCH RFC 4/9] ASoC: hdmi-codec: Add devicetree binding with documentation

On Tue, Nov 19, 2013 at 02:12:24PM +0200, Jyri Sarha wrote:

...

Signed-off-by: Jyri Sarha jsarha@ti.com

Documentation/devicetree/bindings/sound/hdmi.txt | 17 +++++++++++++++++ sound/soc/codecs/hdmi.c | 10 ++++++++++

Device tree bindings need to be sent to the DT folks for review as well. This looks OK but it should still go there.

Jean-Francois Moine

20 Nov 20 Nov

9:23 a.m.

New subject: [PATCH RFC 4/9] ASoC: hdmi-codec: Add devicetree binding with documentation

On Tue, 19 Nov 2013 14:12:24 +0200 Jyri Sarha jsarha@ti.com wrote:

...

Signed-off-by: Jyri Sarha jsarha@ti.com

Documentation/devicetree/bindings/sound/hdmi.txt | 17 +++++++++++++++++ sound/soc/codecs/hdmi.c | 10 ++++++++++ 2 files changed, 27 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/hdmi.txt

[snip]

A couple of months ago, I proposed a 'generic DT based simple codec' (http://www.spinics.net/lists/arm-kernel/msg274322.html) which was supposed to replace all of the `empty` codecs in a DT context. These codecs do nothing except defining some audio parameters. They are mainly spdif tx/rx, hdmi, bt-sco, dmic, wm8727 and wm8782.

This generic codec would have been used for the tda998x which is the HDMI transmitter of the Cubox. But, as its utility was not clear yet, I switched to the 'spdif transmitter' codec which has DT support. This last codec works fine without change, with either i2s or spdif input in the tda998x. It is well suited to the Cubox because the Marvell Armada 510 audio subsystem does not support sound recording (nor does the tda998x while the 'hdmi' code provides recording), and also because it supports a wider range of rates than the 'hdmi'codec (I have no problem with 22.05kHz audio).

But now, I am wondering again about these `empty`codecs: - in a DT context, should we continue to add / modify such codecs? - what do you think about my generic DT codec? (indeed, I would do a new version according to the previous remarks)

-- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/

Mark Brown

10:09 a.m.

New subject: [PATCH RFC 4/9] ASoC: hdmi-codec: Add devicetree binding with documentation

On Wed, Nov 20, 2013 at 10:23:42AM +0100, Jean-Francois Moine wrote:

...

But now, I am wondering again about these `empty`codecs:

in a DT context, should we continue to add / modify such codecs?

what do you think about my generic DT codec? (indeed, I would do a new version according to the previous remarks)

We still want to be able to have users just name the CODEC on their board rather than have to type in all the details from the datasheet, if we're going to try to amalgamate the drivers it should still let people do that.

Jean-Francois Moine

12:34 p.m.

New subject: [PATCH RFC 4/9] ASoC: hdmi-codec: Add devicetree binding with documentation

On Wed, 20 Nov 2013 10:09:59 +0000 Mark Brown broonie@kernel.org wrote:

...

On Wed, Nov 20, 2013 at 10:23:42AM +0100, Jean-Francois Moine wrote:

...
But now, I am wondering again about these `empty`codecs:

in a DT context, should we continue to add / modify such codecs?

what do you think about my generic DT codec? (indeed, I would do a new version according to the previous remarks)

We still want to be able to have users just name the CODEC on their board rather than have to type in all the details from the datasheet, if we're going to try to amalgamate the drivers it should still let people do that.

OK. But it seems to me that the codec is not tied to the board, but rather to the audio connector / transmitter.

In the case of the tda998x HDMI transmitter, either i2s or s/pdif may be used, thanks to the actual codecs 'hdmi' and 'spdif tx'. But they don't work the same way: the 'hdmi' codec handles both playback and record, and recording is disabled by program in the sound device, while the 'spdif tx' codec is selected by the codec-dai-name ("dit-hifi" - it is "dir-hifi" for recording). It would be nice if these codecs would have the same behaviour...

-- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/

Mark Brown

1:33 p.m.

New subject: [PATCH RFC 4/9] ASoC: hdmi-codec: Add devicetree binding with documentation

On Wed, Nov 20, 2013 at 01:34:58PM +0100, Jean-Francois Moine wrote:

...

Mark Brown broonie@kernel.org wrote:

...

...
We still want to be able to have users just name the CODEC on their board rather than have to type in all the details from the datasheet, if we're going to try to amalgamate the drivers it should still let people do that.

...

OK. But it seems to me that the codec is not tied to the board, but rather to the audio connector / transmitter.

No, not at all. The majority of these devices are simple CODECs, DACs and ADCs with no register control which are soldered down onto the board. What's connected beyond them is irrelevant. If anything the devices that don't have fixed functions are even more likely to want or need to have specific code, for example code could be written to enforce the results of HDMI capability discovery.

...

In the case of the tda998x HDMI transmitter, either i2s or s/pdif may be used, thanks to the actual codecs 'hdmi' and 'spdif tx'. But they don't work the same way: the 'hdmi' codec handles both playback and record, and recording is disabled by program in the sound device, while the 'spdif tx' codec is selected by the codec-dai-name ("dit-hifi" - it is "dir-hifi" for recording). It would be nice if these codecs would have the same behaviour...

Well, send patches refactoring one or the other then...

Jyri Sarha

19 Nov 19 Nov

12:12 p.m.

New subject: [PATCH RFC 5/9] ASoC: hdmi-codec: Add SNDRV_PCM_FMTBIT_32_LE playback format

The new playback format is needed for tda998x HDMI audio support. At the moment the only other user of this codec is omap-hdmi-audio. This change should not break anything because omap-hdmi-audio-dai, the cpu-dai of omap-hdmi-audio, enforces sufficient constraints to available sample formats.

Signed-off-by: Jyri Sarha jsarha@ti.com --- sound/soc/codecs/hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/codecs/hdmi.c b/sound/soc/codecs/hdmi.c index 6d2fcf1..9cb1c7d 100644 --- a/sound/soc/codecs/hdmi.c +++ b/sound/soc/codecs/hdmi.c @@ -45,7 +45,7 @@ static struct snd_soc_dai_driver hdmi_codec_dai = { SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000, .formats = SNDRV_PCM_FMTBIT_S16_LE | - SNDRV_PCM_FMTBIT_S24_LE, + SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE, }, .capture = { .stream_name = "Capture",

-- 1.7.9.5

Mark Brown

6:21 p.m.

New subject: [PATCH RFC 5/9] ASoC: hdmi-codec: Add SNDRV_PCM_FMTBIT_32_LE playback format

On Tue, Nov 19, 2013 at 02:12:25PM +0200, Jyri Sarha wrote:

...

The new playback format is needed for tda998x HDMI audio support. At the moment the only other user of this codec is omap-hdmi-audio. This change should not break anything because omap-hdmi-audio-dai, the cpu-dai of omap-hdmi-audio, enforces sufficient constraints to available sample formats.

Applied, thanks.

Jyri Sarha

12:12 p.m.

New subject: [PATCH RFC 6/9] ASoC: davinci: HDMI audio build for AM33XX and TDA998x

Adds configuration option for HDMI audio support for AM33XX based boards with NXP TDA998x HDMI transmitter. The audio is connected to NXP TDA998x trough McASP running in i2s mode.

Signed-off-by: Jyri Sarha jsarha@ti.com --- sound/soc/davinci/Kconfig | 12 ++++++++++++ sound/soc/davinci/Makefile | 1 + 2 files changed, 13 insertions(+)

diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig index a8ec1fc..40dd5d1 100644 --- a/sound/soc/davinci/Kconfig +++ b/sound/soc/davinci/Kconfig @@ -26,6 +26,18 @@ config SND_AM33XX_SOC_EVM AM335X-EVMSK, and BeagelBone with AudioCape boards have this setup.

+config SND_AM335X_SOC_NXPTDA_EVM + tristate "HDMI Audio for the AM33XX chip based boards with TDA998x" + depends on SND_DAVINCI_SOC && SOC_AM33XX + depends on DRM_TILCDC && DRM_I2C_NXP_TDA998X + select SND_SOC_HDMI_CODEC + select SND_DAVINCI_SOC_MCASP + help + Say Y or M if you want to add support for HDMI SoC audio on + AM33XX boards with NXP TDA998x HDMI transmitter. For example + BeagleBoneBack. The audio is connected to NXP TDA998x trough + McASP running in i2s mode. + config SND_DAVINCI_SOC_EVM tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM" depends on SND_DAVINCI_SOC diff --git a/sound/soc/davinci/Makefile b/sound/soc/davinci/Makefile index 744d4d9..7587a70 100644 --- a/sound/soc/davinci/Makefile +++ b/sound/soc/davinci/Makefile @@ -13,3 +13,4 @@ obj-$(CONFIG_SND_DAVINCI_SOC_VCIF) += snd-soc-davinci-vcif.o snd-soc-evm-objs := davinci-evm.o

obj-$(CONFIG_SND_DAVINCI_SOC_GENERIC_EVM) += snd-soc-evm.o +obj-$(CONFIG_SND_AM335X_SOC_NXPTDA_EVM) += snd-soc-evm.o

-- 1.7.9.5

Jyri Sarha

12:12 p.m.

New subject: [PATCH RFC 7/9] drm/tilcdc: Add I2C HDMI audio config for tda998x

The configuration is needed for HDMI audio. The "swap" and "mirr" parameters have to be correctly set in the configuration in order to have proper colors in the HDMI picture.

Signed-off-by: Jyri Sarha jsarha@ti.com cc: airlied@linux.ie --- drivers/gpu/drm/tilcdc/tilcdc_slave.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_slave.c b/drivers/gpu/drm/tilcdc/tilcdc_slave.c index 595068b..e43240a 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_slave.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_slave.c @@ -19,6 +19,7 @@ #include <linux/pinctrl/pinmux.h> #include <linux/pinctrl/consumer.h> #include <drm/drm_encoder_slave.h> +#include <drm/i2c/tda998x.h>

#include "tilcdc_drv.h"

@@ -111,8 +112,29 @@ static const struct drm_encoder_helper_funcs slave_encoder_helper_funcs = { .restore = drm_i2c_encoder_restore, };

+static struct tda998x_encoder_params tda998x_pdata = { + .swap_b = 0x3, + .mirr_b = 0x0, + .swap_a = 0x2, + .mirr_a = 0x0, + .swap_d = 0x1, + .mirr_d = 0x0, + .swap_c = 0x0, + .mirr_c = 0x0, + .swap_f = 0x5, + .mirr_f = 0x0, + .swap_e = 0x4, + .mirr_e = 0x0, + .audio_cfg = 0x3, /* I2S mode */ + .audio_clk_cfg = 1, /* select clock pin */ + .audio_frame[1] = 1, /* channels - 1 */ + .audio_format = AFMT_I2S, + .audio_sample_rate = 48000, +}; + static const struct i2c_board_info info = { - I2C_BOARD_INFO("tda998x", 0x70) + I2C_BOARD_INFO("tda998x", 0x70), + .platform_data = &tda998x_pdata, };

static struct drm_encoder *slave_encoder_create(struct drm_device *dev,

-- 1.7.9.5

Jyri Sarha

12:12 p.m.

New subject: [PATCH RFC 8/9] ARM: OMAP2+: omap2plus_defconfig: Enable tilcdc and TDA998X HDMI support

This enables HDMI video support on Beaglebone-Black.

Signed-off-by: Jyri Sarha jsarha@ti.com cc: tony@atomide.com --- arch/arm/configs/omap2plus_defconfig | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 254cf05..52b0d92 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -176,6 +176,9 @@ CONFIG_REGULATOR_TPS65023=y CONFIG_REGULATOR_TPS6507X=y CONFIG_REGULATOR_TPS65217=y CONFIG_REGULATOR_TPS65910=y +CONFIG_DRM=m +CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_TILCDC=m CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_MODE_HELPERS=y

-- 1.7.9.5

Jyri Sarha

12:12 p.m.

New subject: [PATCH RFC 9/9] ARM: OMAP2+: omap2plus_defconfig: Enable BeagleBone Black HDMI audio support

Select following: CONFIG_SND_DAVINCI_SOC=m CONFIG_SND_AM335X_SOC_NXPTDA_EVM=m

Signed-off-by: Jyri Sarha jsarha@ti.com cc: tony@atomide.com --- arch/arm/configs/omap2plus_defconfig | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 52b0d92..c1a9730 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -216,6 +216,8 @@ CONFIG_SND_OMAP_SOC=m CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m +CONFIG_SND_DAVINCI_SOC=m +CONFIG_SND_AM335X_SOC_NXPTDA_EVM=m CONFIG_USB=y CONFIG_USB_DEBUG=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

-- 1.7.9.5

Jyri Sarha

12:21 p.m.

New subject: [PATCH RFC] DTS Changes for Beaglebone-Black HDMI audio

The associated code changes can be found here: http://mailman.alsa-project.org/pipermail/alsa-devel/2013-November/068920.ht...

Jyri Sarha (1): ARM/dts: am335x-boneblack: Add HDMI audio support

arch/arm/boot/dts/am335x-boneblack.dts | 52 ++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)

-- 1.7.9.5

Jyri Sarha

12:21 p.m.

New subject: [PATCH RFC] ARM/dts: am335x-boneblack: Add HDMI audio support

Adds mcasp0_pins, clk_mcasp0_fixed, clk_mcasp0, mcasp0, hdmi_audio, and sound nodes.

Signed-off-by: Jyri Sarha jsarha@ti.com --- arch/arm/boot/dts/am335x-boneblack.dts | 52 ++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)

diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts index 6b71ad9..b5a2404 100644 --- a/arch/arm/boot/dts/am335x-boneblack.dts +++ b/arch/arm/boot/dts/am335x-boneblack.dts @@ -60,12 +60,35 @@ 0x1b0 0x03 /* xdma_event_intr0, OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */ >; }; + + mcasp0_pins: mcasp0_pins { + pinctrl-single,pins = < + 0x1ac (PIN_INPUT_PULLUP | MUX_MODE0) /* mcasp0_ahclkx.mcasp0_ahclkx */ + 0x19c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2 */ + 0x194 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */ + 0x190 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */ + 0x06c (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a11.gpio1_27 */ + >; + }; };

&lcdc { status = "okay"; };

+&mcasp0 { + pinctrl-names = "default"; + pinctrl-0 = <&mcasp0_pins>; + status = "okay"; + op-mode = <0>; /* MCASP_IIS_MODE */ + tdm-slots = <2>; + serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ + 0 0 1 0 + >; + tx-num-evt = <1>; + rx-num-evt = <1>; +}; + / { hdmi { compatible = "ti,tilcdc,slave"; @@ -75,4 +98,33 @@ pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; status = "okay"; }; + + clk_mcasp0_fixed: clk_mcasp0_fixed { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <24576000>; + }; + + clk_mcasp0: clk_mcasp0 { + #clock-cells = <0>; + compatible = "gpio-clock"; + clocks = <&clk_mcasp0_fixed>; + enable-gpios = <&gpio1 27 GPIO_ACTIVE_HIGH>; /* BeagleBone Black Clk enable on GPIO1_27 */ + }; + + hdmi_audio: hdmi_audio@0 { + compatible = "linux,hdmi-audio"; + status = "okay"; + }; + + sound { + compatible = "ti,am33xx-beaglebone-black"; + ti,model = "TI BeagleBone Black"; + ti,audio-codec = <&hdmi_audio>; + ti,mcasp-controller = <&mcasp0>; + ti,audio-routing = + "HDMI Out", "TX"; + clocks = <&clk_mcasp0>; + clock-names = "ti,codec-clock"; + }; };

-- 1.7.9.5

Benoit Cousson

1:02 p.m.

New subject: [PATCH RFC] ARM/dts: am335x-boneblack: Add HDMI audio support

Hi Jyri,

A side question related to audio cape support on BBB. In the "official" 3.8.13 CircuitCo version the HDMI audio support was breaking the audio-cape support due to some bad hacks in the mcasp driver.

Is this still the case with you series?

Thanks, Benoit

On 19/11/2013 13:21, Jyri Sarha wrote:

...

Adds mcasp0_pins, clk_mcasp0_fixed, clk_mcasp0, mcasp0, hdmi_audio, and sound nodes.

Signed-off-by: Jyri Sarha jsarha@ti.com

arch/arm/boot/dts/am335x-boneblack.dts | 52 ++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)

diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts index 6b71ad9..b5a2404 100644 --- a/arch/arm/boot/dts/am335x-boneblack.dts +++ b/arch/arm/boot/dts/am335x-boneblack.dts @@ -60,12 +60,35 @@ 0x1b0 0x03 /* xdma_event_intr0, OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */ >; };
mcasp0_pins: mcasp0_pins {
pinctrl-single,pins = <
	0x1ac (PIN_INPUT_PULLUP | MUX_MODE0) /* mcasp0_ahclkx.mcasp0_ahclkx */
	0x19c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2 */
	0x194 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */
	0x190 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mcasp0_aclkx.mcasp0_aclkx */
	0x06c (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a11.gpio1_27 */
>;
}; };

&lcdc { status = "okay"; };
+&mcasp0 {
pinctrl-names = "default";

pinctrl-0 = <&mcasp0_pins>;

status = "okay";

op-mode = <0>; /* MCASP_IIS_MODE */

tdm-slots = <2>;

serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
	0 0 1 0
>;
tx-num-evt = <1>;

rx-num-evt = <1>;
+};

/ { hdmi { compatible = "ti,tilcdc,slave";

@@ -75,4 +98,33 @@ pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; status = "okay"; };
clk_mcasp0_fixed: clk_mcasp0_fixed {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <24576000>;
};

clk_mcasp0: clk_mcasp0 {
#clock-cells = <0>;
compatible = "gpio-clock";
clocks = <&clk_mcasp0_fixed>;
enable-gpios = <&gpio1 27 GPIO_ACTIVE_HIGH>; /* BeagleBone Black Clk enable on GPIO1_27 */
};

hdmi_audio: hdmi_audio@0 {
      compatible = "linux,hdmi-audio";
      status = "okay";
};

sound {
compatible = "ti,am33xx-beaglebone-black";
ti,model = "TI BeagleBone Black";
ti,audio-codec = <&hdmi_audio>;
ti,mcasp-controller = <&mcasp0>;
ti,audio-routing =
	"HDMI Out",	"TX";
clocks = <&clk_mcasp0>;
clock-names = "ti,codec-clock";
}; };

-- Benoît Cousson BayLibre Embedded Linux Technology Lab www.baylibre.com

Jyri Sarha

1:29 p.m.

New subject: [PATCH RFC] ARM/dts: am335x-boneblack: Add HDMI audio support

On 11/19/2013 03:02 PM, Benoit Cousson wrote:

...

A side question related to audio cape support on BBB. In the "official" 3.8.13 CircuitCo version the HDMI audio support was breaking the audio-cape support due to some bad hacks in the mcasp driver.

Is this still the case with you series?

My patches do not touch davinci-mcasp at all and the davinci-evm changes should be backwards compatible. So if the audio-cape was working before my patches should not break it.

Best regards, Jyri

Jyri Sarha

8 Dec 8 Dec

12:16 p.m.

New subject: [RFC v2 0/8] Beaglebone-Black HDMI audio

Changes since the first RFC version of the patches: - Drop out already applied: ASoC: hdmi-codec: Add SNDRV_PCM_FMTBIT_32_LE playback format - Change sound node's compatible property form: "ti,am33xx-beaglebone-black" to "ti,am33xx-beaglebone-black-audio" - Some minor style issue fixes from TI internal review

The patches have been rebased on top of: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound topic/davinci

The associated dts changes will be sent shortly as a separate patch.

Best regards, Jyri

Jyri Sarha (8): clk: add gpio controlled clock ASoC: davinci-evm: Add named clock reference to DT bindings ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus ASoC: hdmi-codec: Add devicetree binding with documentation ASoC: davinci: HDMI audio build for AM33XX and TDA998x drm/tilcdc: Add I2C HDMI audio config for tda998x ARM: OMAP2+: omap2plus_defconfig: Enable tilcdc and TDA998X HDMI support ARM: OMAP2+: omap2plus_defconfig: Enable BeagleBone Black HDMI audio support

.../devicetree/bindings/clock/gpio-clock.txt | 21 ++ .../bindings/sound/davinci-evm-audio.txt | 13 +- Documentation/devicetree/bindings/sound/hdmi.txt | 17 ++ arch/arm/configs/omap2plus_defconfig | 5 + drivers/clk/Makefile | 1 + drivers/clk/clk-gpio.c | 210 ++++++++++++++++++ drivers/gpu/drm/tilcdc/tilcdc_slave.c | 24 ++- include/linux/clk-provider.h | 25 +++ sound/soc/codecs/hdmi.c | 10 + sound/soc/davinci/Kconfig | 12 ++ sound/soc/davinci/Makefile | 1 + sound/soc/davinci/davinci-evm.c | 227 +++++++++++++++++++- 12 files changed, 559 insertions(+), 7 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/gpio-clock.txt create mode 100644 Documentation/devicetree/bindings/sound/hdmi.txt create mode 100644 drivers/clk/clk-gpio.c

-- 1.7.9.5

Jyri Sarha

12:16 p.m.

New subject: [RFC v2 1/8] clk: add gpio controlled clock

Signed-off-by: Jyri Sarha jsarha@ti.com cc: mturquette@linaro.org cc: bcousson@baylibre.com --- .../devicetree/bindings/clock/gpio-clock.txt | 21 ++ drivers/clk/Makefile | 1 + drivers/clk/clk-gpio.c | 210 ++++++++++++++++++++ include/linux/clk-provider.h | 25 +++ 4 files changed, 257 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/gpio-clock.txt create mode 100644 drivers/clk/clk-gpio.c

# SoCs specific obj-$(CONFIG_ARCH_BCM2835) += clk-bcm2835.o diff --git a/drivers/clk/clk-gpio.c b/drivers/clk/clk-gpio.c new file mode 100644 index 0000000..e04b0e1 --- /dev/null +++ b/drivers/clk/clk-gpio.c @@ -0,0 +1,210 @@ +/* + * Copyright (C) 2013 Texas Instruments + * Author: Jyri Sarha jsarha@ti.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Gpio controlled clock implementation + */ + +#include <linux/clk-provider.h> +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/gpio.h> +#include <linux/of_gpio.h> +#include <linux/err.h> +#include <linux/device.h> + +/** + * DOC: basic gpio controlled clock which can be enabled and disabled + * with gpio output + * Traits of this clock: + * prepare - clk_(un)prepare only ensures parent is (un)prepared + * enable - clk_enable and clk_disable are functional & control gpio + * rate - inherits rate from parent. No clk_set_rate support + * parent - fixed parent. No clk_set_parent support + */ + +#define to_clk_gpio(_hw) container_of(_hw, struct clk_gpio, hw) + +static int clk_gpio_enable(struct clk_hw *hw) +{ + struct clk_gpio *gpio = to_clk_gpio(hw); + int value = gpio->active_low ? 0 : 1; + + gpio_set_value(gpio->gpio, value); + + return 0; +} + +static void clk_gpio_disable(struct clk_hw *hw) +{ + struct clk_gpio *gpio = to_clk_gpio(hw); + int value = gpio->active_low ? 1 : 0; + + gpio_set_value(gpio->gpio, value); +} + +static int clk_gpio_is_enabled(struct clk_hw *hw) +{ + struct clk_gpio *gpio = to_clk_gpio(hw); + int value = gpio_get_value(gpio->gpio); + + return gpio->active_low ? !value : value; +} + +const struct clk_ops clk_gpio_ops = { + .enable = clk_gpio_enable, + .disable = clk_gpio_disable, + .is_enabled = clk_gpio_is_enabled, +}; +EXPORT_SYMBOL_GPL(clk_gpio_ops); + +/** + * clk_register_gpio - register a gpip clock with the clock framework + * @dev: device that is registering this clock + * @name: name of this clock + * @parent_name: name of this clock's parent + * @flags: framework-specific flags for this clock + * @gpio: gpio to control this clock + * @active_low: gpio polarity + */ +struct clk *clk_register_gpio(struct device *dev, const char *name, + const char *parent_name, unsigned long flags, + unsigned int gpio, bool active_low) +{ + struct clk_gpio *clk_gpio; + struct clk *clk = ERR_PTR(-EINVAL); + struct clk_init_data init = { NULL }; + unsigned long gpio_flags; + int err; + + if (active_low) + gpio_flags = GPIOF_OUT_INIT_LOW; + else + gpio_flags = GPIOF_OUT_INIT_HIGH; + + err = gpio_request_one(gpio, gpio_flags, name); + + if (err) { + pr_err("%s: %s: Error requesting clock control gpio %u\n", + __func__, name, gpio); + clk = ERR_PTR(err); + goto clk_register_gpio_err; + } + + clk_gpio = kzalloc(sizeof(*clk_gpio), GFP_KERNEL); + + if (!clk_gpio) { + pr_err("%s: %s: could not allocate gpio clk\n", __func__, name); + clk = ERR_PTR(-ENOMEM); + goto clk_register_gpio_err; + } + + init.name = name; + init.ops = &clk_gpio_ops; + init.flags = flags | CLK_IS_BASIC; + init.parent_names = (parent_name ? &parent_name : NULL); + init.num_parents = (parent_name ? 1 : 0); + + clk_gpio->gpio = gpio; + clk_gpio->active_low = active_low; + clk_gpio->hw.init = &init; + + clk = clk_register(dev, &clk_gpio->hw); + + if (!IS_ERR(clk)) + return clk; + + kfree(clk_gpio); + +clk_register_gpio_err: + gpio_free(gpio); + + return clk; +} +EXPORT_SYMBOL_GPL(clk_register_gpio); + +#ifdef CONFIG_OF +/** + * The clk_register_gpio has to be delayed, because the EPROBE_DEFER + * can not be handled properly at of_clk_init() call time. + */ + +struct clk_gpio_delayed_register_data { + struct device_node *node; + struct mutex lock; /* Protect delayed clk registering */ + struct clk *clk; +}; + +static +struct clk *of_clk_gpio_delayed_register_get(struct of_phandle_args *clkspec, + void *_data) +{ + struct clk_gpio_delayed_register_data *data = + (struct clk_gpio_delayed_register_data *)_data; + struct clk *clk; + const char *clk_name = data->node->name; + const char *parent_name; + enum of_gpio_flags gpio_flags; + int gpio; + bool active_low; + + mutex_lock(&data->lock); + + if (data->clk) { + mutex_unlock(&data->lock); + return data->clk; + } + + gpio = of_get_named_gpio_flags(data->node, "enable-gpios", 0, + &gpio_flags); + + if (gpio < 0) { + mutex_unlock(&data->lock); + if (gpio != -EPROBE_DEFER) + pr_err("%s: %s: Can't get 'enable-gpios' DT property\n", + __func__, clk_name); + return ERR_PTR(gpio); + } + + active_low = gpio_flags & OF_GPIO_ACTIVE_LOW; + + parent_name = of_clk_get_parent_name(data->node, 0); + + clk = clk_register_gpio(NULL, clk_name, parent_name, 0, + gpio, active_low); + if (IS_ERR(clk)) { + mutex_unlock(&data->lock); + return clk; + } + + data->clk = clk; + mutex_unlock(&data->lock); + + return clk; +} + +/** + * of_gpio_clk_setup() - Setup function for gpio controlled clock + */ +void __init of_gpio_clk_setup(struct device_node *node) +{ + struct clk_gpio_delayed_register_data *data; + + data = kzalloc(sizeof(*data), GFP_KERNEL); + if (!data) { + pr_err("%s: could not allocate gpio clk\n", __func__); + return; + } + + data->node = node; + mutex_init(&data->lock); + + of_clk_add_provider(node, of_clk_gpio_delayed_register_get, data); +} +EXPORT_SYMBOL_GPL(of_gpio_clk_setup); +CLK_OF_DECLARE(gpio_clk, "gpio-clock", of_gpio_clk_setup); +#endif diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 73bdb69..9d433f7 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -407,6 +407,31 @@ struct clk *clk_register_composite(struct device *dev, const char *name, struct clk_hw *gate_hw, const struct clk_ops *gate_ops, unsigned long flags);

-- 1.7.9.5

Jyri Sarha

12:16 p.m.

New subject: [RFC v2 2/8] ASoC: davinci-evm: Add named clock reference to DT bindings

The referenced clock is used to get codec clock rate and the clock is disabled and enabled in startup and shutdown snd_soc_ops call backs. The change is also documented in DT bindigs document.

Signed-off-by: Jyri Sarha jsarha@ti.com cc: bcousson@baylibre.com --- .../bindings/sound/davinci-evm-audio.txt | 9 ++- sound/soc/davinci/davinci-evm.c | 60 +++++++++++++++++++- 2 files changed, 66 insertions(+), 3 deletions(-)

struct snd_soc_card_drvdata_davinci { + struct clk *mclk; unsigned sysclk; };

static struct snd_soc_ops evm_ops = { + .startup = evm_startup, + .shutdown = evm_shutdown, .hw_params = evm_hw_params, };

evm_soc_card.dai_link = dai; @@ -367,13 +392,38 @@ static int davinci_evm_probe(struct platform_device *pdev) if (ret) return ret;

snd_soc_unregister_card(card);

-- 1.7.9.5

Jyri Sarha

12:16 p.m.

New subject: [RFC v2 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus

Signed-off-by: Jyri Sarha jsarha@ti.com cc: bcousson@baylibre.com --- .../bindings/sound/davinci-evm-audio.txt | 4 +- sound/soc/davinci/davinci-evm.c | 167 +++++++++++++++++++- 2 files changed, 168 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt index 4aa00f6..f1e1031 100644 --- a/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt +++ b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt @@ -1,7 +1,9 @@ * Texas Instruments SoC audio setups with TLV320AIC3X Codec

Required properties: -- compatible : "ti,da830-evm-audio" : forDM365/DA8xx/OMAPL1x/AM33xx +- compatible : + "ti,da830-evm-audio" : for DM365/DA8xx/OMAPL1x/AM33xx + "ti,am33xx-beaglebone-black-audio" : for Beaglebone-black HDMI audio - ti,model : The user-visible name of this sound complex. - ti,audio-codec : The phandle of the TLV320AIC3x audio codec - ti,mcasp-controller : The phandle of the McASP controller diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index b28c9fd..3d3138d 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -21,6 +21,7 @@ #include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> +#include <sound/pcm_params.h>

#include <asm/dma.h> #include <asm/mach-types.h> @@ -33,8 +34,13 @@ struct snd_soc_card_drvdata_davinci { struct clk *mclk; unsigned sysclk; + struct snd_pcm_hw_constraint_list *rate_constraint; };

+static struct snd_soc_dai_link evm_dai_tda998x_hdmi = { + .name = "NXP TDA998x HDMI Chip", + .stream_name = "HDMI", + .codec_dai_name = "hdmi-hifi", + .ops = &evm_tda998x_ops, + .init = evm_tda998x_init, + .dai_fmt = (SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_IB_NF), +}; + static const struct of_device_id davinci_evm_dt_ids[] = { { .compatible = "ti,da830-evm-audio", - .data = (void *) &evm_dai_tlv320aic3x, + .data = &evm_dai_tlv320aic3x, + }, + { + .compatible = "ti,am33xx-beaglebone-black-audio", + .data = &evm_dai_tda998x_hdmi, }, { /* sentinel */ } };

-- 1.7.9.5

Jyri Sarha

12:16 p.m.

New subject: [RFC v2 4/8] ASoC: hdmi-codec: Add devicetree binding with documentation

Signed-off-by: Jyri Sarha jsarha@ti.com cc: bcousson@baylibre.com --- Documentation/devicetree/bindings/sound/hdmi.txt | 17 +++++++++++++++++ sound/soc/codecs/hdmi.c | 10 ++++++++++ 2 files changed, 27 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/hdmi.txt

diff --git a/Documentation/devicetree/bindings/sound/hdmi.txt b/Documentation/devicetree/bindings/sound/hdmi.txt new file mode 100644 index 0000000..31af7bc --- /dev/null +++ b/Documentation/devicetree/bindings/sound/hdmi.txt @@ -0,0 +1,17 @@ +Device-Tree bindings for dummy HDMI codec + +Required properties: + - compatible: should be "linux,hdmi-audio". + +CODEC output pins: + * TX + +CODEC input pins: + * RX + +Example node: + + hdmi_audio: hdmi_audio@0 { + compatible = "linux,hdmi-audio"; + status = "okay"; + }; diff --git a/sound/soc/codecs/hdmi.c b/sound/soc/codecs/hdmi.c index 32797a8..9cb1c7d 100644 --- a/sound/soc/codecs/hdmi.c +++ b/sound/soc/codecs/hdmi.c @@ -20,6 +20,7 @@ */ #include <linux/module.h> #include <sound/soc.h> +#include <linux/of_device.h>

#define DRV_NAME "hdmi-audio-codec"

@@ -60,6 +61,14 @@ static struct snd_soc_dai_driver hdmi_codec_dai = {

};

.probe = hdmi_codec_probe,

-- 1.7.9.5

Jyri Sarha

12:16 p.m.

New subject: [RFC v2 5/8] ASoC: davinci: HDMI audio build for AM33XX and TDA998x

Adds configuration option for HDMI audio support for AM33XX based boards with NXP TDA998x HDMI transmitter. The audio is connected to NXP TDA998x trough McASP running in i2s mode.

Signed-off-by: Jyri Sarha jsarha@ti.com --- sound/soc/davinci/Kconfig | 12 ++++++++++++ sound/soc/davinci/Makefile | 1 + 2 files changed, 13 insertions(+)

obj-$(CONFIG_SND_DAVINCI_SOC_GENERIC_EVM) += snd-soc-evm.o +obj-$(CONFIG_SND_AM335X_SOC_NXPTDA_EVM) += snd-soc-evm.o

-- 1.7.9.5

Jyri Sarha

12:16 p.m.

New subject: [RFC v2 6/8] drm/tilcdc: Add I2C HDMI audio config for tda998x

The configuration is needed for HDMI audio. The "swap" and "mirr" parameters have to be correctly set in the configuration in order to have proper colors in the HDMI picture.

Signed-off-by: Jyri Sarha jsarha@ti.com cc: airlied@linux.ie --- drivers/gpu/drm/tilcdc/tilcdc_slave.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)

#include "tilcdc_drv.h"

@@ -111,8 +112,29 @@ static const struct drm_encoder_helper_funcs slave_encoder_helper_funcs = { .restore = drm_i2c_encoder_restore, };

static struct drm_encoder *slave_encoder_create(struct drm_device *dev,

-- 1.7.9.5

Jyri Sarha

12:16 p.m.

New subject: [RFC v2 7/8] ARM: OMAP2+: omap2plus_defconfig: Enable tilcdc and TDA998X HDMI support

This enables HDMI video support on Beaglebone-Black.

Signed-off-by: Jyri Sarha jsarha@ti.com cc: tony@atomide.com --- arch/arm/configs/omap2plus_defconfig | 3 +++ 1 file changed, 3 insertions(+)

-- 1.7.9.5

Jyri Sarha

12:16 p.m.

New subject: [RFC v2 8/8] ARM: OMAP2+: omap2plus_defconfig: Enable BeagleBone Black HDMI audio support

Select following: CONFIG_SND_DAVINCI_SOC=m CONFIG_SND_AM335X_SOC_NXPTDA_EVM=m

Signed-off-by: Jyri Sarha jsarha@ti.com cc: tony@atomide.com --- arch/arm/configs/omap2plus_defconfig | 2 ++ 1 file changed, 2 insertions(+)

-- 1.7.9.5

Jyri Sarha

12:20 p.m.

New subject: [RFC v2] Beaglebone-Black HDMI audio

Changes since the first RFC version of the patch: - Change sound node's compatible property form: "ti,am33xx-beaglebone-black" to "ti,am33xx-beaglebone-black-audio"

The patch has been rebased on top of: git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git for_3.13/dts

The associated code changes can be found here: http://mailman.alsa-project.org/pipermail/alsa-devel/2013-December/069897.ht...

Best regards, Jyri

Jyri Sarha (1): ARM/dts: am335x-boneblack: Add HDMI audio support

arch/arm/boot/dts/am335x-boneblack.dts | 52 ++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)

-- 1.7.9.5

Jyri Sarha

12:20 p.m.

New subject: [RFC v2] ARM/dts: am335x-boneblack: Add HDMI audio support

Adds mcasp0_pins, clk_mcasp0_fixed, clk_mcasp0, mcasp0, hdmi_audio, and sound nodes.

Signed-off-by: Jyri Sarha jsarha@ti.com --- arch/arm/boot/dts/am335x-boneblack.dts | 52 ++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)

diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts index 6b71ad9..860ea98 100644 --- a/arch/arm/boot/dts/am335x-boneblack.dts +++ b/arch/arm/boot/dts/am335x-boneblack.dts @@ -60,12 +60,35 @@ 0x1b0 0x03 /* xdma_event_intr0, OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */ >; }; + + mcasp0_pins: mcasp0_pins { + pinctrl-single,pins = < + 0x1ac (PIN_INPUT_PULLUP | MUX_MODE0) /* mcasp0_ahclkx.mcasp0_ahclkx */ + 0x19c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2 */ + 0x194 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */ + 0x190 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */ + 0x06c (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a11.gpio1_27 */ + >; + }; };

&lcdc { status = "okay"; };

+&mcasp0 { + pinctrl-names = "default"; + pinctrl-0 = <&mcasp0_pins>; + status = "okay"; + op-mode = <0>; /* MCASP_IIS_MODE */ + tdm-slots = <2>; + serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ + 0 0 1 0 + >; + tx-num-evt = <1>; + rx-num-evt = <1>; +}; + / { hdmi { compatible = "ti,tilcdc,slave"; @@ -75,4 +98,33 @@ pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; status = "okay"; }; + + clk_mcasp0_fixed: clk_mcasp0_fixed { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <24576000>; + }; + + clk_mcasp0: clk_mcasp0 { + #clock-cells = <0>; + compatible = "gpio-clock"; + clocks = <&clk_mcasp0_fixed>; + enable-gpios = <&gpio1 27 GPIO_ACTIVE_HIGH>; /* BeagleBone Black Clk enable on GPIO1_27 */ + }; + + hdmi_audio: hdmi_audio@0 { + compatible = "linux,hdmi-audio"; + status = "okay"; + }; + + sound { + compatible = "ti,am33xx-beaglebone-black-audio"; + ti,model = "TI BeagleBone Black"; + ti,audio-codec = <&hdmi_audio>; + ti,mcasp-controller = <&mcasp0>; + ti,audio-routing = + "HDMI Out", "TX"; + clocks = <&clk_mcasp0>; + clock-names = "ti,codec-clock"; + }; };

-- 1.7.9.5

Jyri Sarha

20 Dec 20 Dec

10:36 a.m.

New subject: [PATCH RFC v2 REPOST 0/8] Beaglebone-Black HDMI audio

The patches have been rebased on top of: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound topic/davinci

The associated dts change can be found here: http://www.spinics.net/lists/linux-omap/msg101072.html

Best regards, Jyri

-- 1.7.9.5

Jyri Sarha

10:37 a.m.

New subject: [PATCH RFC v2 REPOST 1/8] clk: add gpio controlled clock

-- 1.7.9.5

Jyri Sarha

10:38 a.m.

New subject: [PATCH RFC v2 REPOST 2/8] ASoC: davinci-evm: Add named clock reference to DT bindings

The referenced clock is used to get codec clock rate and the clock is disabled and enabled in startup and shutdown snd_soc_ops call backs. The change is also documented in DT bindigs document.

struct snd_soc_card_drvdata_davinci { + struct clk *mclk; unsigned sysclk; };

static struct snd_soc_ops evm_ops = { + .startup = evm_startup, + .shutdown = evm_shutdown, .hw_params = evm_hw_params, };

evm_soc_card.dai_link = dai; @@ -367,13 +392,38 @@ static int davinci_evm_probe(struct platform_device *pdev) if (ret) return ret;

snd_soc_unregister_card(card);

-- 1.7.9.5

Mark Brown

31 Dec 31 Dec

1:16 p.m.

New subject: [PATCH RFC v2 REPOST 2/8] ASoC: davinci-evm: Add named clock reference to DT bindings

On Fri, Dec 20, 2013 at 12:38:27PM +0200, Jyri Sarha wrote:

...

+static int evm_startup(struct snd_pcm_substream *substream) +{
struct snd_soc_pcm_runtime *rtd = substream->private_data;

struct snd_soc_card *soc_card = rtd->codec->card;

struct clk *mclk = ((struct snd_soc_card_drvdata_davinci *)
	    snd_soc_card_get_drvdata(soc_card))->mclk;

Why do you need to cast away void? Ths indicates something is going wrong here though I can't see what.

...

mclk = of_clk_get_by_name(np, "ti,codec-clock");

if (PTR_ERR(mclk) == -EPROBE_DEFER) {
return -EPROBE_DEFER;
} else if (IS_ERR(mclk)) {
dev_dbg(&pdev->dev, "Codec clock not found.\n");
mclk = NULL;
}

The driver will unconditionally enable and disable the clock which I'd not expect to work well if we got an error, I'd expect either NULL checks on use or a fixed clock to be registered from code in the case where we're using the old binding.

I'd also expect to see devm_clk_get() used here, with the standard clock-names based lookup from DT.

Jyri Sarha

15 Jan 15 Jan

11:12 a.m.

New subject: [PATCH RFC v2 REPOST 2/8] ASoC: davinci-evm: Add named clock reference to DT bindings

On 12/31/2013 03:16 PM, Mark Brown wrote:

...

On Fri, Dec 20, 2013 at 12:38:27PM +0200, Jyri Sarha wrote:

...
+static int evm_startup(struct snd_pcm_substream *substream) +{
struct snd_soc_pcm_runtime *rtd = substream->private_data;

struct snd_soc_card *soc_card = rtd->codec->card;

struct clk *mclk = ((struct snd_soc_card_drvdata_davinci *)
	    snd_soc_card_get_drvdata(soc_card))->mclk;
Why do you need to cast away void? Ths indicates something is going wrong here though I can't see what.

I'll fix that.

...

...
mclk = of_clk_get_by_name(np, "ti,codec-clock");

if (PTR_ERR(mclk) == -EPROBE_DEFER) {
return -EPROBE_DEFER;
} else if (IS_ERR(mclk)) {
dev_dbg(&pdev->dev, "Codec clock not found.\n");
mclk = NULL;
}
The driver will unconditionally enable and disable the clock which I'd not expect to work well if we got an error, I'd expect either NULL checks on use or a fixed clock to be registered from code in the case where we're using the old binding.

In the drivers/clk/clk.c the clk == NULL is always checked before using the pointer. However, adding NULL checks would save couple of lock-unlock cycles. I'll add them.

...

I'd also expect to see devm_clk_get() used here, with the standard clock-names based lookup from DT.

I'll fix that.

Best regards, Jyri

Jyri Sarha

20 Dec 20 Dec

10:39 a.m.

New subject: [PATCH RFC v2 REPOST 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus

#include <asm/dma.h> #include <asm/mach-types.h> @@ -33,8 +34,13 @@ struct snd_soc_card_drvdata_davinci { struct clk *mclk; unsigned sysclk; + struct snd_pcm_hw_constraint_list *rate_constraint; };

+static struct snd_soc_dai_link evm_dai_tda998x_hdmi = { + .name = "NXP TDA998x HDMI Chip", + .stream_name = "HDMI", + .codec_dai_name = "hdmi-hifi", + .ops = &evm_tda998x_ops, + .init = evm_tda998x_init, + .dai_fmt = (SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_IB_NF), +}; + static const struct of_device_id davinci_evm_dt_ids[] = { { .compatible = "ti,da830-evm-audio", - .data = (void *) &evm_dai_tlv320aic3x, + .data = &evm_dai_tlv320aic3x, + }, + { + .compatible = "ti,am33xx-beaglebone-black-audio", + .data = &evm_dai_tda998x_hdmi, }, { /* sentinel */ } };

-- 1.7.9.5

Mark Brown

31 Dec 31 Dec

1:25 p.m.

New subject: [PATCH RFC v2 REPOST 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus

On Fri, Dec 20, 2013 at 12:39:38PM +0200, Jyri Sarha wrote:

...

Add machine driver support for BeagleBone-Black and other boards with tilcdc support and NXP TDA998X HDMI transmitter connected to McASP port in I2S mode. The 44100 Hz sample-rate and it's multiples can not be supported on Beaglebone-Black because of limited clock-rate

Can the drivers infer this from the clocks?

...

support. The only supported sample format is SNDRV_PCM_FORMAT_S32_LE. The 8 least significant bits are ignored.

Where does this constraint come from?

...

struct snd_soc_card_drvdata_davinci *drvdata =
(struct snd_soc_card_drvdata_davinci *)
snd_soc_card_get_drvdata(soc_card);

Again with the casting.

...

runtime->hw.rate_min = drvdata->rate_constraint->list[0];

runtime->hw.rate_max = drvdata->rate_constraint->list[
drvdata->rate_constraint->count - 1];
runtime->hw.rates = SNDRV_PCM_RATE_KNOT;

snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
		   drvdata->rate_constraint);
snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_CHANNELS,
		     2, 2);

Why not just set all this statically when registering the DAI?

...

+static unsigned int evm_get_bclk(struct snd_pcm_hw_params *params) +{

int sample_size = snd_pcm_format_width(params_format(params));

int rate = params_rate(params);

int channels = params_channels(params);

return sample_size * channels * rate;

+}

snd_soc_params_to_frame_size().

...

+static int evm_tda998x_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 *soc_card = codec->card;

struct platform_device *pdev = to_platform_device(soc_card->dev);

unsigned int bclk_freq = evm_get_bclk(params);

unsigned sysclk = ((struct snd_soc_card_drvdata_davinci *)
	   snd_soc_card_get_drvdata(soc_card))->sysclk;
int ret;

ret = snd_soc_dai_set_clkdiv(cpu_dai, 1, sysclk / bclk_freq);

if (ret < 0) {
dev_err(&pdev->dev, "can't set CPU DAI clock divider %d\n",
	ret);
return ret;
}

This looks like something the DAI driver ought to be able to work out for itself based on the clock rate and sample format.

...

+static unsigned int tda998x_hdmi_rates[] = {

32000,

44100,

48000,

88200,

96000,

+};

The changelog said that 44.1kHz and its multiples couldn't be supported - is that just the multiples?

...

+static struct snd_pcm_hw_constraint_list *evm_tda998x_rate_constraint(

struct snd_soc_card *soc_card)

+{
struct platform_device *pdev = to_platform_device(soc_card->dev);

unsigned sysclk = ((struct snd_soc_card_drvdata_davinci *)
	   snd_soc_card_get_drvdata(soc_card))->sysclk;
struct snd_pcm_hw_constraint_list *ret;

unsigned int *rates;

int i = 0, j = 0;

ret = devm_kzalloc(soc_card->dev, sizeof(*ret) +
	   sizeof(tda998x_hdmi_rates), GFP_KERNEL);
if (!ret) {
dev_err(&pdev->dev, "Unable to allocate rate constraint!\n");

OOM is already very verbose, don't bother.

...

return NULL;
}

rates = (unsigned int *)&ret[1];

ret->list = rates;

ret->mask = 0;

for (; i < ARRAY_SIZE(tda998x_hdmi_rates); i++) {

This is all very hard to read. Why has the assignment of i been moved up to the declaration rather than put here as is idiomatic, what's all the casting going on with ret and in general?

Jyri Sarha

15 Jan 15 Jan

11:27 a.m.

New subject: [PATCH RFC v2 REPOST 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus

On 12/31/2013 03:25 PM, Mark Brown wrote:

...

On Fri, Dec 20, 2013 at 12:39:38PM +0200, Jyri Sarha wrote:

...
Add machine driver support for BeagleBone-Black and other boards with tilcdc support and NXP TDA998X HDMI transmitter connected to McASP port in I2S mode. The 44100 Hz sample-rate and it's multiples can not be supported on Beaglebone-Black because of limited clock-rate

Can the drivers infer this from the clocks?

It does. The commit message is referring to a BBB HW specific feature. Guess I should remove that note from the commit message, since it does not concern the code itself.

...

...
support. The only supported sample format is SNDRV_PCM_FORMAT_S32_LE. The 8 least significant bits are ignored.

Where does this constraint come from?

From driver/gpu/drm/i2c/tda998x_drv.c. The driver configures CTS_N register statically to a value that works only with 4 byte samples. According to my tests it is possible to support 3 and 2 byte samples too by changing the CTS_N register value, but I am not sure if the configuration can be changed on the fly. My data sheet of the nxp chip is very vague about the register definitions, but I suppose the register configures some clock divider on the chip. HDMI supports only upto 24bit audio and the data sheet states that any extraneous least significant bits are ignored.

...

...
struct snd_soc_card_drvdata_davinci *drvdata =
(struct snd_soc_card_drvdata_davinci *)
snd_soc_card_get_drvdata(soc_card);
Again with the casting.

I'll fix that.

...

...
runtime->hw.rate_min = drvdata->rate_constraint->list[0];

runtime->hw.rate_max = drvdata->rate_constraint->list[
drvdata->rate_constraint->count - 1];
runtime->hw.rates = SNDRV_PCM_RATE_KNOT;

snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
		   drvdata->rate_constraint);
snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_CHANNELS,
		     2, 2);
Why not just set all this statically when registering the DAI?

Because there is no relevant DAI to where to put these limitations. I did not want to add yet another dummy codec driver, but decided to use the already existing ASoC HDMI codec. By default the driver support all audio params supported by HDMI. The limitations are coming from NXP chip, the NXP driver, and because the chip is used in i2s mode. In other words the limitation is coming from machine setup, not from the DAIs.

...

...
+static unsigned int evm_get_bclk(struct snd_pcm_hw_params *params) +{

int sample_size = snd_pcm_format_width(params_format(params));

int rate = params_rate(params);

int channels = params_channels(params);

return sample_size * channels * rate;

+}

snd_soc_params_to_frame_size().

Rather snd_soc_params_to_bclk(), but thanks. I'll use that.

...

...
+static int evm_tda998x_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 *soc_card = codec->card;

struct platform_device *pdev = to_platform_device(soc_card->dev);

unsigned int bclk_freq = evm_get_bclk(params);

unsigned sysclk = ((struct snd_soc_card_drvdata_davinci *)
	   snd_soc_card_get_drvdata(soc_card))->sysclk;
int ret;

ret = snd_soc_dai_set_clkdiv(cpu_dai, 1, sysclk / bclk_freq);

if (ret < 0) {
dev_err(&pdev->dev, "can't set CPU DAI clock divider %d\n",
	ret);
return ret;
}
This looks like something the DAI driver ought to be able to work out for itself based on the clock rate and sample format.

I guess that could be done.

Peter, what do you say if I set BCLK divider automatically if mcasp set_sysclk() has been called with SND_SOC_CLOCK_IN?

...

...
+static unsigned int tda998x_hdmi_rates[] = {

32000,

44100,

48000,

88200,

96000,

+};

The changelog said that 44.1kHz and its multiples couldn't be supported

is that just the multiples?

As I mentioned earlier, that is a BBB HW limitation only, the code bellow is able to decide what rates are available based on the sysclk rate.

...

...
+static struct snd_pcm_hw_constraint_list *evm_tda998x_rate_constraint(

struct snd_soc_card *soc_card)

+{
struct platform_device *pdev = to_platform_device(soc_card->dev);

unsigned sysclk = ((struct snd_soc_card_drvdata_davinci *)
	   snd_soc_card_get_drvdata(soc_card))->sysclk;
struct snd_pcm_hw_constraint_list *ret;

unsigned int *rates;

int i = 0, j = 0;

ret = devm_kzalloc(soc_card->dev, sizeof(*ret) +
	   sizeof(tda998x_hdmi_rates), GFP_KERNEL);
if (!ret) {
dev_err(&pdev->dev, "Unable to allocate rate constraint!\n");
OOM is already very verbose, don't bother.

Ok, I'll remove that.

...

...
return NULL;
}

rates = (unsigned int *)&ret[1];

ret->list = rates;

ret->mask = 0;

for (; i < ARRAY_SIZE(tda998x_hdmi_rates); i++) {
This is all very hard to read. Why has the assignment of i been moved up to the declaration rather than put here as is idiomatic, what's all the casting going on with ret and in general?

No excuse for i initialization, I'll fix that. The casting is just to survive with just one kmalloc call instead of separate memory blobs for struct snd_pcm_hw_constraint_list and referred list of supported sample rates. I'll allocate a second blob, if that is easier to read.

Best regards, Jyri

Anssi Hannula

1:48 p.m.

New subject: [alsa-devel] [PATCH RFC v2 REPOST 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus

15.01.2014 13:27, Jyri Sarha kirjoitti:

...

On 12/31/2013 03:25 PM, Mark Brown wrote:

...
On Fri, Dec 20, 2013 at 12:39:38PM +0200, Jyri Sarha wrote:

...
support. The only supported sample format is SNDRV_PCM_FORMAT_S32_LE. The 8 least significant bits are ignored.

Where does this constraint come from?

From driver/gpu/drm/i2c/tda998x_drv.c. The driver configures CTS_N register statically to a value that works only with 4 byte samples. According to my tests it is possible to support 3 and 2 byte samples too by changing the CTS_N register value, but I am not sure if the configuration can be changed on the fly. My data sheet of the nxp chip is very vague about the register definitions, but I suppose the register configures some clock divider on the chip. HDMI supports only upto 24bit audio and the data sheet states that any extraneous least significant bits are ignored.

That sounds strange, CTS/N values only depend on audio sample rate and TMDS/video clock, not on the audio format or the size of samples (HDMI spec sec 7.2 - Audio Sample Clock Capture and Regeneration).

Sure there isn't anything more going on (like the used HDMI sink being more tolerant to wrong CTS/N with 4-byte samples, or more likely something else I can't immediately think of)?

BTW, radeon driver has some code that calculates static CTS/N values since the hw autogeneration is not reliable there: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/drivers... Not that it directly helps now, but just for the record...

-- Anssi Hannula

Jyri Sarha

4:28 p.m.

New subject: [alsa-devel] [PATCH RFC v2 REPOST 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus

On 01/15/2014 03:48 PM, Anssi Hannula wrote:

...

15.01.2014 13:27, Jyri Sarha kirjoitti:

...
On 12/31/2013 03:25 PM, Mark Brown wrote:

...
On Fri, Dec 20, 2013 at 12:39:38PM +0200, Jyri Sarha wrote:

...
support. The only supported sample format is SNDRV_PCM_FORMAT_S32_LE. The 8 least significant bits are ignored.

Where does this constraint come from?

From driver/gpu/drm/i2c/tda998x_drv.c. The driver configures CTS_N register statically to a value that works only with 4 byte samples. According to my tests it is possible to support 3 and 2 byte samples too by changing the CTS_N register value, but I am not sure if the configuration can be changed on the fly. My data sheet of the nxp chip is very vague about the register definitions, but I suppose the register configures some clock divider on the chip. HDMI supports only upto 24bit audio and the data sheet states that any extraneous least significant bits are ignored.

That sounds strange, CTS/N values only depend on audio sample rate and TMDS/video clock, not on the audio format or the size of samples (HDMI spec sec 7.2 - Audio Sample Clock Capture and Regeneration).

Sure there isn't anything more going on (like the used HDMI sink being more tolerant to wrong CTS/N with 4-byte samples, or more likely something else I can't immediately think of)?

On theoretical level I am not really sure about anything, because have not been able to get my hands on proper NXP TDA19988 documentation.

However, while playing around with my Beaglebone-Black I have have found out in practice that by changing CTS_N register's (page 0x11 reg 0x0c) K_SEL bits (bit 2 to 0)[1] I can get 2, 3 and 4 byte samples to work consistently by setting:

K_SEL = 1 for SNDRV_PCM_FORMAT_S16_LE K_SEL = 2 for SNDRV_PCM_FORMAT_S24_3LE K_SEL = 3 for SNDRV_PCM_FORMAT_S32_LE

Because I do not really know what is going on, I did not want to suggest any changes to the driver and just use the format that works with the current driver version.

The HDMI sinks I have been using are a Toshiba 22B2LF1G and Thomson 42E90NF32 televisions. About those I just know that they both behave the same way.

Best regards, Jyri

[1] The closest data sheet that has any description about the chip registers I have found is this: http://media.digikey.com/pdf/Data%20Sheets/NXP%20PDFs/TDA9983B.pdf

Jean-Francois Moine

3:51 p.m.

New subject: [alsa-devel] [PATCH RFC v2 REPOST 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus

On Wed, 15 Jan 2014 13:27:21 +0200 Jyri Sarha jsarha@ti.com wrote:

...

From driver/gpu/drm/i2c/tda998x_drv.c. The driver configures CTS_N register statically to a value that works only with 4 byte samples. According to my tests it is possible to support 3 and 2 byte samples too by changing the CTS_N register value, but I am not sure if the configuration can be changed on the fly. My data sheet of the nxp chip is very vague about the register definitions, but I suppose the register configures some clock divider on the chip. HDMI supports only upto 24bit audio and the data sheet states that any extraneous least significant bits are ignored.

In the tda998x driver, the CTS_N is automatic (AIP_CNTRL_0_ACR_MAN is not set).

Then, in my Cubox (Marvell A510 + tda19988), the 16, 24 and 32 bits formats are working well with I2S input at any rate.

-- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/

Jyri Sarha

22 Jan 22 Jan

9:20 a.m.

New subject: [alsa-devel] [PATCH RFC v2 REPOST 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus

On 01/15/2014 05:51 PM, Jean-Francois Moine wrote:

...

On Wed, 15 Jan 2014 13:27:21 +0200 Jyri Sarha jsarha@ti.com wrote:

...
From driver/gpu/drm/i2c/tda998x_drv.c. The driver configures CTS_N register statically to a value that works only with 4 byte samples. According to my tests it is possible to support 3 and 2 byte samples too by changing the CTS_N register value, but I am not sure if the configuration can be changed on the fly. My data sheet of the nxp chip is very vague about the register definitions, but I suppose the register configures some clock divider on the chip. HDMI supports only upto 24bit audio and the data sheet states that any extraneous least significant bits are ignored.

In the tda998x driver, the CTS_N is automatic (AIP_CNTRL_0_ACR_MAN is not set).

Then, in my Cubox (Marvell A510 + tda19988), the 16, 24 and 32 bits formats are working well with I2S input at any rate.

Could you refer the kernel version (main line?) and the involved ASoC drivers so could take I a look if there is something I could do differently?

Best regards, Jyri

Jean-Francois Moine

10:19 a.m.

New subject: [alsa-devel] [PATCH RFC v2 REPOST 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus

On Wed, 22 Jan 2014 11:20:32 +0200 Jyri Sarha jsarha@ti.com wrote:

...

On 01/15/2014 05:51 PM, Jean-Francois Moine wrote:

...
On Wed, 15 Jan 2014 13:27:21 +0200 Jyri Sarha jsarha@ti.com wrote:

...
From driver/gpu/drm/i2c/tda998x_drv.c. The driver configures CTS_N register statically to a value that works only with 4 byte samples. According to my tests it is possible to support 3 and 2 byte samples too by changing the CTS_N register value, but I am not sure if the configuration can be changed on the fly. My data sheet of the nxp chip is very vague about the register definitions, but I suppose the register configures some clock divider on the chip. HDMI supports only upto 24bit audio and the data sheet states that any extraneous least significant bits are ignored.

In the tda998x driver, the CTS_N is automatic (AIP_CNTRL_0_ACR_MAN is not set).

Then, in my Cubox (Marvell A510 + tda19988), the 16, 24 and 32 bits formats are working well with I2S input at any rate.

Could you refer the kernel version (main line?) and the involved ASoC drivers so could take I a look if there is something I could do differently?

Both drivers are in the kernel main line.

The ASoC is in sound/soc/kirkwood/. kirkwood-i2s.c defines the DAIs I2S and S/PDIF outputs.

As both I2S and S/PDIF may be used for HDMI output in the Cubox, I wrote a tda998x CODEC which gets the audio ports from the DT and dynamically sets these ports and the audio type (i2s / spdif) on audio streaming start. I have not submitted yet this codec and the associated changes in tda998x, because I am waiting for a first patch series on the tda998x to be applied (http://lists.freedesktop.org/archives/dri-devel/2014-January/051552.html).

-- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/

Jean-Francois Moine

10:46 a.m.

New subject: [alsa-devel] [PATCH RFC v2 REPOST 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus

On Wed, 22 Jan 2014 11:19:53 +0100 Jean-Francois Moine moinejf@free.fr wrote:

...

As both I2S and S/PDIF may be used for HDMI output in the Cubox, I wrote a tda998x CODEC which gets the audio ports from the DT and dynamically sets these ports and the audio type (i2s / spdif) on audio streaming start. I have not submitted yet this codec and the associated changes in tda998x, because I am waiting for a first patch series on the tda998x to be applied (http://lists.freedesktop.org/archives/dri-devel/2014-January/051552.html).

Sorry, the last patch request is

http://lists.freedesktop.org/archives/dri-devel/2014-January/052201.html

-- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/

Jyri Sarha

24 Jan 24 Jan

12:57 p.m.

New subject: [alsa-devel] [PATCH RFC v2 REPOST 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus

On 01/22/2014 12:46 PM, Jean-Francois Moine wrote:

...

On Wed, 22 Jan 2014 11:19:53 +0100 Jean-Francois Moine moinejf@free.fr wrote:

...
As both I2S and S/PDIF may be used for HDMI output in the Cubox, I wrote a tda998x CODEC which gets the audio ports from the DT and dynamically sets these ports and the audio type (i2s / spdif) on audio streaming start. I have not submitted yet this codec and the associated changes in tda998x, because I am waiting for a first patch series on the tda998x to be applied (http://lists.freedesktop.org/archives/dri-devel/2014-January/051552.html).

Sorry, the last patch request is

http://lists.freedesktop.org/archives/dri-devel/2014-January/052201.html

I checked the sample format support again with and without your patches.

On my other TV all the formats produce something that sounds Ok if you do not listen too carefully or use sine sweep etc. make the short comings audible. The other TV is completely silent when playing the "non supported" formats.

Could you give me a link to a git repo with your tda998x codec code so I could prepare to use that too?

Best regards, Jyri

Jean-Francois Moine

4:54 p.m.

New subject: [alsa-devel] [PATCH RFC v2 REPOST 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus

On Fri, 24 Jan 2014 14:57:09 +0200 Jyri Sarha jsarha@ti.com wrote:

...

Could you give me a link to a git repo with your tda998x codec code so I could prepare to use that too?

I have no git repo. Instead, here is the source.

It goes into sound/soc/codecs and is selected with CONFIG_OF and CONFIG_DRM_I2C_NXP_TDA998X.

It needs 2 exported functions of the tda998x driver: the first one to select the audio port (tda998x_audio_update) and the other one to get the ELD (tda998x_audio_get_eld).

For these functions to receive the correct i2c_client, the codec searches the tda998x driver in the DT by its compatible "nxp,tda998x". If the tda998x is loaded by drm_i2c_encoder_init(), it should not be declared in the DT, so, this raises a problem. I don't know what must be done in this case.

The codec is used with the simple card as the sound card. For you, the DT could be:

hdmi_codec: hdmi-codec { compatible = "nxp,tda998x-codec"; #sound-dai-cells = <1>; audio-ports = <0x03>, <0x04>; /* i2s - s/pdif */ };

sound { compatible = "simple-audio-card"; simple-audio-card,cpu { sound-dai = <&audio1 1>; format = "i2s"; }; simple-audio-card,codec { sound-dai = <&hdmi_codec 0>; /* i2s */ }; };

('audio1' is the audio controller)

-------------------8<---------------- source sound/soc/codecs/tda998x.c /* * ALSA SoC TDA998X driver * * This driver is used by the NXP TDA998x HDMI transmitter. * * Copyright (C) 2014 Jean-Francois Moine * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */

#include <linux/module.h> #include <sound/soc.h> #include <sound/pcm.h> #include <linux/of.h> #include <linux/i2c.h> #include <drm/drm_encoder_slave.h> #include <drm/i2c/tda998x.h>

#define TDA998X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ SNDRV_PCM_FMTBIT_S20_3LE | \ SNDRV_PCM_FMTBIT_S24_LE | \ SNDRV_PCM_FMTBIT_S32_LE)

struct tda_priv { struct i2c_client *i2c_client; struct snd_soc_codec *codec; u32 ports[2]; int dai_id; u8 *eld; };

static void tda_get_encoder(struct tda_priv *priv) { struct snd_soc_codec *codec = priv->codec; struct device_node *np; struct i2c_client *i2c_client; static const struct of_device_id tda_dt[] = { { .compatible = "nxp,tda998x" }, { }, };

/* search the tda998x device (only one!) */ np = of_find_matching_node_and_match(NULL, tda_dt, NULL); if (!np || !of_device_is_available(np)) { dev_err(codec->dev, "No tda998x in DT\n"); return; } i2c_client = of_find_i2c_device_by_node(np); of_node_put(np); if (!i2c_client) { dev_err(codec->dev, "no tda998x i2c client\n"); return; } if (!i2c_get_clientdata(i2c_client)) { dev_err(codec->dev, "tda998x not initialized\n"); return; }

priv->i2c_client = i2c_client; }

static int tda_start_stop(struct tda_priv *priv, int start) { int format; u32 port;

if (!priv->i2c_client) { tda_get_encoder(priv); if (!priv->i2c_client) return -EINVAL; }

/* give the audio input type and ports to the HDMI encoder */ format = start ? priv->dai_id : 0; switch (format) { case AFMT_I2S: port = priv->ports[0]; break; default: case AFMT_SPDIF: port = priv->ports[1]; break; } tda998x_audio_update(priv->i2c_client, format, port); return 0; }

static int tda_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct tda_priv *priv = snd_soc_codec_get_drvdata(dai->codec); u8 *eld = NULL; static unsigned rates_mask[] = { SNDRV_PCM_RATE_32000, SNDRV_PCM_RATE_44100, SNDRV_PCM_RATE_48000, SNDRV_PCM_RATE_88200, SNDRV_PCM_RATE_96000, SNDRV_PCM_RATE_176400, SNDRV_PCM_RATE_192000, };

/* memorize the used DAI */ priv->dai_id = dai->id;

/* get the ELD from the tda998x driver */ if (!priv->i2c_client) tda_get_encoder(priv); if (priv->i2c_client) eld = tda998x_audio_get_eld(priv->i2c_client);

/* limit the hw params from the ELD (EDID) */ if (eld) { struct snd_soc_dai_driver *dai_drv = dai->driver; struct snd_soc_pcm_stream *stream = &dai_drv->playback; u8 *sad; int sad_count; unsigned eld_ver, mnl, rates, rate_mask, i; unsigned max_channels;

eld_ver = eld[0] >> 3; if (eld_ver != 2 && eld_ver != 31) return 0;

mnl = eld[4] & 0x1f; if (mnl > 16) return 0;

sad_count = eld[5] >> 4; sad = eld + 20 + mnl;

/* Start from the basic audio settings */ max_channels = 2; rates = 0; while (sad_count--) { switch (sad[0] & 0x78) { case 0x08: /* PCM */ max_channels = max(max_channels, (sad[0] & 7) + 1u); rates |= sad[1]; break; } sad += 3; }

for (rate_mask = i = 0; i < ARRAY_SIZE(rates_mask); i++) if (rates & 1 << i) rate_mask |= rates_mask[i];

/* change the snd_soc_pcm_stream values of the driver */ stream->rates = rate_mask; stream->channels_max = max_channels; }

/* start the TDA998x audio */ return tda_start_stop(priv, 1); }

static void tda_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct tda_priv *priv = snd_soc_codec_get_drvdata(dai->codec);

priv->dai_id = 0; tda_start_stop(priv, 0); }

static const struct snd_soc_dai_ops tda_ops = { .startup = tda_startup, .shutdown = tda_shutdown, };

static const struct snd_soc_dai_driver tda998x_dai[] = { { .name = "i2s-hifi", .id = AFMT_I2S, .playback = { .stream_name = "HDMI I2S Playback", .channels_min = 1, .channels_max = 8, .rates = SNDRV_PCM_RATE_CONTINUOUS, .rate_min = 5512, .rate_max = 192000, .formats = TDA998X_FORMATS,

}, .ops = &tda_ops, }, { .name = "spdif-hifi", .id = AFMT_SPDIF, .playback = { .stream_name = "HDMI SPDIF Playback", .channels_min = 1, .channels_max = 2, .rates = SNDRV_PCM_RATE_CONTINUOUS, .rate_min = 22050, .rate_max = 192000, .formats = TDA998X_FORMATS, }, .ops = &tda_ops, }, };

static const struct snd_soc_dapm_widget tda_widgets[] = { SND_SOC_DAPM_OUTPUT("hdmi-out"), }; static const struct snd_soc_dapm_route tda_routes[] = { { "hdmi-out", NULL, "HDMI I2S Playback" }, { "hdmi-out", NULL, "HDMI SPDIF Playback" }, };

static int tda_probe(struct snd_soc_codec *codec) { struct tda_priv *priv; struct device_node *np; int i, ret;

priv = devm_kzalloc(codec->dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; snd_soc_codec_set_drvdata(codec, priv); priv->codec = codec;

/* get the audio input ports (I2s and S/PDIF) */ np = codec->dev->of_node; for (i = 0; i < 2; i++) { ret = of_property_read_u32_index(np, "audio-ports", i, &priv->ports[i]); if (ret) { if (i == 0) dev_err(codec->dev, "bad or missing audio-ports\n"); break; } }

return 0; }

static const struct snd_soc_codec_driver soc_codec_tda998x = { .probe = tda_probe, .dapm_widgets = tda_widgets, .num_dapm_widgets = ARRAY_SIZE(tda_widgets), .dapm_routes = tda_routes, .num_dapm_routes = ARRAY_SIZE(tda_routes), };

static int tda998x_dev_probe(struct platform_device *pdev) { struct snd_soc_dai_driver *dai_drv;

/* copy the DAI driver to a writable area */ dai_drv = devm_kzalloc(&pdev->dev, sizeof(tda998x_dai), GFP_KERNEL); if (!dai_drv) return -ENOMEM; memcpy(dai_drv, tda998x_dai, sizeof(tda998x_dai));

return snd_soc_register_codec(&pdev->dev, &soc_codec_tda998x, dai_drv, ARRAY_SIZE(tda998x_dai)); }

static int tda998x_dev_remove(struct platform_device *pdev) { snd_soc_unregister_codec(&pdev->dev); return 0; }

static const struct of_device_id tda998x_codec_ids[] = { { .compatible = "nxp,tda998x-codec", }, { } }; MODULE_DEVICE_TABLE(of, tda998x_codec_ids);

static struct platform_driver tda998x_driver = { .probe = tda998x_dev_probe, .remove = tda998x_dev_remove, .driver = { .name = "tda998x-codec", .owner = THIS_MODULE, .of_match_table = tda998x_codec_ids, }, };

module_platform_driver(tda998x_driver);

MODULE_AUTHOR("Jean-Francois Moine"); MODULE_DESCRIPTION("TDA998x codec driver"); MODULE_LICENSE("GPL"); -------------------8<----------------

-- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/

Mark Brown

21 Jan 21 Jan

7:15 p.m.

New subject: [PATCH RFC v2 REPOST 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus

On Wed, Jan 15, 2014 at 01:27:21PM +0200, Jyri Sarha wrote:

...

On 12/31/2013 03:25 PM, Mark Brown wrote:

...

...
...
support. The only supported sample format is SNDRV_PCM_FORMAT_S32_LE. The 8 least significant bits are ignored.

...

...
Where does this constraint come from?

...

From driver/gpu/drm/i2c/tda998x_drv.c. The driver configures CTS_N register statically to a value that works only with 4 byte samples. According to my tests it is possible to support 3 and 2 byte samples too by changing the CTS_N register value, but I am not sure if the configuration can be changed on the fly. My data sheet of the nxp chip is very vague about the register definitions, but I suppose the register configures some clock divider on the chip. HDMI supports only upto 24bit audio and the data sheet states that any extraneous least significant bits are ignored.

Hrm. This sounds like it ought to be presenting as an ASoC CODEC driver.

...

...
...
snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_CHANNELS,
		     2, 2);

...

...
Why not just set all this statically when registering the DAI?

...

Because there is no relevant DAI to where to put these limitations. I did not want to add yet another dummy codec driver, but decided to use the already existing ASoC HDMI codec. By default the driver support all audio params supported by HDMI. The limitations are coming from NXP chip, the NXP driver, and because the chip is used in i2s mode. In other words the limitation is coming from machine setup, not from the DAIs.

OK, but it sounds like it's got register configuration as well? That really does sound like a device that ought to have a driver...

...

No excuse for i initialization, I'll fix that. The casting is just to survive with just one kmalloc call instead of separate memory blobs for struct snd_pcm_hw_constraint_list and referred list of supported sample rates. I'll allocate a second blob, if that is easier to read.

Yes, please. Unless it's something where memory is getting tight (eg, due to be allocated a lot) it's more important that we can read the code than that we save a few bytes.

Jyri Sarha

24 Jan 24 Jan

1:01 p.m.

New subject: [PATCH RFC v2 REPOST 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus

On 01/21/2014 09:15 PM, Mark Brown wrote:

...

On Wed, Jan 15, 2014 at 01:27:21PM +0200, Jyri Sarha wrote:

...
On 12/31/2013 03:25 PM, Mark Brown wrote:

...
...
...
support. The only supported sample format is SNDRV_PCM_FORMAT_S32_LE. The 8 least significant bits are ignored.

...
...
Where does this constraint come from?

...
From driver/gpu/drm/i2c/tda998x_drv.c. The driver configures CTS_N register statically to a value that works only with 4 byte samples. According to my tests it is possible to support 3 and 2 byte samples too by changing the CTS_N register value, but I am not sure if the configuration can be changed on the fly. My data sheet of the nxp chip is very vague about the register definitions, but I suppose the register configures some clock divider on the chip. HDMI supports only upto 24bit audio and the data sheet states that any extraneous least significant bits are ignored.

Hrm. This sounds like it ought to be presenting as an ASoC CODEC driver.

I do not disagree. I just do no not have a clear understanding how something like that should be done. Either the tda998x_drv it self should provide the ASoC codec driver or there should be some kind of API that could be accessed by some driver under sound/soc/codecs. Anyway it sound like Jean-Francois Moine is already doing that. I'll take his driver into use as soon as his code is merged.

However, for now a simple implementation that I have does not really need any interaction with the HDMI encoder and thus no codec driver either.

...

...
...
...
snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_CHANNELS,
		     2, 2);
...
...
Why not just set all this statically when registering the DAI?

...
Because there is no relevant DAI to where to put these limitations. I did not want to add yet another dummy codec driver, but decided to use the already existing ASoC HDMI codec. By default the driver support all audio params supported by HDMI. The limitations are coming from NXP chip, the NXP driver, and because the chip is used in i2s mode. In other words the limitation is coming from machine setup, not from the DAIs.

OK, but it sounds like it's got register configuration as well? That really does sound like a device that ought to have a driver...

Sure, but it would not save form making runtime constraints. The usage of i2s mode, which limits the number of channels, is selected by dai_fmt call after dai registering.

Best regards, Jyri

Jyri Sarha

20 Dec 20 Dec

10:40 a.m.

New subject: [PATCH RFC v2 REPOST 4/8] ASoC: hdmi-codec: Add devicetree binding with documentation

diff --git a/Documentation/devicetree/bindings/sound/hdmi.txt b/Documentation/devicetree/bindings/sound/hdmi.txt new file mode 100644 index 0000000..31af7bc --- /dev/null +++ b/Documentation/devicetree/bindings/sound/hdmi.txt @@ -0,0 +1,17 @@ +Device-Tree bindings for dummy HDMI codec + +Required properties: + - compatible: should be "linux,hdmi-audio". + +CODEC output pins: + * TX + +CODEC input pins: + * RX + +Example node: + + hdmi_audio: hdmi_audio@0 { + compatible = "linux,hdmi-audio"; + status = "okay"; + }; diff --git a/sound/soc/codecs/hdmi.c b/sound/soc/codecs/hdmi.c index 32797a8..9cb1c7d 100644 --- a/sound/soc/codecs/hdmi.c +++ b/sound/soc/codecs/hdmi.c @@ -20,6 +20,7 @@ */ #include <linux/module.h> #include <sound/soc.h> +#include <linux/of_device.h>

#define DRV_NAME "hdmi-audio-codec"

@@ -60,6 +61,14 @@ static struct snd_soc_dai_driver hdmi_codec_dai = {

};

.probe = hdmi_codec_probe,

-- 1.7.9.5

Mark Brown

31 Dec 31 Dec

1:26 p.m.

New subject: [PATCH RFC v2 REPOST 4/8] ASoC: hdmi-codec: Add devicetree binding with documentation

On Fri, Dec 20, 2013 at 12:40:16PM +0200, Jyri Sarha wrote:

...

Signed-off-by: Jyri Sarha jsarha@ti.com cc: bcousson@baylibre.com

Applied, thanks.

Jyri Sarha

20 Dec 20 Dec

10:40 a.m.

New subject: [PATCH RFC v2 REPOST 5/8] ASoC: davinci: HDMI audio build for AM33XX and TDA998x

Adds configuration option for HDMI audio support for AM33XX based boards with NXP TDA998x HDMI transmitter. The audio is connected to NXP TDA998x trough McASP running in i2s mode.

Signed-off-by: Jyri Sarha jsarha@ti.com --- sound/soc/davinci/Kconfig | 12 ++++++++++++ sound/soc/davinci/Makefile | 1 + 2 files changed, 13 insertions(+)

obj-$(CONFIG_SND_DAVINCI_SOC_GENERIC_EVM) += snd-soc-evm.o +obj-$(CONFIG_SND_AM335X_SOC_NXPTDA_EVM) += snd-soc-evm.o

-- 1.7.9.5

Jyri Sarha

10:41 a.m.

New subject: [PATCH RFC v2 REPOST 6/8] drm/tilcdc: Add I2C HDMI audio config for tda998x

The configuration is needed for HDMI audio. The "swap" and "mirr" parameters have to be correctly set in the configuration in order to have proper colors in the HDMI picture.

Signed-off-by: Jyri Sarha jsarha@ti.com cc: airlied@linux.ie --- drivers/gpu/drm/tilcdc/tilcdc_slave.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)

#include "tilcdc_drv.h"

@@ -111,8 +112,29 @@ static const struct drm_encoder_helper_funcs slave_encoder_helper_funcs = { .restore = drm_i2c_encoder_restore, };

static struct drm_encoder *slave_encoder_create(struct drm_device *dev,

-- 1.7.9.5

Jyri Sarha

10:42 a.m.

New subject: [PATCH RFC v2 REPOST 7/8] ARM: OMAP2+: omap2plus_defconfig: Enable tilcdc and TDA998X HDMI support

This enables HDMI video support on Beaglebone-Black.

Signed-off-by: Jyri Sarha jsarha@ti.com cc: tony@atomide.com --- arch/arm/configs/omap2plus_defconfig | 3 +++ 1 file changed, 3 insertions(+)

-- 1.7.9.5

Jyri Sarha

10:43 a.m.

New subject: [PATCH RFC v2 REPOST 8/8] ARM: OMAP2+: omap2plus_defconfig: Enable BeagleBone Black HDMI audio support

Select following: CONFIG_SND_DAVINCI_SOC=m CONFIG_SND_AM335X_SOC_NXPTDA_EVM=m

Signed-off-by: Jyri Sarha jsarha@ti.com cc: tony@atomide.com --- arch/arm/configs/omap2plus_defconfig | 2 ++ 1 file changed, 2 insertions(+)

-- 1.7.9.5

Mark Brown

11:30 a.m.

New subject: [alsa-devel] [PATCH RFC v2 REPOST 0/8] Beaglebone-Black HDMI audio

On Fri, Dec 20, 2013 at 12:36:56PM +0200, Jyri Sarha wrote:

...

Changes since the first RFC version of the patches:

Please don't bury your e-mails in the middle of old threads, that's a good way of getting them missed.

Jyri Sarha

11:51 a.m.

New subject: [alsa-devel] [PATCH RFC v2 REPOST 0/8] Beaglebone-Black HDMI audio

On 12/20/2013 01:30 PM, Mark Brown wrote:

...

On Fri, Dec 20, 2013 at 12:36:56PM +0200, Jyri Sarha wrote:

...
Changes since the first RFC version of the patches:

Please don't bury your e-mails in the middle of old threads, that's a good way of getting them missed.

I have done it for my own convenience to find the history of the patch set when ever someone is commenting it. But I'll stop doing that from now on.

Best regards, Jyri

4130

Age (days ago)

4196

Last active (days ago)

dri-devel@lists.freedesktop.org

58 comments

6 participants

tags (0)

participants (6)

Anssi Hannula
Benoit Cousson
Jean-Francois Moine
Jyri Sarha
Mark Brown
Thomas Petazzoni