From patchwork Fri Aug 8 13:23:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jyri Sarha X-Patchwork-Id: 4696331 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AF370C0338 for ; Fri, 8 Aug 2014 13:32:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5BCC62017A for ; Fri, 8 Aug 2014 13:32:19 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 84CA4200E3 for ; Fri, 8 Aug 2014 13:32:17 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 96F9C265767; Fri, 8 Aug 2014 15:32:16 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 469A52655B3; Fri, 8 Aug 2014 15:24:42 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 85AAA26559A; Fri, 8 Aug 2014 15:24:39 +0200 (CEST) Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by alsa0.perex.cz (Postfix) with ESMTP id D40E82652E7 for ; Fri, 8 Aug 2014 15:24:17 +0200 (CEST) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s78DO8a5017735; Fri, 8 Aug 2014 08:24:08 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s78DO75Q000642; Fri, 8 Aug 2014 08:24:07 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Fri, 8 Aug 2014 08:24:07 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s78DO69C019388; Fri, 8 Aug 2014 08:24:07 -0500 From: Jyri Sarha To: , , Date: Fri, 8 Aug 2014 16:23:47 +0300 Message-ID: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Cc: liam.r.girdwood@linux.intel.com, detheridge@ti.com, broonie@kernel.org, Jyri Sarha , peter.ujfalusi@ti.com, tomi.valkeinen@ti.com Subject: [alsa-devel] [PATCH v3 06/14] OMAPDSS: hdmi_audio: Integrated ASoC DAI component driver implementation X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Integrate ASoC DAI component driver in to the OMAP hdmi driver. The patch also updates the relevant entry in ti,omap5-dss DT binding document. The driver registers a dummy hdmi codec driver and a simple-card driver to produce a fully functional ALSA device. The DAI driver is implemented in hdmi_audio.c, but it still needs to be registered from hdmi4.c or hdmi5.c. Signed-off-by: Jyri Sarha --- drivers/video/fbdev/omap2/dss/Kconfig | 3 + drivers/video/fbdev/omap2/dss/Makefile | 1 + drivers/video/fbdev/omap2/dss/hdmi.h | 37 +++- drivers/video/fbdev/omap2/dss/hdmi_audio.c | 298 ++++++++++++++++++++++++++++ 4 files changed, 335 insertions(+), 4 deletions(-) create mode 100644 drivers/video/fbdev/omap2/dss/hdmi_audio.c diff --git a/drivers/video/fbdev/omap2/dss/Kconfig b/drivers/video/fbdev/omap2/dss/Kconfig index 3d5eb6c..41fb8ac 100644 --- a/drivers/video/fbdev/omap2/dss/Kconfig +++ b/drivers/video/fbdev/omap2/dss/Kconfig @@ -67,6 +67,9 @@ config OMAP2_DSS_VENC config OMAP2_DSS_HDMI_COMMON bool +config OMAP_DSS_HDMI_AUDIO + bool + config OMAP4_DSS_HDMI bool "HDMI support for OMAP4" default y diff --git a/drivers/video/fbdev/omap2/dss/Makefile b/drivers/video/fbdev/omap2/dss/Makefile index 245f933..a95d715 100644 --- a/drivers/video/fbdev/omap2/dss/Makefile +++ b/drivers/video/fbdev/omap2/dss/Makefile @@ -13,6 +13,7 @@ omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o omapdss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o omapdss-$(CONFIG_OMAP2_DSS_HDMI_COMMON) += hdmi_common.o hdmi_wp.o hdmi_pll.o \ hdmi_phy.o +omapdss-$(CONFIG_OMAP_DSS_HDMI_AUDIO) += hdmi_audio.o omapdss-$(CONFIG_OMAP4_DSS_HDMI) += hdmi4.o hdmi4_core.o omapdss-$(CONFIG_OMAP5_DSS_HDMI) += hdmi5.o hdmi5_core.o ccflags-$(CONFIG_OMAP2_DSS_DEBUG) += -DDEBUG diff --git a/drivers/video/fbdev/omap2/dss/hdmi.h b/drivers/video/fbdev/omap2/dss/hdmi.h index f5ae8ae..64544e1 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi.h +++ b/drivers/video/fbdev/omap2/dss/hdmi.h @@ -25,6 +25,9 @@ #include #include