From: Jyri Sarha <jsarha-l0cyMroinI0@public.gmane.org> To: alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org, linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: peter.ujfalusi-l0cyMroinI0@public.gmane.org, broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, liam.r.girdwood-VuQAYsv1563Yd54FQh9/CA@public.gmane.org, bcousson-rdvid1DuHRBWk0Htik3J/w@public.gmane.org, tomi.valkeinen-l0cyMroinI0@public.gmane.org, detheridge-l0cyMroinI0@public.gmane.org, Jyri Sarha <jsarha-l0cyMroinI0@public.gmane.org> Subject: [PATCH 12/13] OMAPDSS: hdmi5: Register HDMI audio ASoC drivers from HDMI driver Date: Fri, 23 May 2014 22:08:01 +0300 [thread overview] Message-ID: <4e030b54017bfe0959f803f7474919f98e283c42.1400871999.git.jsarha@ti.com> (raw) In-Reply-To: <cover.1400871999.git.jsarha-l0cyMroinI0@public.gmane.org> The registering is best done here to share the resources owned by OMAPDSS HDMI driver with ASoC DAI and platform drivers. Signed-off-by: Jyri Sarha <jsarha-l0cyMroinI0@public.gmane.org> --- drivers/video/fbdev/omap2/dss/hdmi5.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/video/fbdev/omap2/dss/hdmi5.c b/drivers/video/fbdev/omap2/dss/hdmi5.c index c468b9e..1ba387b 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi5.c +++ b/drivers/video/fbdev/omap2/dss/hdmi5.c @@ -57,6 +57,9 @@ static struct { struct clk *sys_clk; struct regulator *vdda_reg; +#if defined(CONFIG_OMAP5_DSS_HDMI_AUDIO) + struct hdmi_audio_data audio; +#endif bool core_enabled; struct omap_dss_device output; @@ -761,6 +764,15 @@ static int omapdss_hdmihw_probe(struct platform_device *pdev) hdmi_init_output(pdev); +#if defined(CONFIG_OMAP5_DSS_HDMI_AUDIO) + r = hdmi_audio_register(pdev, &hdmi.audio, &hdmi.output, &hdmi.wp); + 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; @@ -768,6 +780,9 @@ static int omapdss_hdmihw_probe(struct platform_device *pdev) static int __exit omapdss_hdmihw_remove(struct platform_device *pdev) { +#if defined(CONFIG_OMAP5_DSS_HDMI_AUDIO) + hdmi_audio_unregister(&hdmi.audio); +#endif hdmi_uninit_output(pdev); pm_runtime_disable(&pdev->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
WARNING: multiple messages have this Message-ID (diff)
From: Jyri Sarha <jsarha@ti.com> To: alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org, linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: peter.ujfalusi-l0cyMroinI0@public.gmane.org, broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, liam.r.girdwood-VuQAYsv1563Yd54FQh9/CA@public.gmane.org, bcousson-rdvid1DuHRBWk0Htik3J/w@public.gmane.org, tomi.valkeinen-l0cyMroinI0@public.gmane.org, detheridge-l0cyMroinI0@public.gmane.org, Jyri Sarha <jsarha-l0cyMroinI0@public.gmane.org> Subject: [PATCH 12/13] OMAPDSS: hdmi5: Register HDMI audio ASoC drivers from HDMI driver Date: Fri, 23 May 2014 19:08:01 +0000 [thread overview] Message-ID: <4e030b54017bfe0959f803f7474919f98e283c42.1400871999.git.jsarha@ti.com> (raw) In-Reply-To: <cover.1400871999.git.jsarha-l0cyMroinI0@public.gmane.org> The registering is best done here to share the resources owned by OMAPDSS HDMI driver with ASoC DAI and platform drivers. Signed-off-by: Jyri Sarha <jsarha@ti.com> --- drivers/video/fbdev/omap2/dss/hdmi5.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/video/fbdev/omap2/dss/hdmi5.c b/drivers/video/fbdev/omap2/dss/hdmi5.c index c468b9e..1ba387b 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi5.c +++ b/drivers/video/fbdev/omap2/dss/hdmi5.c @@ -57,6 +57,9 @@ static struct { struct clk *sys_clk; struct regulator *vdda_reg; +#if defined(CONFIG_OMAP5_DSS_HDMI_AUDIO) + struct hdmi_audio_data audio; +#endif bool core_enabled; struct omap_dss_device output; @@ -761,6 +764,15 @@ static int omapdss_hdmihw_probe(struct platform_device *pdev) hdmi_init_output(pdev); +#if defined(CONFIG_OMAP5_DSS_HDMI_AUDIO) + r = hdmi_audio_register(pdev, &hdmi.audio, &hdmi.output, &hdmi.wp); + 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; @@ -768,6 +780,9 @@ static int omapdss_hdmihw_probe(struct platform_device *pdev) static int __exit omapdss_hdmihw_remove(struct platform_device *pdev) { +#if defined(CONFIG_OMAP5_DSS_HDMI_AUDIO) + hdmi_audio_unregister(&hdmi.audio); +#endif hdmi_uninit_output(pdev); pm_runtime_disable(&pdev->dev); -- 1.7.9.5
next prev parent reply other threads:[~2014-05-23 19:08 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-05-23 19:07 [PATCH 00/13] Fix OMAP4+ HDMI audio Jyri Sarha 2014-05-23 19:07 ` Jyri Sarha 2014-05-23 19:07 ` [PATCH 01/13] ARM: omap4.dtsi: Add audio related parametes to hdmi node Jyri Sarha 2014-05-23 19:07 ` Jyri Sarha 2014-05-23 19:07 ` [PATCH 02/13] ARM: omap5.dtsi: Add audio related parameters " Jyri Sarha 2014-05-23 19:07 ` Jyri Sarha 2014-05-23 19:07 ` [PATCH 04/13] OMAPDSS: hdmi_wp: Add function for getting hdmi_wp physical base address Jyri Sarha 2014-05-23 19:07 ` Jyri Sarha 2014-05-23 19:07 ` [PATCH 05/13] OMAPDSS: hdmi_audio: Add hdmi_audio.c for registering HDMI audio support Jyri Sarha 2014-05-23 19:07 ` Jyri Sarha 2014-05-23 19:07 ` [PATCH 06/13] ASoC: omap-hdmi-dai: Add platform data struct for omap-hdmi-dai driver Jyri Sarha 2014-05-23 19:07 ` Jyri Sarha 2014-05-23 19:07 ` [PATCH 07/13] ASoC: omap-hdmi-card: Add platform data stuct for omap-hdmi-card driver Jyri Sarha 2014-05-23 19:07 ` Jyri Sarha 2014-05-23 19:07 ` [PATCH 08/13] ASoC: omap-hdmi: Changes for registeing the driver from OMAPDSS Jyri Sarha 2014-05-23 19:07 ` Jyri Sarha 2014-05-23 19:07 ` [PATCH 09/13] ASoC: omap-hdmi-card: " Jyri Sarha 2014-05-23 19:07 ` Jyri Sarha 2014-05-23 19:07 ` [PATCH 10/13] OMAPDSS: hdmi4: Register HDMI audio ASoC drivers from HDMI driver Jyri Sarha 2014-05-23 19:07 ` Jyri Sarha 2014-05-23 19:08 ` [PATCH 11/13] OMAPDSS: hdmi.h: Add HDMI_AUDIO_LAYOUT_6CH enum value Jyri Sarha 2014-05-23 19:08 ` Jyri Sarha [not found] ` <cover.1400871999.git.jsarha-l0cyMroinI0@public.gmane.org> 2014-05-23 19:07 ` [PATCH 03/13] ARM: OMAP2+: Remove non working OMAP HDMI audio initialization Jyri Sarha 2014-05-23 19:07 ` Jyri Sarha 2014-05-23 19:08 ` Jyri Sarha [this message] 2014-05-23 19:08 ` [PATCH 12/13] OMAPDSS: hdmi5: Register HDMI audio ASoC drivers from HDMI driver Jyri Sarha 2014-05-23 19:08 ` [PATCH 13/13] ASoC: omap: Add Kconfig option for OMAP5 HDMI audio Jyri Sarha 2014-05-23 19:08 ` 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=4e030b54017bfe0959f803f7474919f98e283c42.1400871999.git.jsarha@ti.com \ --to=jsarha-l0cymroini0@public.gmane.org \ --cc=alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org \ --cc=bcousson-rdvid1DuHRBWk0Htik3J/w@public.gmane.org \ --cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=detheridge-l0cyMroinI0@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=liam.r.girdwood-VuQAYsv1563Yd54FQh9/CA@public.gmane.org \ --cc=linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=peter.ujfalusi-l0cyMroinI0@public.gmane.org \ --cc=tomi.valkeinen-l0cyMroinI0@public.gmane.org \ /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.