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 <jsarha@ti.com> Subject: [PATCH v3 13/14] OMAPDSS: hdmi5: Remove callbacks for an external ASoC DAI driver Date: Fri, 08 Aug 2014 13:23:54 +0000 [thread overview] Message-ID: <d44c88c50daa4835e22f4d689ffeaa908912698c.1407503813.git.jsarha@ti.com> (raw) In-Reply-To: <cover.1407503813.git.jsarha@ti.com> Removes the OMAP5 HDMI audio callbacks for an external audio driver and the old external DAI driver does not work anymore after this patch. Signed-off-by: Jyri Sarha <jsarha@ti.com> --- drivers/video/fbdev/omap2/dss/hdmi5.c | 113 --------------------------------- 1 file changed, 113 deletions(-) diff --git a/drivers/video/fbdev/omap2/dss/hdmi5.c b/drivers/video/fbdev/omap2/dss/hdmi5.c index d796071..d91ea36 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi5.c +++ b/drivers/video/fbdev/omap2/dss/hdmi5.c @@ -495,112 +495,6 @@ static int hdmi_read_edid(struct omap_dss_device *dssdev, return r; } -#if defined(CONFIG_OMAP5_DSS_HDMI_AUDIO) -static int hdmi_audio_enable(struct omap_dss_device *dssdev) -{ - int r; - - mutex_lock(&hdmi.lock); - - if (!hdmi_mode_has_audio(hdmi.cfg.hdmi_dvi_mode)) { - r = -EPERM; - goto err; - } - - r = hdmi_wp_audio_enable(&hdmi.wp, true); - if (r) - goto err; - - mutex_unlock(&hdmi.lock); - return 0; - -err: - mutex_unlock(&hdmi.lock); - return r; -} - -static void hdmi_audio_disable(struct omap_dss_device *dssdev) -{ - hdmi_wp_audio_enable(&hdmi.wp, false); -} - -static int hdmi_audio_start(struct omap_dss_device *dssdev) -{ - return hdmi_wp_audio_core_req_enable(&hdmi.wp, true); -} - -static void hdmi_audio_stop(struct omap_dss_device *dssdev) -{ - hdmi_wp_audio_core_req_enable(&hdmi.wp, false); -} - -static bool hdmi_audio_supported(struct omap_dss_device *dssdev) -{ - bool r; - - mutex_lock(&hdmi.lock); - - r = hdmi_mode_has_audio(hdmi.cfg.hdmi_dvi_mode); - - mutex_unlock(&hdmi.lock); - return r; -} - -static int hdmi_audio_config(struct omap_dss_device *dssdev, - struct omap_dss_audio *audio) -{ - int r; - u32 pclk = hdmi.cfg.timings.pixelclock; - - mutex_lock(&hdmi.lock); - - if (!hdmi_mode_has_audio(hdmi.cfg.hdmi_dvi_mode)) { - r = -EPERM; - goto err; - } - - r = hdmi5_audio_config(&hdmi.core, &hdmi.wp, audio, pclk); - if (r) - goto err; - - mutex_unlock(&hdmi.lock); - return 0; - -err: - mutex_unlock(&hdmi.lock); - return r; -} -#else -static int hdmi_audio_enable(struct omap_dss_device *dssdev) -{ - return -EPERM; -} - -static void hdmi_audio_disable(struct omap_dss_device *dssdev) -{ -} - -static int hdmi_audio_start(struct omap_dss_device *dssdev) -{ - return -EPERM; -} - -static void hdmi_audio_stop(struct omap_dss_device *dssdev) -{ -} - -static bool hdmi_audio_supported(struct omap_dss_device *dssdev) -{ - return false; -} - -static int hdmi_audio_config(struct omap_dss_device *dssdev, - struct omap_dss_audio *audio) -{ - return -EPERM; -} -#endif - static int hdmi_set_infoframe(struct omap_dss_device *dssdev, const struct hdmi_avi_infoframe *avi) { @@ -629,13 +523,6 @@ static const struct omapdss_hdmi_ops hdmi_ops = { .read_edid = hdmi_read_edid, .set_infoframe = hdmi_set_infoframe, .set_hdmi_mode = hdmi_set_hdmi_mode, - - .audio_enable = hdmi_audio_enable, - .audio_disable = hdmi_audio_disable, - .audio_start = hdmi_audio_start, - .audio_stop = hdmi_audio_stop, - .audio_supported = hdmi_audio_supported, - .audio_config = hdmi_audio_config, }; static void hdmi_init_output(struct platform_device *pdev) -- 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 <jsarha@ti.com> Subject: [PATCH v3 13/14] OMAPDSS: hdmi5: Remove callbacks for an external ASoC DAI driver Date: Fri, 8 Aug 2014 16:23:54 +0300 [thread overview] Message-ID: <d44c88c50daa4835e22f4d689ffeaa908912698c.1407503813.git.jsarha@ti.com> (raw) In-Reply-To: <cover.1407503813.git.jsarha@ti.com> Removes the OMAP5 HDMI audio callbacks for an external audio driver and the old external DAI driver does not work anymore after this patch. Signed-off-by: Jyri Sarha <jsarha@ti.com> --- drivers/video/fbdev/omap2/dss/hdmi5.c | 113 --------------------------------- 1 file changed, 113 deletions(-) diff --git a/drivers/video/fbdev/omap2/dss/hdmi5.c b/drivers/video/fbdev/omap2/dss/hdmi5.c index d796071..d91ea36 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi5.c +++ b/drivers/video/fbdev/omap2/dss/hdmi5.c @@ -495,112 +495,6 @@ static int hdmi_read_edid(struct omap_dss_device *dssdev, return r; } -#if defined(CONFIG_OMAP5_DSS_HDMI_AUDIO) -static int hdmi_audio_enable(struct omap_dss_device *dssdev) -{ - int r; - - mutex_lock(&hdmi.lock); - - if (!hdmi_mode_has_audio(hdmi.cfg.hdmi_dvi_mode)) { - r = -EPERM; - goto err; - } - - r = hdmi_wp_audio_enable(&hdmi.wp, true); - if (r) - goto err; - - mutex_unlock(&hdmi.lock); - return 0; - -err: - mutex_unlock(&hdmi.lock); - return r; -} - -static void hdmi_audio_disable(struct omap_dss_device *dssdev) -{ - hdmi_wp_audio_enable(&hdmi.wp, false); -} - -static int hdmi_audio_start(struct omap_dss_device *dssdev) -{ - return hdmi_wp_audio_core_req_enable(&hdmi.wp, true); -} - -static void hdmi_audio_stop(struct omap_dss_device *dssdev) -{ - hdmi_wp_audio_core_req_enable(&hdmi.wp, false); -} - -static bool hdmi_audio_supported(struct omap_dss_device *dssdev) -{ - bool r; - - mutex_lock(&hdmi.lock); - - r = hdmi_mode_has_audio(hdmi.cfg.hdmi_dvi_mode); - - mutex_unlock(&hdmi.lock); - return r; -} - -static int hdmi_audio_config(struct omap_dss_device *dssdev, - struct omap_dss_audio *audio) -{ - int r; - u32 pclk = hdmi.cfg.timings.pixelclock; - - mutex_lock(&hdmi.lock); - - if (!hdmi_mode_has_audio(hdmi.cfg.hdmi_dvi_mode)) { - r = -EPERM; - goto err; - } - - r = hdmi5_audio_config(&hdmi.core, &hdmi.wp, audio, pclk); - if (r) - goto err; - - mutex_unlock(&hdmi.lock); - return 0; - -err: - mutex_unlock(&hdmi.lock); - return r; -} -#else -static int hdmi_audio_enable(struct omap_dss_device *dssdev) -{ - return -EPERM; -} - -static void hdmi_audio_disable(struct omap_dss_device *dssdev) -{ -} - -static int hdmi_audio_start(struct omap_dss_device *dssdev) -{ - return -EPERM; -} - -static void hdmi_audio_stop(struct omap_dss_device *dssdev) -{ -} - -static bool hdmi_audio_supported(struct omap_dss_device *dssdev) -{ - return false; -} - -static int hdmi_audio_config(struct omap_dss_device *dssdev, - struct omap_dss_audio *audio) -{ - return -EPERM; -} -#endif - static int hdmi_set_infoframe(struct omap_dss_device *dssdev, const struct hdmi_avi_infoframe *avi) { @@ -629,13 +523,6 @@ static const struct omapdss_hdmi_ops hdmi_ops = { .read_edid = hdmi_read_edid, .set_infoframe = hdmi_set_infoframe, .set_hdmi_mode = hdmi_set_hdmi_mode, - - .audio_enable = hdmi_audio_enable, - .audio_disable = hdmi_audio_disable, - .audio_start = hdmi_audio_start, - .audio_stop = hdmi_audio_stop, - .audio_supported = hdmi_audio_supported, - .audio_config = hdmi_audio_config, }; static void hdmi_init_output(struct platform_device *pdev) -- 1.7.9.5
next prev parent reply other threads:[~2014-08-08 13:23 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-08-08 13:23 [PATCH v3 00/14] Rework OMAP4+ HDMI audio support Jyri Sarha 2014-08-08 13:23 ` Jyri Sarha 2014-08-08 13:23 ` [PATCH v3 01/14] ARM: OMAP2+: Remove non working OMAP HDMI audio initialization Jyri Sarha 2014-08-08 13:23 ` Jyri Sarha 2014-08-08 13:23 ` [PATCH v3 02/14] OMAPDSS: hdmi.h: Add HDMI_AUDIO_LAYOUT_6CH enum value Jyri Sarha 2014-08-08 13:23 ` Jyri Sarha 2014-08-08 13:23 ` [PATCH v3 03/14] OMAPDSS: hdmi_common: hdmi_compute_acr is needed for OMAP5 HDMI audio too Jyri Sarha 2014-08-08 13:23 ` Jyri Sarha 2014-08-08 13:23 ` [PATCH v3 04/14] OMAPDSS: hdmi_wp: Add function for getting audio dma address Jyri Sarha 2014-08-08 13:23 ` Jyri Sarha 2014-08-08 13:23 ` [PATCH v3 05/14] OMAPDSS: hdmi: Make hdmi structure public Jyri Sarha 2014-08-08 13:23 ` Jyri Sarha 2014-08-08 13:23 ` [PATCH v3 06/14] OMAPDSS: hdmi_audio: Integrated ASoC DAI component driver implementation Jyri Sarha 2014-08-08 13:23 ` Jyri Sarha 2014-08-08 13:23 ` [PATCH v3 07/14] OMAPDSS: Kconfig: Update OMAP4_DSS_HDMI_AUDIO option Jyri Sarha 2014-08-08 13:23 ` Jyri Sarha 2014-08-08 13:23 ` [PATCH v3 08/14] OMAPDSS: hdmi4: Register HDMI audio ASoC drivers from HDMI driver Jyri Sarha 2014-08-08 13:23 ` Jyri Sarha 2014-08-08 13:23 ` [PATCH v3 09/14] OMAPDSS: Kconfig: Update OMAP5_DSS_HDMI_AUDIO option Jyri Sarha 2014-08-08 13:23 ` Jyri Sarha 2014-08-08 13:23 ` [PATCH v3 10/14] OMAPDSS: hdmi5: Register HDMI audio ASoC drivers from HDMI driver Jyri Sarha 2014-08-08 13:23 ` Jyri Sarha 2014-08-08 13:23 ` [PATCH v3 11/14] ASoC: omap: Remove obsolete HDMI audio code and Kconfig options Jyri Sarha 2014-08-08 13:23 ` Jyri Sarha 2014-08-08 13:23 ` [PATCH v3 12/14] OMAPDSS: hdmi4: Remove callbacks for an external ASoC DAI driver Jyri Sarha 2014-08-08 13:23 ` Jyri Sarha 2014-08-08 13:23 ` Jyri Sarha [this message] 2014-08-08 13:23 ` [PATCH v3 13/14] OMAPDSS: hdmi5: " Jyri Sarha 2014-08-08 13:23 ` [PATCH v3 14/14] OMAPDSS: Remove all references to obsolete HDMI audio callbacks Jyri Sarha 2014-08-08 13:23 ` Jyri Sarha 2014-08-13 11:04 ` [PATCH v3 00/14] Rework OMAP4+ HDMI audio support Mark Brown 2014-08-13 11:04 ` Mark Brown 2014-08-13 12:51 ` Jyri Sarha 2014-08-13 12:51 ` Jyri Sarha 2014-08-13 17:26 ` Mark Brown 2014-08-13 17:26 ` Mark Brown 2014-08-14 9:28 ` Jyri Sarha 2014-08-14 9:28 ` Jyri Sarha 2014-08-14 19:10 ` Mark Brown 2014-08-14 19:10 ` Mark Brown
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=d44c88c50daa4835e22f4d689ffeaa908912698c.1407503813.git.jsarha@ti.com \ --to=jsarha@ti.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=detheridge@ti.com \ --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.