linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 01/12] ARM: OMAP2+: Remove non working OMAP HDMI audio initialization
Date: Thu, 26 Jun 2014 19:20:52 +0000	[thread overview]
Message-ID: <b0764a3af8181db55db046d6139119def363e8eb.1403807781.git.jsarha@ti.com> (raw)
In-Reply-To: <cover.1403807781.git.jsarha@ti.com>

This code is not working currently and it can be removed. There is a
conflict in sharing resources with the actual HDMI driver and with
the ASoC HDMI audio DAI driver.

Signed-off-by: Jyri Sarha <jsarha@ti.com>
---
 arch/arm/mach-omap2/devices.c |   28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 592ba0a..b6f8f34 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -297,33 +297,6 @@ static void omap_init_audio(void)
 static inline void omap_init_audio(void) {}
 #endif
 
-#if defined(CONFIG_SND_OMAP_SOC_OMAP_HDMI) || \
-		defined(CONFIG_SND_OMAP_SOC_OMAP_HDMI_MODULE)
-
-static struct platform_device omap_hdmi_audio = {
-	.name	= "omap-hdmi-audio",
-	.id	= -1,
-};
-
-static void __init omap_init_hdmi_audio(void)
-{
-	struct omap_hwmod *oh;
-	struct platform_device *pdev;
-
-	oh = omap_hwmod_lookup("dss_hdmi");
-	if (!oh)
-		return;
-
-	pdev = omap_device_build("omap-hdmi-audio-dai", -1, oh, NULL, 0);
-	WARN(IS_ERR(pdev),
-	     "Can't build omap_device for omap-hdmi-audio-dai.\n");
-
-	platform_device_register(&omap_hdmi_audio);
-}
-#else
-static inline void omap_init_hdmi_audio(void) {}
-#endif
-
 #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
 
 #include <linux/platform_data/spi-omap2-mcspi.h>
@@ -459,7 +432,6 @@ static int __init omap2_init_devices(void)
 	 */
 	omap_init_audio();
 	omap_init_camera();
-	omap_init_hdmi_audio();
 	omap_init_mbox();
 	/* If dtb is there, the devices will be created dynamically */
 	if (!of_have_populated_dt()) {
-- 
1.7.9.5


  reply	other threads:[~2014-06-26 19:20 UTC|newest]

Thread overview: 30+ 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 [this message]
2014-07-07 11:46   ` [PATCH 01/12] ARM: OMAP2+: Remove non working OMAP HDMI audio initialization Tony Lindgren
2014-07-08  7:30     ` Peter Ujfalusi
2014-07-08  8:09       ` Tony Lindgren
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 ` [PATCH 03/12] OMAPDSS: hdmi_wp: Add function for getting hdmi_wp physical base address Jyri Sarha
2014-06-27 10:41   ` Tomi Valkeinen
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-27 11:10   ` Tomi Valkeinen
2014-06-27 11:57   ` Tomi Valkeinen
2014-06-27 12:06     ` Jyri Sarha
2014-06-27 12:11   ` Tomi Valkeinen
2014-06-27 12:26     ` Jyri Sarha
2014-06-27 13:06       ` Tomi Valkeinen
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 ` [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 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-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:21 ` [PATCH 09/12] ASoC: omap: Remove obsolete HDMI audio code and Kconfig options Jyri Sarha
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 ` [PATCH 11/12] OMAPDSS: hdmi5: " Jyri Sarha
2014-06-26 19:21 ` [PATCH 12/12] OMAPDSS: Remove all references to obsolete HDMI audio callbacks 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=b0764a3af8181db55db046d6139119def363e8eb.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).