* [PATCH v2 1/8] clk: ti: add gpio controlled clock
2014-08-18 21:46 [PATCH v2 0/8] Beaglebone-Black HDMI audio Jyri Sarha
@ 2014-08-18 21:46 ` Jyri Sarha
2014-08-19 11:32 ` Mark Rutland
[not found] ` <cover.1408397864.git.jsarha-l0cyMroinI0@public.gmane.org>
` (6 subsequent siblings)
7 siblings, 1 reply; 19+ messages in thread
From: Jyri Sarha @ 2014-08-18 21:46 UTC (permalink / raw)
To: dri-devel, airlied, linux-omap, devicetree, bcousson, alsa-devel
Cc: tony, broonie, liam.r.girdwood, peter.ujfalusi, detheridge,
ezequiel.garcia, t-kristo, Jyri Sarha
The added ti,gpio-clock 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>
---
.../devicetree/bindings/clock/ti/gpio-clock.txt | 21 ++
drivers/clk/ti/Makefile | 2 +-
drivers/clk/ti/gpio.c | 202 ++++++++++++++++++++
3 files changed, 224 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/clock/ti/gpio-clock.txt
create mode 100644 drivers/clk/ti/gpio.c
diff --git a/Documentation/devicetree/bindings/clock/ti/gpio-clock.txt b/Documentation/devicetree/bindings/clock/ti/gpio-clock.txt
new file mode 100644
index 0000000..2eb854d
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/ti/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 "ti,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 = "ti,gpio-clock";
+ clocks = <&parentclk>;
+ #clock-cells = <0>;
+ enable-gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
+ };
diff --git a/drivers/clk/ti/Makefile b/drivers/clk/ti/Makefile
index ed4d0aa..88074d3 100644
--- a/drivers/clk/ti/Makefile
+++ b/drivers/clk/ti/Makefile
@@ -1,7 +1,7 @@
ifneq ($(CONFIG_OF),)
obj-y += clk.o autoidle.o clockdomain.o
clk-common = dpll.o composite.o divider.o gate.o \
- fixed-factor.o mux.o apll.o
+ fixed-factor.o mux.o apll.o gpio.o
obj-$(CONFIG_SOC_AM33XX) += $(clk-common) clk-33xx.o
obj-$(CONFIG_ARCH_OMAP2) += $(clk-common) interface.o clk-2xxx.o
obj-$(CONFIG_ARCH_OMAP3) += $(clk-common) interface.o clk-3xxx.o
diff --git a/drivers/clk/ti/gpio.c b/drivers/clk/ti/gpio.c
new file mode 100644
index 0000000..f4c668e
--- /dev/null
+++ b/drivers/clk/ti/gpio.c
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2012 - 2014 Texas Instruments Incorporated - http://www.ti.com
+ * 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>
+
+struct clk_gpio {
+ struct clk_hw hw;
+ struct gpio_desc *gpiod;
+};
+
+/**
+ * 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 *clk = to_clk_gpio(hw);
+
+ gpiod_set_value(clk->gpiod, 1);
+
+ return 0;
+}
+
+static void clk_gpio_disable(struct clk_hw *hw)
+{
+ struct clk_gpio *clk = to_clk_gpio(hw);
+
+ gpiod_set_value(clk->gpiod, 0);
+}
+
+static int clk_gpio_is_enabled(struct clk_hw *hw)
+{
+ struct clk_gpio *clk = to_clk_gpio(hw);
+
+ return gpiod_get_value(clk->gpiod);
+}
+
+static const struct clk_ops clk_gpio_ops = {
+ .enable = clk_gpio_enable,
+ .disable = clk_gpio_disable,
+ .is_enabled = clk_gpio_is_enabled,
+};
+
+/**
+ * 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
+ * @gpiod: gpio descriptor to control this clock
+ */
+static struct clk *clk_register_gpio(struct device *dev, const char *name,
+ const char *parent_name, struct gpio_desc *gpiod,
+ unsigned long flags)
+{
+ struct clk_gpio *clk_gpio = NULL;
+ struct clk *clk = ERR_PTR(-EINVAL);
+ struct clk_init_data init = { NULL };
+ unsigned long gpio_flags;
+ int err;
+
+ if (gpiod_is_active_low(gpiod))
+ gpio_flags = GPIOF_OUT_INIT_HIGH;
+ else
+ gpio_flags = GPIOF_OUT_INIT_LOW;
+
+ if (dev)
+ err = devm_gpio_request_one(dev, desc_to_gpio(gpiod),
+ gpio_flags, name);
+ else
+ err = gpio_request_one(desc_to_gpio(gpiod), gpio_flags, name);
+
+ if (err) {
+ pr_err("%s: %s: Error requesting clock control gpio %u\n",
+ __func__, name, desc_to_gpio(gpiod));
+ return ERR_PTR(err);
+ }
+
+ if (dev)
+ clk_gpio = devm_kzalloc(dev, sizeof(struct clk_gpio),
+ GFP_KERNEL);
+ else
+ clk_gpio = kzalloc(sizeof(struct clk_gpio), GFP_KERNEL);
+
+ if (!clk_gpio)
+ 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->gpiod = gpiod;
+ clk_gpio->hw.init = &init;
+
+ clk = clk_register(dev, &clk_gpio->hw);
+
+ if (!IS_ERR(clk))
+ return clk;
+
+ if (!dev)
+ kfree(clk_gpio);
+
+clk_register_gpio_err:
+ gpiod_put(gpiod);
+
+ return clk;
+}
+
+/**
+ * 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;
+ 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 = _data;
+ struct clk *clk;
+ const char *clk_name = data->node->name;
+ const char *parent_name;
+ struct gpio_desc *gpiod;
+ int gpio;
+
+ 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, NULL);
+ 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);
+ }
+ gpiod = gpio_to_desc(gpio);
+
+ parent_name = of_clk_get_parent_name(data->node, 0);
+
+ clk = clk_register_gpio(NULL, clk_name, parent_name, gpiod, 0);
+ 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
+ */
+static void __init of_gpio_clk_setup(struct device_node *node)
+{
+ struct clk_gpio_delayed_register_data *data;
+
+ data = kzalloc(sizeof(struct clk_gpio_delayed_register_data),
+ GFP_KERNEL);
+ if (!data)
+ return;
+
+ data->node = node;
+ mutex_init(&data->lock);
+
+ of_clk_add_provider(node, of_clk_gpio_delayed_register_get, data);
+}
+CLK_OF_DECLARE(gpio_clk, "ti,gpio-clock", of_gpio_clk_setup);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH v2 1/8] clk: ti: add gpio controlled clock
2014-08-18 21:46 ` [PATCH v2 1/8] clk: ti: add gpio controlled clock Jyri Sarha
@ 2014-08-19 11:32 ` Mark Rutland
2014-08-19 12:23 ` Jyri Sarha
0 siblings, 1 reply; 19+ messages in thread
From: Mark Rutland @ 2014-08-19 11:32 UTC (permalink / raw)
To: Jyri Sarha
Cc: dri-devel@lists.freedesktop.org, airlied@linux.ie,
linux-omap@vger.kernel.org, devicetree@vger.kernel.org,
bcousson@baylibre.com, alsa-devel@alsa-project.org,
tony@atomide.com, broonie@kernel.org,
liam.r.girdwood@linux.intel.com, peter.ujfalusi@ti.com,
detheridge@ti.com, ezequiel.garcia@free-electrons.com,
t-kristo@ti.com
On Mon, Aug 18, 2014 at 10:46:39PM +0100, Jyri Sarha wrote:
> The added ti,gpio-clock 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.
I guess this is basically an AND gate with the GPIO and parent clock as
inputs? Or is this something more complex that we might want to do more
things with later?
If it's the former it sounds like this could be a completely generic
"gpio-gate-clock".
Thanks,
Mark.
> Signed-off-by: Jyri Sarha <jsarha@ti.com>
> ---
> .../devicetree/bindings/clock/ti/gpio-clock.txt | 21 ++
> drivers/clk/ti/Makefile | 2 +-
> drivers/clk/ti/gpio.c | 202 ++++++++++++++++++++
> 3 files changed, 224 insertions(+), 1 deletion(-)
> create mode 100644 Documentation/devicetree/bindings/clock/ti/gpio-clock.txt
> create mode 100644 drivers/clk/ti/gpio.c
>
> diff --git a/Documentation/devicetree/bindings/clock/ti/gpio-clock.txt b/Documentation/devicetree/bindings/clock/ti/gpio-clock.txt
> new file mode 100644
> index 0000000..2eb854d
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/clock/ti/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 "ti,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 = "ti,gpio-clock";
> + clocks = <&parentclk>;
> + #clock-cells = <0>;
> + enable-gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
> + };
> diff --git a/drivers/clk/ti/Makefile b/drivers/clk/ti/Makefile
> index ed4d0aa..88074d3 100644
> --- a/drivers/clk/ti/Makefile
> +++ b/drivers/clk/ti/Makefile
> @@ -1,7 +1,7 @@
> ifneq ($(CONFIG_OF),)
> obj-y += clk.o autoidle.o clockdomain.o
> clk-common = dpll.o composite.o divider.o gate.o \
> - fixed-factor.o mux.o apll.o
> + fixed-factor.o mux.o apll.o gpio.o
> obj-$(CONFIG_SOC_AM33XX) += $(clk-common) clk-33xx.o
> obj-$(CONFIG_ARCH_OMAP2) += $(clk-common) interface.o clk-2xxx.o
> obj-$(CONFIG_ARCH_OMAP3) += $(clk-common) interface.o clk-3xxx.o
> diff --git a/drivers/clk/ti/gpio.c b/drivers/clk/ti/gpio.c
> new file mode 100644
> index 0000000..f4c668e
> --- /dev/null
> +++ b/drivers/clk/ti/gpio.c
> @@ -0,0 +1,202 @@
> +/*
> + * Copyright (C) 2012 - 2014 Texas Instruments Incorporated - http://www.ti.com
> + * 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>
> +
> +struct clk_gpio {
> + struct clk_hw hw;
> + struct gpio_desc *gpiod;
> +};
> +
> +/**
> + * 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 *clk = to_clk_gpio(hw);
> +
> + gpiod_set_value(clk->gpiod, 1);
> +
> + return 0;
> +}
> +
> +static void clk_gpio_disable(struct clk_hw *hw)
> +{
> + struct clk_gpio *clk = to_clk_gpio(hw);
> +
> + gpiod_set_value(clk->gpiod, 0);
> +}
> +
> +static int clk_gpio_is_enabled(struct clk_hw *hw)
> +{
> + struct clk_gpio *clk = to_clk_gpio(hw);
> +
> + return gpiod_get_value(clk->gpiod);
> +}
> +
> +static const struct clk_ops clk_gpio_ops = {
> + .enable = clk_gpio_enable,
> + .disable = clk_gpio_disable,
> + .is_enabled = clk_gpio_is_enabled,
> +};
> +
> +/**
> + * 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
> + * @gpiod: gpio descriptor to control this clock
> + */
> +static struct clk *clk_register_gpio(struct device *dev, const char *name,
> + const char *parent_name, struct gpio_desc *gpiod,
> + unsigned long flags)
> +{
> + struct clk_gpio *clk_gpio = NULL;
> + struct clk *clk = ERR_PTR(-EINVAL);
> + struct clk_init_data init = { NULL };
> + unsigned long gpio_flags;
> + int err;
> +
> + if (gpiod_is_active_low(gpiod))
> + gpio_flags = GPIOF_OUT_INIT_HIGH;
> + else
> + gpio_flags = GPIOF_OUT_INIT_LOW;
> +
> + if (dev)
> + err = devm_gpio_request_one(dev, desc_to_gpio(gpiod),
> + gpio_flags, name);
> + else
> + err = gpio_request_one(desc_to_gpio(gpiod), gpio_flags, name);
> +
> + if (err) {
> + pr_err("%s: %s: Error requesting clock control gpio %u\n",
> + __func__, name, desc_to_gpio(gpiod));
> + return ERR_PTR(err);
> + }
> +
> + if (dev)
> + clk_gpio = devm_kzalloc(dev, sizeof(struct clk_gpio),
> + GFP_KERNEL);
> + else
> + clk_gpio = kzalloc(sizeof(struct clk_gpio), GFP_KERNEL);
> +
> + if (!clk_gpio)
> + 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->gpiod = gpiod;
> + clk_gpio->hw.init = &init;
> +
> + clk = clk_register(dev, &clk_gpio->hw);
> +
> + if (!IS_ERR(clk))
> + return clk;
> +
> + if (!dev)
> + kfree(clk_gpio);
> +
> +clk_register_gpio_err:
> + gpiod_put(gpiod);
> +
> + return clk;
> +}
> +
> +/**
> + * 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;
> + 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 = _data;
> + struct clk *clk;
> + const char *clk_name = data->node->name;
> + const char *parent_name;
> + struct gpio_desc *gpiod;
> + int gpio;
> +
> + 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, NULL);
> + 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);
> + }
> + gpiod = gpio_to_desc(gpio);
> +
> + parent_name = of_clk_get_parent_name(data->node, 0);
> +
> + clk = clk_register_gpio(NULL, clk_name, parent_name, gpiod, 0);
> + 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
> + */
> +static void __init of_gpio_clk_setup(struct device_node *node)
> +{
> + struct clk_gpio_delayed_register_data *data;
> +
> + data = kzalloc(sizeof(struct clk_gpio_delayed_register_data),
> + GFP_KERNEL);
> + if (!data)
> + return;
> +
> + data->node = node;
> + mutex_init(&data->lock);
> +
> + of_clk_add_provider(node, of_clk_gpio_delayed_register_get, data);
> +}
> +CLK_OF_DECLARE(gpio_clk, "ti,gpio-clock", of_gpio_clk_setup);
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH v2 1/8] clk: ti: add gpio controlled clock
2014-08-19 11:32 ` Mark Rutland
@ 2014-08-19 12:23 ` Jyri Sarha
2014-08-19 12:37 ` Mark Rutland
0 siblings, 1 reply; 19+ messages in thread
From: Jyri Sarha @ 2014-08-19 12:23 UTC (permalink / raw)
To: Mark Rutland
Cc: dri-devel@lists.freedesktop.org, airlied@linux.ie,
linux-omap@vger.kernel.org, devicetree@vger.kernel.org,
bcousson@baylibre.com, alsa-devel@alsa-project.org,
tony@atomide.com, broonie@kernel.org,
liam.r.girdwood@linux.intel.com, peter.ujfalusi@ti.com,
detheridge@ti.com, ezequiel.garcia@free-electrons.com,
t-kristo@ti.com
On 08/19/2014 02:32 PM, Mark Rutland wrote:
> On Mon, Aug 18, 2014 at 10:46:39PM +0100, Jyri Sarha wrote:
>> The added ti,gpio-clock 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.
>
> I guess this is basically an AND gate with the GPIO and parent clock as
> inputs? Or is this something more complex that we might want to do more
> things with later?
>
> If it's the former it sounds like this could be a completely generic
> "gpio-gate-clock".
>
Yes, its completely generic. However, since there has been no response
to my several earlier attempts to get this patch in I finally gave up
and moved it under clk/ti.
"gpio-gate-clock" sound like more accurate name for ti. I'll change that.
Do you think I should give this one more try to get it in as generic
basic clock?
Cheers,
Jyri
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 1/8] clk: ti: add gpio controlled clock
2014-08-19 12:23 ` Jyri Sarha
@ 2014-08-19 12:37 ` Mark Rutland
0 siblings, 0 replies; 19+ messages in thread
From: Mark Rutland @ 2014-08-19 12:37 UTC (permalink / raw)
To: Jyri Sarha, mturquette
Cc: dri-devel@lists.freedesktop.org, airlied@linux.ie,
linux-omap@vger.kernel.org, devicetree@vger.kernel.org,
bcousson@baylibre.com, alsa-devel@alsa-project.org,
tony@atomide.com, broonie@kernel.org,
liam.r.girdwood@linux.intel.com, peter.ujfalusi@ti.com,
detheridge@ti.com, ezequiel.garcia@free-electrons.com,
t-kristo@ti.com
On Tue, Aug 19, 2014 at 01:23:12PM +0100, Jyri Sarha wrote:
> On 08/19/2014 02:32 PM, Mark Rutland wrote:
> > On Mon, Aug 18, 2014 at 10:46:39PM +0100, Jyri Sarha wrote:
> >> The added ti,gpio-clock 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.
> >
> > I guess this is basically an AND gate with the GPIO and parent clock as
> > inputs? Or is this something more complex that we might want to do more
> > things with later?
> >
> > If it's the former it sounds like this could be a completely generic
> > "gpio-gate-clock".
> >
>
> Yes, its completely generic. However, since there has been no response
> to my several earlier attempts to get this patch in I finally gave up
> and moved it under clk/ti.
Ah. Apolgoies for that having happened.
> "gpio-gate-clock" sound like more accurate name for ti. I'll change that.
>
> Do you think I should give this one more try to get it in as generic
> basic clock?
I'd certainly be happy with a generic gpio-gate-clock.
Mike, thoughts?
Thanks,
Mark.
^ permalink raw reply [flat|nested] 19+ messages in thread
[parent not found: <cover.1408397864.git.jsarha-l0cyMroinI0@public.gmane.org>]
* [PATCH v2 2/8] drm/tilcdc: Add I2S HDMI audio config for tda998x
[not found] ` <cover.1408397864.git.jsarha-l0cyMroinI0@public.gmane.org>
@ 2014-08-18 21:46 ` Jyri Sarha
0 siblings, 0 replies; 19+ messages in thread
From: Jyri Sarha @ 2014-08-18 21:46 UTC (permalink / raw)
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, airlied-cv59FeDIM0c,
linux-omap-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
bcousson-rdvid1DuHRBWk0Htik3J/w,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw
Cc: tony-4v6yS6AI5VpBDgjK7y7TUQ, broonie-DgEjT+Ai2ygdnm+yROfE0A,
liam.r.girdwood-VuQAYsv1563Yd54FQh9/CA,
peter.ujfalusi-l0cyMroinI0, detheridge-l0cyMroinI0,
ezequiel.garcia-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
t-kristo-l0cyMroinI0, Jyri Sarha
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-l0cyMroinI0@public.gmane.org>
---
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 3775fd4..5dd8d78 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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v2 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus
2014-08-18 21:46 [PATCH v2 0/8] Beaglebone-Black HDMI audio Jyri Sarha
2014-08-18 21:46 ` [PATCH v2 1/8] clk: ti: add gpio controlled clock Jyri Sarha
[not found] ` <cover.1408397864.git.jsarha-l0cyMroinI0@public.gmane.org>
@ 2014-08-18 21:46 ` Jyri Sarha
2014-08-19 13:16 ` Mark Rutland
2014-08-18 21:46 ` [PATCH v2 4/8] ASoC: davinci: HDMI audio build for AM33XX and TDA998x Jyri Sarha
` (4 subsequent siblings)
7 siblings, 1 reply; 19+ messages in thread
From: Jyri Sarha @ 2014-08-18 21:46 UTC (permalink / raw)
To: dri-devel, airlied, linux-omap, devicetree, bcousson, alsa-devel
Cc: tony, broonie, liam.r.girdwood, peter.ujfalusi, detheridge,
ezequiel.garcia, t-kristo, Jyri Sarha
Add machine driver support for BeagleBone-Black HDMI audio. BBB has
NXP TDA998X HDMI transmitter connected to McASP port in I2S mode. The
44100 Hz sample-rate and it's multiples can not be accurately produced
on BBB. 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 | 4 +-
sound/soc/davinci/davinci-evm.c | 82 +++++++++++++++++++-
2 files changed, 83 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt
index 963e100..c137436 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,am335x-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 a50010e..9b98667 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>
@@ -83,12 +84,46 @@ static int evm_hw_params(struct snd_pcm_substream *substream,
return 0;
}
+/* 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_tda998x_startup(struct snd_pcm_substream *substream)
+{
+ struct snd_pcm_runtime *runtime = substream->runtime;
+ 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);
+
+ return evm_startup(substream);
+}
+
+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_card *soc_card = rtd->card;
+ struct snd_soc_card_drvdata_davinci *drvdata =
+ snd_soc_card_get_drvdata(soc_card);
+
+ return snd_soc_dai_set_sysclk(cpu_dai, 0, drvdata->sysclk,
+ SND_SOC_CLOCK_IN);
+}
+
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),
@@ -149,6 +184,35 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd)
return 0;
}
+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->card;
+ int ret;
+
+ ret = snd_soc_dai_set_clkdiv(cpu_dai, 0, 1);
+ if (ret < 0)
+ return ret;
+
+ 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",
@@ -334,7 +398,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 = {
@@ -347,10 +411,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,am335x-beaglebone-black-audio",
+ .data = &evm_dai_tda998x_hdmi,
},
{ /* sentinel */ }
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH v2 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus
2014-08-18 21:46 ` [PATCH v2 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus Jyri Sarha
@ 2014-08-19 13:16 ` Mark Rutland
2014-08-19 19:40 ` Jyri Sarha
0 siblings, 1 reply; 19+ messages in thread
From: Mark Rutland @ 2014-08-19 13:16 UTC (permalink / raw)
To: Jyri Sarha
Cc: dri-devel@lists.freedesktop.org, airlied@linux.ie,
linux-omap@vger.kernel.org, devicetree@vger.kernel.org,
bcousson@baylibre.com, alsa-devel@alsa-project.org,
tony@atomide.com, broonie@kernel.org,
liam.r.girdwood@linux.intel.com, peter.ujfalusi@ti.com,
detheridge@ti.com, ezequiel.garcia@free-electrons.com,
t-kristo@ti.com
On Mon, Aug 18, 2014 at 10:46:41PM +0100, Jyri Sarha wrote:
> Add machine driver support for BeagleBone-Black HDMI audio. BBB has
> NXP TDA998X HDMI transmitter connected to McASP port in I2S mode. The
> 44100 Hz sample-rate and it's multiples can not be accurately produced
> on BBB. 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 | 4 +-
> sound/soc/davinci/davinci-evm.c | 82 +++++++++++++++++++-
> 2 files changed, 83 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt
> index 963e100..c137436 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,am335x-beaglebone-black-audio" : for Beaglebone-black HDMI
> + audio
To keep this legible I'd recommend reorganising this like:
- compatible: should contain one of:
* "ti,da830-evm-audio" for DM365/DA8xx/OMAPL1x/AM33xx
* "ti,am335x-beaglebone-black-audio" for Beaglebone-black HDMI audio
For the BBB case, do you expect both strings or just the BBB-specific
string?
Is the 'x' in the BBB string a wildcard? If we know the particular
number for BBB we should use that.
Cheers,
Mark.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus
2014-08-19 13:16 ` Mark Rutland
@ 2014-08-19 19:40 ` Jyri Sarha
2014-08-20 12:34 ` Mark Rutland
0 siblings, 1 reply; 19+ messages in thread
From: Jyri Sarha @ 2014-08-19 19:40 UTC (permalink / raw)
To: Mark Rutland
Cc: dri-devel@lists.freedesktop.org, airlied@linux.ie,
linux-omap@vger.kernel.org, devicetree@vger.kernel.org,
bcousson@baylibre.com, alsa-devel@alsa-project.org,
tony@atomide.com, broonie@kernel.org,
liam.r.girdwood@linux.intel.com, peter.ujfalusi@ti.com,
detheridge@ti.com, ezequiel.garcia@free-electrons.com,
t-kristo@ti.com
On 08/19/2014 04:16 PM, Mark Rutland wrote:
> On Mon, Aug 18, 2014 at 10:46:41PM +0100, Jyri Sarha wrote:
>> Add machine driver support for BeagleBone-Black HDMI audio. BBB has
>> NXP TDA998X HDMI transmitter connected to McASP port in I2S mode. The
>> 44100 Hz sample-rate and it's multiples can not be accurately produced
>> on BBB. 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 | 4 +-
>> sound/soc/davinci/davinci-evm.c | 82 +++++++++++++++++++-
>> 2 files changed, 83 insertions(+), 3 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt
>> index 963e100..c137436 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,am335x-beaglebone-black-audio" : for Beaglebone-black HDMI
>> + audio
>
> To keep this legible I'd recommend reorganising this like:
>
> - compatible: should contain one of:
> * "ti,da830-evm-audio" for DM365/DA8xx/OMAPL1x/AM33xx
> * "ti,am335x-beaglebone-black-audio" for Beaglebone-black HDMI audio
>
The above looks indeed better. I'll make the change. Oh, and I probably
should change the first line to something like:
* TI SoC audio using McASP to connect to TLV320AIC3X or HDMI endcoder
> For the BBB case, do you expect both strings or just the BBB-specific
> string?
>
Normally just the one. In theory a BBB with an audio-cape on top could
utilize another sound node with "ti,da830-evm-audio" compatible property.
> Is the 'x' in the BBB string a wildcard? If we know the particular
> number for BBB we should use that.
>
Yes, its a wild card. BBBs have been made at least with AM3358 and
AM3359 SoCs.
Thanks,
Jyri
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus
2014-08-19 19:40 ` Jyri Sarha
@ 2014-08-20 12:34 ` Mark Rutland
2014-08-20 13:03 ` Jyri Sarha
0 siblings, 1 reply; 19+ messages in thread
From: Mark Rutland @ 2014-08-20 12:34 UTC (permalink / raw)
To: Jyri Sarha
Cc: dri-devel@lists.freedesktop.org, airlied@linux.ie,
linux-omap@vger.kernel.org, devicetree@vger.kernel.org,
bcousson@baylibre.com, alsa-devel@alsa-project.org,
tony@atomide.com, broonie@kernel.org,
liam.r.girdwood@linux.intel.com, peter.ujfalusi@ti.com,
detheridge@ti.com, ezequiel.garcia@free-electrons.com,
t-kristo@ti.com
On Tue, Aug 19, 2014 at 08:40:51PM +0100, Jyri Sarha wrote:
> On 08/19/2014 04:16 PM, Mark Rutland wrote:
> > On Mon, Aug 18, 2014 at 10:46:41PM +0100, Jyri Sarha wrote:
> >> Add machine driver support for BeagleBone-Black HDMI audio. BBB has
> >> NXP TDA998X HDMI transmitter connected to McASP port in I2S mode. The
> >> 44100 Hz sample-rate and it's multiples can not be accurately produced
> >> on BBB. 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 | 4 +-
> >> sound/soc/davinci/davinci-evm.c | 82 +++++++++++++++++++-
> >> 2 files changed, 83 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt
> >> index 963e100..c137436 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,am335x-beaglebone-black-audio" : for Beaglebone-black HDMI
> >> + audio
> >
> > To keep this legible I'd recommend reorganising this like:
> >
> > - compatible: should contain one of:
> > * "ti,da830-evm-audio" for DM365/DA8xx/OMAPL1x/AM33xx
> > * "ti,am335x-beaglebone-black-audio" for Beaglebone-black HDMI audio
> >
>
> The above looks indeed better. I'll make the change. Oh, and I probably
> should change the first line to something like:
>
> * TI SoC audio using McASP to connect to TLV320AIC3X or HDMI endcoder
>
> > For the BBB case, do you expect both strings or just the BBB-specific
> > string?
> >
>
> Normally just the one. In theory a BBB with an audio-cape on top could
> utilize another sound node with "ti,da830-evm-audio" compatible property.
Sorry, I meant in the same node. I take it we never expect:
compatible = "ti,am335x-beaglebone-black-audio", "ti,da830-evm-audio";
> > Is the 'x' in the BBB string a wildcard? If we know the particular
> > number for BBB we should use that.
> >
>
> Yes, its a wild card. BBBs have been made at least with AM3358 and
> AM3359 SoCs.
In general we've pushed back against wildcard strings, and used the
first implementation for the naming. We should be able to use
"ti,am3358-beaglebone-black-audio" for AM335{8,9} assuming the block is
the same? Otherwise we might need separate strings anyway.
Thanks,
Mark.
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH v2 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus
2014-08-20 12:34 ` Mark Rutland
@ 2014-08-20 13:03 ` Jyri Sarha
2014-08-21 18:24 ` Mark Brown
0 siblings, 1 reply; 19+ messages in thread
From: Jyri Sarha @ 2014-08-20 13:03 UTC (permalink / raw)
To: Mark Rutland
Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org,
ezequiel.garcia@free-electrons.com, peter.ujfalusi@ti.com,
airlied@linux.ie, t-kristo@ti.com,
dri-devel@lists.freedesktop.org, liam.r.girdwood@linux.intel.com,
tony@atomide.com, broonie@kernel.org, bcousson@baylibre.com,
linux-omap@vger.kernel.org, detheridge@ti.com
On 08/20/2014 03:34 PM, Mark Rutland wrote:
...
> Sorry, I meant in the same node. I take it we never expect:
>
> compatible = "ti,am335x-beaglebone-black-audio", "ti,da830-evm-audio";
>
No never like that.
>>> > >Is the 'x' in the BBB string a wildcard? If we know the particular
>>> > >number for BBB we should use that.
>>> > >
>> >
>> >Yes, its a wild card. BBBs have been made at least with AM3358 and
>> >AM3359 SoCs.
> In general we've pushed back against wildcard strings, and used the
> first implementation for the naming. We should be able to use
> "ti,am3358-beaglebone-black-audio" for AM335{8,9} assuming the block is
> the same? Otherwise we might need separate strings anyway.
At least the relevant block (McASP) is the same. AM335x is commonly used
in all TI documentation, but I am not picky am3358 is fine with me.
Could we drop the SoC id completely and make it just
"beaglebone-black-audio"?
The board design is the unique factor here, not the SoC. McASP block can
be found from several TI SoCs.
Cheers,
Jyri
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH v2 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus
2014-08-20 13:03 ` Jyri Sarha
@ 2014-08-21 18:24 ` Mark Brown
0 siblings, 0 replies; 19+ messages in thread
From: Mark Brown @ 2014-08-21 18:24 UTC (permalink / raw)
To: Jyri Sarha
Cc: Mark Rutland, dri-devel@lists.freedesktop.org, airlied@linux.ie,
linux-omap@vger.kernel.org, devicetree@vger.kernel.org,
bcousson@baylibre.com, alsa-devel@alsa-project.org,
tony@atomide.com, liam.r.girdwood@linux.intel.com,
peter.ujfalusi@ti.com, detheridge@ti.com,
ezequiel.garcia@free-electrons.com, t-kristo@ti.com
[-- Attachment #1: Type: text/plain, Size: 287 bytes --]
On Wed, Aug 20, 2014 at 04:03:46PM +0300, Jyri Sarha wrote:
> Could we drop the SoC id completely and make it just
> "beaglebone-black-audio"?
> The board design is the unique factor here, not the SoC. McASP block can be
> found from several TI SoCs.
That's a lot more sensible, yes.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v2 4/8] ASoC: davinci: HDMI audio build for AM33XX and TDA998x
2014-08-18 21:46 [PATCH v2 0/8] Beaglebone-Black HDMI audio Jyri Sarha
` (2 preceding siblings ...)
2014-08-18 21:46 ` [PATCH v2 3/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus Jyri Sarha
@ 2014-08-18 21:46 ` Jyri Sarha
2014-08-18 21:46 ` [PATCH v2 5/8] ARM: dts: am33xx: Add external clock provider Jyri Sarha
` (3 subsequent siblings)
7 siblings, 0 replies; 19+ messages in thread
From: Jyri Sarha @ 2014-08-18 21:46 UTC (permalink / raw)
To: dri-devel, airlied, linux-omap, devicetree, bcousson, alsa-devel
Cc: tony, broonie, liam.r.girdwood, peter.ujfalusi, detheridge,
ezequiel.garcia, t-kristo, Jyri Sarha
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 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig
index d69510c..0c8f143 100644
--- a/sound/soc/davinci/Kconfig
+++ b/sound/soc/davinci/Kconfig
@@ -43,6 +43,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_EDMA_SOC && SOC_AM33XX && DRM_I2C_NXP_TDA998X
+ select SND_SOC_HDMI_CODEC
+ select SND_DAVINCI_SOC_MCASP
+ select SND_DAVINCI_SOC_GENERIC_EVM
+ 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 && I2C
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v2 5/8] ARM: dts: am33xx: Add external clock provider
2014-08-18 21:46 [PATCH v2 0/8] Beaglebone-Black HDMI audio Jyri Sarha
` (3 preceding siblings ...)
2014-08-18 21:46 ` [PATCH v2 4/8] ASoC: davinci: HDMI audio build for AM33XX and TDA998x Jyri Sarha
@ 2014-08-18 21:46 ` Jyri Sarha
2014-09-08 23:30 ` Tony Lindgren
2014-08-18 21:46 ` [PATCH v2 6/8] ARM: dts: am335x-boneblack: Add HDMI audio support Jyri Sarha
` (2 subsequent siblings)
7 siblings, 1 reply; 19+ messages in thread
From: Jyri Sarha @ 2014-08-18 21:46 UTC (permalink / raw)
To: dri-devel, airlied, linux-omap, devicetree, bcousson, alsa-devel
Cc: tony, broonie, liam.r.girdwood, peter.ujfalusi, detheridge,
ezequiel.garcia, t-kristo, Jyri Sarha
Add external clock provider for am33xx devices.
Signed-off-by: Jyri Sarha <jsarha@ti.com>
---
arch/arm/boot/dts/am33xx.dtsi | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 3a0a161..d2cc397 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -92,6 +92,16 @@
pinctrl-single,function-mask = <0x7f>;
};
+ ext_clocks {
+ compatible = "ti,external-clocks";
+
+ ext_clocks: clocks {
+ };
+
+ ext_clockdomains: clockdomains {
+ };
+ };
+
/*
* XXX: Use a flat representation of the AM33XX interconnect.
* The real AM33XX interconnect network is quite complex. Since
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH v2 5/8] ARM: dts: am33xx: Add external clock provider
2014-08-18 21:46 ` [PATCH v2 5/8] ARM: dts: am33xx: Add external clock provider Jyri Sarha
@ 2014-09-08 23:30 ` Tony Lindgren
[not found] ` <20140908233037.GT3238-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
0 siblings, 1 reply; 19+ messages in thread
From: Tony Lindgren @ 2014-09-08 23:30 UTC (permalink / raw)
To: Jyri Sarha
Cc: dri-devel, airlied, linux-omap, devicetree, bcousson, alsa-devel,
broonie, liam.r.girdwood, peter.ujfalusi, detheridge,
ezequiel.garcia, t-kristo
* Jyri Sarha <jsarha@ti.com> [140818 14:49]:
> Add external clock provider for am33xx devices.
Please send all the .dts and defconfig changes separately
so I can pick them up and we don't get pointless merge
conflicts.
Regards,
TOny
> Signed-off-by: Jyri Sarha <jsarha@ti.com>
> ---
> arch/arm/boot/dts/am33xx.dtsi | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
> index 3a0a161..d2cc397 100644
> --- a/arch/arm/boot/dts/am33xx.dtsi
> +++ b/arch/arm/boot/dts/am33xx.dtsi
> @@ -92,6 +92,16 @@
> pinctrl-single,function-mask = <0x7f>;
> };
>
> + ext_clocks {
> + compatible = "ti,external-clocks";
> +
> + ext_clocks: clocks {
> + };
> +
> + ext_clockdomains: clockdomains {
> + };
> + };
> +
> /*
> * XXX: Use a flat representation of the AM33XX interconnect.
> * The real AM33XX interconnect network is quite complex. Since
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v2 6/8] ARM: dts: am335x-boneblack: Add HDMI audio support
2014-08-18 21:46 [PATCH v2 0/8] Beaglebone-Black HDMI audio Jyri Sarha
` (4 preceding siblings ...)
2014-08-18 21:46 ` [PATCH v2 5/8] ARM: dts: am33xx: Add external clock provider Jyri Sarha
@ 2014-08-18 21:46 ` Jyri Sarha
2014-08-18 21:46 ` [PATCH v2 7/8] ARM: OMAP2+: omap2plus_defconfig: TDA998X HDMI trough tilcdc,slave Jyri Sarha
2014-08-18 21:46 ` [PATCH v2 8/8] ARM: OMAP2+: omap2plus_defconfig: Enable BeagleBone Black HDMI audio support Jyri Sarha
7 siblings, 0 replies; 19+ messages in thread
From: Jyri Sarha @ 2014-08-18 21:46 UTC (permalink / raw)
To: dri-devel, airlied, linux-omap, devicetree, bcousson, alsa-devel
Cc: tony, broonie, liam.r.girdwood, peter.ujfalusi, detheridge,
ezequiel.garcia, t-kristo, Jyri Sarha
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 | 54 ++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
index 305975d..e815fee 100644
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -59,12 +59,50 @@
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_PULLDOWN | 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>;
+};
+
+&ext_clocks {
+ clk_mcasp0_fixed: clk_mcasp0_fixed {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ clock-frequency = <24576000>;
+ };
+
+ clk_mcasp0: clk_mcasp0 {
+ #clock-cells = <0>;
+ compatible = "ti,gpio-clock";
+ clocks = <&clk_mcasp0_fixed>;
+ enable-gpios = <&gpio1 27 0>; /* BeagleBone Black Clk enable on GPIO1_27 */
+ };
+};
+
/ {
hdmi {
compatible = "ti,tilcdc,slave";
@@ -74,4 +112,20 @@
pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;
status = "okay";
};
+
+ hdmi_audio: hdmi_audio@0 {
+ compatible = "linux,hdmi-audio";
+ status = "okay";
+ };
+
+ sound {
+ compatible = "ti,am335x-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 = "mclk";
+ };
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v2 7/8] ARM: OMAP2+: omap2plus_defconfig: TDA998X HDMI trough tilcdc,slave
2014-08-18 21:46 [PATCH v2 0/8] Beaglebone-Black HDMI audio Jyri Sarha
` (5 preceding siblings ...)
2014-08-18 21:46 ` [PATCH v2 6/8] ARM: dts: am335x-boneblack: Add HDMI audio support Jyri Sarha
@ 2014-08-18 21:46 ` Jyri Sarha
2014-08-18 21:46 ` [PATCH v2 8/8] ARM: OMAP2+: omap2plus_defconfig: Enable BeagleBone Black HDMI audio support Jyri Sarha
7 siblings, 0 replies; 19+ messages in thread
From: Jyri Sarha @ 2014-08-18 21:46 UTC (permalink / raw)
To: dri-devel, airlied, linux-omap, devicetree, bcousson, alsa-devel
Cc: tony, broonie, liam.r.girdwood, peter.ujfalusi, detheridge,
ezequiel.garcia, t-kristo, Jyri Sarha
Select CONFIG_DRM=m, CONFIG_DRM_I2C_NXP_TDA998X=m, and
CONFIG_DRM_TILCDC=m, for Beaglebone-Black HDMI video support.
Signed-off-by: Jyri Sarha <jsarha@ti.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 f650f00..97eade2 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -193,6 +193,9 @@ CONFIG_REGULATOR_TPS65218=y
CONFIG_REGULATOR_TPS65910=y
CONFIG_REGULATOR_TWL4030=y
CONFIG_REGULATOR_PBIAS=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
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v2 8/8] ARM: OMAP2+: omap2plus_defconfig: Enable BeagleBone Black HDMI audio support
2014-08-18 21:46 [PATCH v2 0/8] Beaglebone-Black HDMI audio Jyri Sarha
` (6 preceding siblings ...)
2014-08-18 21:46 ` [PATCH v2 7/8] ARM: OMAP2+: omap2plus_defconfig: TDA998X HDMI trough tilcdc,slave Jyri Sarha
@ 2014-08-18 21:46 ` Jyri Sarha
7 siblings, 0 replies; 19+ messages in thread
From: Jyri Sarha @ 2014-08-18 21:46 UTC (permalink / raw)
To: dri-devel, airlied, linux-omap, devicetree, bcousson, alsa-devel
Cc: tony, broonie, liam.r.girdwood, peter.ujfalusi, detheridge,
ezequiel.garcia, t-kristo, Jyri Sarha
Select CONFIG_SND_EDMA_SOC=m and CONFIG_SND_AM335X_SOC_NXPTDA_EVM=m
for BBB HDMI audio.
Signed-off-by: Jyri Sarha <jsarha@ti.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 97eade2..3b3d73c 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -224,7 +224,9 @@ CONFIG_SND_DEBUG=y
CONFIG_SND_USB_AUDIO=m
CONFIG_SND_SOC=m
CONFIG_SND_OMAP_SOC=m
+CONFIG_SND_EDMA_SOC=m
CONFIG_SND_AM33XX_SOC_EVM=m
+CONFIG_SND_AM335X_SOC_NXPTDA_EVM=m
CONFIG_SND_DAVINCI_SOC=m
CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread