From: Jyri Sarha <jsarha@ti.com> To: alsa-devel@alsa-project.org, linux-fbdev@vger.kernel.org, linux-omap@vger.kernel.org Cc: peter.ujfalusi@ti.com, broonie@kernel.org, liam.r.girdwood@linux.intel.com, tomi.valkeinen@ti.com, detheridge@ti.com, jyri.sarha@iki.fi, Jyri Sarha <jsarha@ti.com> Subject: [PATCH 06/12] OMAPDSS: hdmi4: Register HDMI audio ASoC drivers from HDMI driver Date: Thu, 26 Jun 2014 19:20:57 +0000 [thread overview] Message-ID: <f61b31d0b08c8a0b6ee295d5b0da62ead23983c9.1403807781.git.jsarha@ti.com> (raw) In-Reply-To: <cover.1403807781.git.jsarha@ti.com> Add audio datamember to hdmi struct and call register and unregister functions form hdmi_audio.c. Register function registers the integrated cpu dai, dummy HDMI codec, and simple-card machine driver for complete HDMI audio support. Signed-off-by: Jyri Sarha <jsarha@ti.com> --- drivers/video/fbdev/omap2/dss/hdmi4.c | 45 +++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/drivers/video/fbdev/omap2/dss/hdmi4.c b/drivers/video/fbdev/omap2/dss/hdmi4.c index 342ddb4..48f11f8 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi4.c +++ b/drivers/video/fbdev/omap2/dss/hdmi4.c @@ -34,6 +34,11 @@ #include <linux/regulator/consumer.h> #include <video/omapdss.h> +#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO) +#include <sound/soc.h> +#include <sound/soc-dai.h> +#endif + #include "hdmi4_core.h" #include "dss.h" #include "dss_features.h" @@ -52,6 +57,9 @@ static struct { struct clk *sys_clk; struct regulator *vdda_hdmi_dac_reg; +#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO) + struct hdmi_audio_data audio; +#endif bool core_enabled; struct omap_dss_device output; @@ -671,6 +679,21 @@ err: return r; } +#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO) +static struct snd_soc_dai_driver omap_hdmi_dai = { + .name = "omap4-hdmi-dai", + .playback = { + .channels_min = 2, + .channels_max = 8, + .rates = (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), + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE, + }, +}; +#endif + /* HDMI HW IP initialisation */ static int omapdss_hdmihw_probe(struct platform_device *pdev) { @@ -727,6 +750,25 @@ static int omapdss_hdmihw_probe(struct platform_device *pdev) hdmi_init_output(pdev); +#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO) + /* drvdata is only used by HDMI audio */ + hdmi.audio.hdmi_lock = &hdmi.lock; + hdmi.audio.wp = &hdmi.wp; + hdmi.audio.core = &hdmi.core; + hdmi.audio.cfg = &hdmi.cfg; + hdmi.audio.hdmi_dai_drv = &omap_hdmi_dai; + hdmi.audio.audio_start = hdmi4_audio_start; + hdmi.audio.audio_stop = hdmi4_audio_stop; + hdmi.audio.audio_config = hdmi4_audio_config; + dev_set_drvdata(&pdev->dev, &hdmi.audio); + r = hdmi_audio_register(pdev); + if (r) { + DSSERR("Registering HDMI audio failed\n"); + hdmi_uninit_output(pdev); + pm_runtime_disable(&pdev->dev); + return r; + } +#endif dss_debugfs_create_file("hdmi", hdmi_dump_regs); return 0; @@ -734,6 +776,9 @@ static int omapdss_hdmihw_probe(struct platform_device *pdev) static int __exit omapdss_hdmihw_remove(struct platform_device *pdev) { +#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO) + hdmi_audio_unregister(pdev); +#endif hdmi_uninit_output(pdev); pm_runtime_disable(&pdev->dev); -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Jyri Sarha <jsarha@ti.com> To: alsa-devel@alsa-project.org, linux-fbdev@vger.kernel.org, linux-omap@vger.kernel.org Cc: peter.ujfalusi@ti.com, broonie@kernel.org, liam.r.girdwood@linux.intel.com, tomi.valkeinen@ti.com, detheridge@ti.com, jyri.sarha@iki.fi, Jyri Sarha <jsarha@ti.com> Subject: [PATCH 06/12] OMAPDSS: hdmi4: Register HDMI audio ASoC drivers from HDMI driver Date: Thu, 26 Jun 2014 22:20:57 +0300 [thread overview] Message-ID: <f61b31d0b08c8a0b6ee295d5b0da62ead23983c9.1403807781.git.jsarha@ti.com> (raw) In-Reply-To: <cover.1403807781.git.jsarha@ti.com> Add audio datamember to hdmi struct and call register and unregister functions form hdmi_audio.c. Register function registers the integrated cpu dai, dummy HDMI codec, and simple-card machine driver for complete HDMI audio support. Signed-off-by: Jyri Sarha <jsarha@ti.com> --- drivers/video/fbdev/omap2/dss/hdmi4.c | 45 +++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/drivers/video/fbdev/omap2/dss/hdmi4.c b/drivers/video/fbdev/omap2/dss/hdmi4.c index 342ddb4..48f11f8 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi4.c +++ b/drivers/video/fbdev/omap2/dss/hdmi4.c @@ -34,6 +34,11 @@ #include <linux/regulator/consumer.h> #include <video/omapdss.h> +#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO) +#include <sound/soc.h> +#include <sound/soc-dai.h> +#endif + #include "hdmi4_core.h" #include "dss.h" #include "dss_features.h" @@ -52,6 +57,9 @@ static struct { struct clk *sys_clk; struct regulator *vdda_hdmi_dac_reg; +#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO) + struct hdmi_audio_data audio; +#endif bool core_enabled; struct omap_dss_device output; @@ -671,6 +679,21 @@ err: return r; } +#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO) +static struct snd_soc_dai_driver omap_hdmi_dai = { + .name = "omap4-hdmi-dai", + .playback = { + .channels_min = 2, + .channels_max = 8, + .rates = (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), + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE, + }, +}; +#endif + /* HDMI HW IP initialisation */ static int omapdss_hdmihw_probe(struct platform_device *pdev) { @@ -727,6 +750,25 @@ static int omapdss_hdmihw_probe(struct platform_device *pdev) hdmi_init_output(pdev); +#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO) + /* drvdata is only used by HDMI audio */ + hdmi.audio.hdmi_lock = &hdmi.lock; + hdmi.audio.wp = &hdmi.wp; + hdmi.audio.core = &hdmi.core; + hdmi.audio.cfg = &hdmi.cfg; + hdmi.audio.hdmi_dai_drv = &omap_hdmi_dai; + hdmi.audio.audio_start = hdmi4_audio_start; + hdmi.audio.audio_stop = hdmi4_audio_stop; + hdmi.audio.audio_config = hdmi4_audio_config; + dev_set_drvdata(&pdev->dev, &hdmi.audio); + r = hdmi_audio_register(pdev); + if (r) { + DSSERR("Registering HDMI audio failed\n"); + hdmi_uninit_output(pdev); + pm_runtime_disable(&pdev->dev); + return r; + } +#endif dss_debugfs_create_file("hdmi", hdmi_dump_regs); return 0; @@ -734,6 +776,9 @@ static int omapdss_hdmihw_probe(struct platform_device *pdev) static int __exit omapdss_hdmihw_remove(struct platform_device *pdev) { +#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO) + hdmi_audio_unregister(pdev); +#endif hdmi_uninit_output(pdev); pm_runtime_disable(&pdev->dev); -- 1.7.9.5
next prev parent reply other threads:[~2014-06-26 19:20 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-06-26 19:20 [PATCH 00/12] Rework OMAP4+ HDMI audio support Jyri Sarha 2014-06-26 19:20 ` Jyri Sarha 2014-06-26 19:20 ` [PATCH 01/12] ARM: OMAP2+: Remove non working OMAP HDMI audio initialization Jyri Sarha 2014-06-26 19:20 ` Jyri Sarha 2014-07-07 11:46 ` Tony Lindgren 2014-07-07 11:46 ` Tony Lindgren 2014-07-08 7:30 ` Peter Ujfalusi 2014-07-08 7:30 ` Peter Ujfalusi 2014-07-08 8:09 ` Tony Lindgren 2014-07-08 8:09 ` Tony Lindgren 2014-07-15 19:25 ` Jyri Sarha 2014-07-15 19:25 ` Jyri Sarha 2014-06-26 19:20 ` [PATCH 02/12] OMAPDSS: hdmi.h: Add HDMI_AUDIO_LAYOUT_6CH enum value Jyri Sarha 2014-06-26 19:20 ` Jyri Sarha 2014-06-26 19:20 ` [PATCH 03/12] OMAPDSS: hdmi_wp: Add function for getting hdmi_wp physical base address Jyri Sarha 2014-06-26 19:20 ` Jyri Sarha 2014-06-27 10:41 ` Tomi Valkeinen 2014-06-27 10:41 ` Tomi Valkeinen 2014-06-27 11:35 ` Jyri Sarha 2014-06-27 11:35 ` Jyri Sarha 2014-06-26 19:20 ` [PATCH 04/12] OMAPDSS: hdmi_audio: Integrated ASoC DAI component driver implementation Jyri Sarha 2014-06-26 19:20 ` Jyri Sarha 2014-06-27 11:10 ` Tomi Valkeinen 2014-06-27 11:10 ` Tomi Valkeinen 2014-06-27 11:57 ` Tomi Valkeinen 2014-06-27 11:57 ` Tomi Valkeinen 2014-06-27 12:06 ` Jyri Sarha 2014-06-27 12:06 ` Jyri Sarha 2014-06-27 12:11 ` Tomi Valkeinen 2014-06-27 12:11 ` Tomi Valkeinen 2014-06-27 12:26 ` Jyri Sarha 2014-06-27 12:26 ` Jyri Sarha 2014-06-27 13:06 ` Tomi Valkeinen 2014-06-27 13:06 ` Tomi Valkeinen 2014-06-27 15:33 ` Jyri Sarha 2014-06-27 15:33 ` Jyri Sarha 2014-06-26 19:20 ` [PATCH 05/12] OMAPDSS: Kconfig: Select audio dependencies if OMAP4_DSS_HDMI_AUDIO=y Jyri Sarha 2014-06-26 19:20 ` Jyri Sarha 2014-06-26 19:20 ` Jyri Sarha [this message] 2014-06-26 19:20 ` [PATCH 06/12] OMAPDSS: hdmi4: Register HDMI audio ASoC drivers from HDMI driver Jyri Sarha 2014-06-27 11:39 ` Tomi Valkeinen 2014-06-27 11:39 ` Tomi Valkeinen 2014-06-27 15:33 ` Jyri Sarha 2014-06-27 15:33 ` Jyri Sarha 2014-06-26 19:20 ` [PATCH 07/12] OMAPDSS: Kconfig: Select audio dependencies if OMAP5_DSS_HDMI_AUDIO=y Jyri Sarha 2014-06-26 19:20 ` Jyri Sarha 2014-06-27 11:49 ` Tomi Valkeinen 2014-06-27 11:49 ` Tomi Valkeinen 2014-06-26 19:20 ` [PATCH 08/12] OMAPDSS: hdmi5: Register HDMI audio ASoC drivers from HDMI driver Jyri Sarha 2014-06-26 19:20 ` Jyri Sarha 2014-06-26 19:21 ` [PATCH 09/12] ASoC: omap: Remove obsolete HDMI audio code and Kconfig options Jyri Sarha 2014-06-26 19:21 ` Jyri Sarha 2014-06-27 12:17 ` Mark Brown 2014-06-27 12:17 ` Mark Brown 2014-06-26 19:21 ` [PATCH 10/12] OMAPDSS: hdmi4: Remove callbacks for an external ASoC DAI driver Jyri Sarha 2014-06-26 19:21 ` Jyri Sarha 2014-06-26 19:21 ` [PATCH 11/12] OMAPDSS: hdmi5: " Jyri Sarha 2014-06-26 19:21 ` Jyri Sarha 2014-06-26 19:21 ` [PATCH 12/12] OMAPDSS: Remove all references to obsolete HDMI audio callbacks Jyri Sarha 2014-06-26 19:21 ` Jyri Sarha
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=f61b31d0b08c8a0b6ee295d5b0da62ead23983c9.1403807781.git.jsarha@ti.com \ --to=jsarha@ti.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=detheridge@ti.com \ --cc=jyri.sarha@iki.fi \ --cc=liam.r.girdwood@linux.intel.com \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=peter.ujfalusi@ti.com \ --cc=tomi.valkeinen@ti.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.