File linux-2.6.39-ASoC-omap-rx51-Enable-McBSP2-sidetone.patch of Package kernel-adaptation-n900

From 58c5dfb931c766e8e2a472e1217b559c9cbc5ca7 Mon Sep 17 00:00:00 2001
From: Jarkko Nikula <jhnikula@gmail.com>
Date: Thu, 10 Mar 2011 09:13:24 +0200
Subject: [PATCH] ASoC: omap: rx51: Enable McBSP2 sidetone

McBSP sidetone is needed in telephony applications. McBSP sidetone is a
configurable FIR filter that forms a loopback from McBSP input to output.
This patch enables the McBSP2 sidetone ALSA controls so that it can be used
on Nokia RX-51/N900.

Sidetone feature can be tested with following commands:

(set up codec input and output paths)
	# Enable and configure sidetone
	amixer -D hw:0 set 'McBSP2 Sidetone' on
	amixer set -D hw:0 'McBSP2 Sidetone Channel 0' 32767
	echo 32767 >/sys/devices/platform/omap-mcbsp.2/st_taps
	# Do not loop audio via CPU
	arecord -f dat >/dev/null |aplay /dev/zero

[jhnikula@gmail.com: This is for MeeGo N900 2.6.37. This is in API wise the
same than upstream commit fa4d1f5 that is queued for 2.6.39 but just manually
applied. Upstream version conflicts with the hacks here. Those hacks can be
dropped completely once kernel is upgraded to 2.6.38 and by applying a few
rx51.c patches from 2.6.39.]
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
---
 sound/soc/omap/rx51.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 6a4a894..2fd37b8 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -369,6 +369,10 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
 	tpa6130a2_add_controls(codec);
 	snd_soc_limit_volume(codec, "TPA6130A2 Headphone Playback Volume", 42);
 
+	err = omap_mcbsp_st_add_controls(codec, 1);
+	if (err < 0)
+		return err;
+
 	aic34b_add_controls(codec);
 
 	/* Set up RX-51 specific audio path audio_map */
-- 
1.7.2.3