[Armadeus-commitlog] SF.net SVN: armadeus:[1023] branches/tsc210x/buildroot/target/device/ armadeu
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[1023] branches/tsc210x/buildroot/target/device/ armadeus/linux/kernel-patches/2.6.27.2
|
From: <ar...@us...> - 2009-01-19 15:10:04
|
Revision: 1023
http://armadeus.svn.sourceforge.net/armadeus/?rev=1023&view=rev
Author: artemys
Date: 2009-01-19 15:09:57 +0000 (Mon, 19 Jan 2009)
Log Message:
-----------
[TSC BRANCH] [LINUX] Correct some merge problems in i.MX SSI alsa driver
Modified Paths:
--------------
branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-095-armadeus-imx-ssi-add_driver.patch
branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-305-apf27-armadeus-separates_imx_and_mx2_alsa_build.patch
Modified: branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-095-armadeus-imx-ssi-add_driver.patch
===================================================================
--- branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-095-armadeus-imx-ssi-add_driver.patch 2009-01-19 09:21:41 UTC (rev 1022)
+++ branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-095-armadeus-imx-ssi-add_driver.patch 2009-01-19 15:09:57 UTC (rev 1023)
@@ -3,7 +3,7 @@
(Take a look at armadeus/target/linux/ directory to know how to generate it)
--- linux-2.6.27.2.original/sound/arm/imx-ssi.c
+++ linux-2.6.27.2.mod/sound/arm/imx-ssi.c
-@@ -0,0 +1,514 @@
+@@ -0,0 +1,511 @@
+/*
+ * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2008 Juergen Beisert, ke...@pe...
@@ -337,23 +337,20 @@
+int imx_ssi_prepare(struct snd_pcm_substream *substream,
+ int ssi_id)
+{
-+// SSI_SCSR |= SSI_SCSR_EN;
+ set_reg_bits(SSI_SCSR_EN, SSI_SCSR_EN, SSI_SCSR, ssi_id);
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-+// SSI_STCR |= SSI_MAE;
+ set_reg_bits(SSI_MAE, SSI_MAE, SSI_STCR, ssi_id);
+ else
-+// SSI_SRCR |= SSI_MAE;
+ set_reg_bits(SSI_MAE, SSI_MAE, SSI_SRCR, ssi_id);
+
+ return 0;
+}
++EXPORT_SYMBOL(imx_ssi_prepare);
+
+void imx_ssi_shutdown(struct snd_pcm_substream *substream,
+ int ssi_id)
+{
-+// SSI_SCSR &= ~SSI_SCSR_EN;
+ set_reg_bits(SSI_SCSR_EN, 0, SSI_SCSR, ssi_id);
+
+}
@@ -545,8 +542,8 @@
+#ifndef __SOUND_ARM_IMX_SSI_H
+#define __SOUND_ARM_IMX_SSI_H
+
-+int imx_ssi_prepare(struct snd_pcm_substream *substream, int ssi_id);
-+void imx_ssi_shutdown(struct snd_pcm_substream *substream, int ssi_id);
++extern int imx_ssi_prepare(struct snd_pcm_substream *substream, int ssi_id);
++extern void imx_ssi_shutdown(struct snd_pcm_substream *substream, int ssi_id);
+extern int imx_ssi_trigger(struct snd_pcm_substream *substream, int cmd, int ssi_id);
+
+extern int imx_ssi_get_dma_tx_channel(int, int);
Modified: branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-305-apf27-armadeus-separates_imx_and_mx2_alsa_build.patch
===================================================================
--- branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-305-apf27-armadeus-separates_imx_and_mx2_alsa_build.patch 2009-01-19 09:21:41 UTC (rev 1022)
+++ branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-305-apf27-armadeus-separates_imx_and_mx2_alsa_build.patch 2009-01-19 15:09:57 UTC (rev 1023)
@@ -44,7 +44,7 @@
-obj-$(CONFIG_SND_IMX_TSC2102) += snd-imx-alsa-tsc2102.o
-snd-imx-alsa-tsc2102-objs := imx-alsa.o imx-alsa-tsc2102.o imx-alsa-tsc2102-mixer.o
-+obj-$(CONFIG_SND_IMX) += snd-imx.o
++obj-$(CONFIG_SND_IMX_PCM) += snd-imx.o
+snd-imx-objs :=imx-ssi.o
+
+obj-$(CONFIG_SND_IMX_TSC2102) += snd-imx-alsa-tsc2102.o
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
