[Armadeus-commitlog] SF.net SVN: armadeus:[1018] branches/tsc210x/buildroot/target/device/ armadeu
Brought to you by:
sszy
Revision: 1018
http://armadeus.svn.sourceforge.net/armadeus/?rev=1018&view=rev
Author: artemys
Date: 2009-01-14 15:22:10 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
[TSC BRANCH] [LINUX] Update alsa include
Modified Paths:
--------------
branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-090-armadeus-alsa-create_imx-alsa_h.patch
Modified: branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-090-armadeus-alsa-create_imx-alsa_h.patch
===================================================================
--- branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-090-armadeus-alsa-create_imx-alsa_h.patch 2009-01-14 14:21:01 UTC (rev 1017)
+++ branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-090-armadeus-alsa-create_imx-alsa_h.patch 2009-01-14 15:22:10 UTC (rev 1018)
@@ -3,13 +3,13 @@
(Take a look at armadeus/target/linux/ directory to know how to generate it)
--- linux-2.6.27.2.original/arch/arm/mach-imx/include/mach/imx-alsa.h
+++ linux-2.6.27.2.mod/arch/arm/mach-imx/include/mach/imx-alsa.h
-@@ -0,0 +1,131 @@
+@@ -0,0 +1,151 @@
+/*
+ * linux/include/asm-arm/arch-imx/imx-alsa.h
+ *
-+ * Alsa Driver for AIC23 and TSC2101 codecs on iMX platform boards.
++ * Alsa Driver for i.MX platform based boards.
+ *
-+ * Copyright (C) 2008 Armadeus <nic...@ar...>
++ * Copyright (C) 2008 Armadeus systems <nic...@ar...>
+ * Based on the omap alsa driver
+ *
+ * This program is free software; you can redistribute it and/or modify it
@@ -81,8 +81,12 @@
+ int periods; /* current count of periods registered in the DMA engine */
+ spinlock_t dma_lock; /* for locking in DMA operations */
+ struct snd_pcm_substream *stream; /* the pcm stream */
-+ int (*hw_start)(void); /* interface to start HW interface, e.g. McBSP */
-+ int (*hw_stop)(void); /* interface to stop HW interface, e.g. McBSP */
++
++ void *base; /* physical address of the DMA buffer in memory */
++ void *adr; /* virtual address of the DMA buffer */
++ int size; /* buffer size */
++ int sg_count;
++ struct scatterlist *sg_list;
+};
+
+
@@ -97,8 +101,7 @@
+};
+
+/* Codec specific information and function pointers.
-+ * Codec imx-alsa-tsc2101.c
-+ * is responsible for defining the function pointers.
++ * Codec is responsible for defining the function pointers.
+ */
+struct imx_alsa_codec_config {
+ char *name;
@@ -109,11 +112,28 @@
+ void (*codec_configure_dev)(void);
+ void (*codec_set_samplerate)(long);
+ void (*codec_clock_setup)(void);
-+ int (*codec_clock_on)(void);
-+ int (*codec_clock_off)(void);
-+ int (*get_default_samplerate)(void);
++ int (*codec_clock_on)(void);
++ int (*codec_clock_off)(void);
++ int (*get_default_samplerate)(void);
+};
+
++#ifdef CONFIG_ARCH_IMX
++#define IMX_SUPPORTED_SSI_UNITS 1
++#elif CONFIG_ARCH_MX2
++#define IMX_SUPPORTED_SSI_UNITS 2
++#endif
++
++struct imx_sound_connection {
++ int cpu_port; /* from 1 to 4 on i.MX27, 0 unused */
++ int dev_port; /* I2S device specific. 1 to 2 for PMIC MC13783, 0 unused */
++};
++
++struct imx_sound_platform_data {
++ struct imx_sound_connection connection[IMX_SUPPORTED_SSI_UNITS];
++ int (*init)(struct platform_device *pdev);
++ void (*exit)(struct platform_device *pdev);
++};
++
+/*********** Mixer function prototypes *************************/
+int snd_imx_mixer(struct snd_card_imx_codec *);
+void snd_imx_init_mixer(void);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|