From patchwork Tue Aug 31 05:47:07 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
X-Patchwork-Id: 144471
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o7V5ktFI009823
	for <patchwork-sh@patchwork.kernel.org>; Tue, 31 Aug 2010 05:47:57 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754680Ab0HaFrQ (ORCPT
	<rfc822;patchwork-sh@patchwork.kernel.org>);
	Tue, 31 Aug 2010 01:47:16 -0400
Received: from mail.renesas.com ([202.234.163.13]:62068 "EHLO
	mail07.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1754581Ab0HaFrP (ORCPT
	<rfc822;linux-sh@vger.kernel.org>); Tue, 31 Aug 2010 01:47:15 -0400
X-AuditID: ac14038b-0000000a00000202-a5-4c7c975b3fee
Received: from guardian03.idc.renesas.com ([172.20.8.202])
	by mail07.idc.renesas.com (sendmail) with ESMTP id o7V5l7bv023114;
	Tue, 31 Aug 2010 14:47:07 +0900 (JST)
Received: (from root@localhost)
	by guardian03.idc.renesas.com with  id o7V5l7Zg021437;
	Tue, 31 Aug 2010 14:47:07 +0900 (JST)
Received: from mta01.idc.renesas.com (localhost [127.0.0.1])
	by mta01.idc.renesas.com with ESMTP id o7V5l68u005196;
	Tue, 31 Aug 2010 14:47:06 +0900 (JST)
Received: from PG10870.renesas.com ([172.30.8.159])
	by ims05.idc.renesas.com (Sendmail)
	with ESMTPA id <0L80009EA5EJPY@ims05.idc.renesas.com>; Tue,
	31 Aug 2010 14:47:07 +0900 (JST)
Date: Tue, 31 Aug 2010 14:47:07 +0900 (JST)
Date-warning: Date header was inserted by ims05.idc.renesas.com
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Subject: [PATCH 2/4 v2] ASoC: Add sh_mobile_hdmi sound support
In-reply-to: <w3p39tv72sx.wl%kuninori.morimoto.gx@renesas.com>
To: Paul Mundt <lethal@linux-sh.org>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Linux-SH <linux-sh@vger.kernel.org>,
	Linux-ALSA <alsa-devel@alsa-project.org>,
	Liam Girdwood <lrg@slimlogic.co.uk>
Message-id: <w3pwrr75o6d.wl%kuninori.morimoto.gx@renesas.com>
MIME-version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-type: text/plain; charset=US-ASCII
User-Agent: SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-2022-JP-2?B?U2Fuag==?=
	=?ISO-2022-JP-2?B?GyQoRCtXGyhC?=) APEL/10.6 Emacs/23.2
	(i386-mingw-nt5.1.2600) MULE/6.0 (HANACHIRUSATO)
References: <w3p39tv72sx.wl%kuninori.morimoto.gx@renesas.com>
X-Brightmail-Tracker: AAAAAA==
Sender: linux-sh-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-sh.vger.kernel.org>
X-Mailing-List: linux-sh@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Tue, 31 Aug 2010 05:47:57 +0000 (UTC)


diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c
index d25e348..f14c58a 100644
--- a/drivers/video/sh_mobile_hdmi.c
+++ b/drivers/video/sh_mobile_hdmi.c
@@ -22,6 +22,8 @@
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/workqueue.h>
+#include <sound/soc-dapm.h>
+#include <sound/initval.h>
 
 #include <video/sh_mobile_hdmi.h>
 #include <video/sh_mobile_lcdc.h>
@@ -222,6 +224,62 @@ static u8 hdmi_read(struct sh_hdmi *hdmi, u8 reg)
 	return ioread8(hdmi->base + reg);
 }
 
+/************************************************************************
+
+
+			HDMI sound
+
+
+************************************************************************/
+static unsigned int sh_hdmi_snd_read(struct snd_soc_codec *codec,
+				     unsigned int reg)
+{
+	struct sh_hdmi *hdmi = snd_soc_codec_get_drvdata(codec);
+
+	return hdmi_read(hdmi, reg);
+}
+
+static int sh_hdmi_snd_write(struct snd_soc_codec *codec,
+			     unsigned int reg,
+			     unsigned int value)
+{
+	struct sh_hdmi *hdmi = snd_soc_codec_get_drvdata(codec);
+
+	hdmi_write(hdmi, value, reg);
+	return 0;
+}
+
+static struct snd_soc_dai_driver sh_hdmi_dai = {
+	.name = "sh_mobile_hdmi-hifi",
+	.playback = {
+		.stream_name = "Playback",
+		.channels_min = 1,
+		.channels_max = 2,
+		.rates = SNDRV_PCM_RATE_8000_48000,
+		.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE,
+	},
+};
+
+static int sh_hdmi_snd_probe(struct snd_soc_codec *codec)
+{
+	dev_info(codec->dev, "SH Mobile HDMI Audio Codec");
+
+	return 0;
+}
+
+static struct snd_soc_codec_driver soc_codec_dev_sh_hdmi = {
+	.probe		= sh_hdmi_snd_probe,
+	.read		= sh_hdmi_snd_read,
+	.write		= sh_hdmi_snd_write,
+};
+
+/************************************************************************
+
+
+			HDMI video
+
+
+************************************************************************/
 /* External video parameter settings */
 static void hdmi_external_video_param(struct sh_hdmi *hdmi)
 {
@@ -804,6 +862,11 @@ static int __init sh_hdmi_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	}
 
+	ret =  snd_soc_register_codec(&pdev->dev,
+			&soc_codec_dev_sh_hdmi, &sh_hdmi_dai, 1);
+	if (ret < 0)
+		goto egetclk;
+
 	hdmi->dev = &pdev->dev;
 
 	hdmi->hdmi_clk = clk_get(&pdev->dev, "ick");
@@ -901,6 +964,8 @@ static int __exit sh_hdmi_remove(struct platform_device *pdev)
 	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	int irq = platform_get_irq(pdev, 0);
 
+	snd_soc_unregister_codec(&pdev->dev);
+
 	pdata->lcd_chan->board_cfg.display_on = NULL;
 	pdata->lcd_chan->board_cfg.display_off = NULL;
 	pdata->lcd_chan->board_cfg.board_data = NULL;