From: Peter Ujfalusi <peter.ujfalusi@ti.com> To: Mark Brown <broonie@opensource.wolfsonmicro.com>, Liam Girdwood <lrg@ti.com>, Tony Lindgren <tony@atomide.com>, Russell King <rmk+kernel@arm.linux.org.uk>, Vinod Koul <vinod.koul@intel.com>, Dan Williams <djbw@fb.com>, Jarkko Nikula <jarkko.nikula@bitmer.com> Cc: alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>, Ricardo Neri <ricardo.neri@ti.com>, Lars-Peter Clausen <lars@metafoo.de> Subject: [PATCH v2 12/15] ASoC: OMAP: mcbsp, mcpdm, dmic: Let omap-pcm to pick the dma_type Date: Thu, 13 Sep 2012 16:38:02 +0300 [thread overview] Message-ID: <1347543485-339-13-git-send-email-peter.ujfalusi@ti.com> (raw) In-Reply-To: <1347543485-339-1-git-send-email-peter.ujfalusi@ti.com> omap-pcm can figure out the correct dma_type based on the stream's format. In this way we can get rid of the plat/dma.h include from these drivers. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- sound/soc/omap/omap-dmic.c | 2 -- sound/soc/omap/omap-mcbsp.c | 3 --- sound/soc/omap/omap-mcpdm.c | 3 --- 3 files changed, 8 deletions(-) diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index 60b7b8c..df0ff24 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c @@ -33,7 +33,6 @@ #include <linux/slab.h> #include <linux/pm_runtime.h> #include <linux/of_device.h> -#include <plat/dma.h> #include <sound/core.h> #include <sound/pcm.h> @@ -63,7 +62,6 @@ struct omap_dmic { */ static struct omap_pcm_dma_data omap_dmic_dai_dma_params = { .name = "DMIC capture", - .data_type = OMAP_DMA_DATA_TYPE_S32, }; static inline void omap_dmic_write(struct omap_dmic *dmic, u16 reg, u32 val) diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 5b3bacc..a230646 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -34,7 +34,6 @@ #include <sound/initval.h> #include <sound/soc.h> -#include <plat/dma.h> #include <plat/mcbsp.h> #include "mcbsp.h" #include "omap-mcbsp.h" @@ -234,11 +233,9 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, switch (params_format(params)) { case SNDRV_PCM_FORMAT_S16_LE: - dma_data->data_type = OMAP_DMA_DATA_TYPE_S16; wlen = 16; break; case SNDRV_PCM_FORMAT_S32_LE: - dma_data->data_type = OMAP_DMA_DATA_TYPE_S32; wlen = 32; break; default: diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index f90d5de..84743d4 100644 --- a/sound/soc/omap/omap-mcpdm.c +++ b/sound/soc/omap/omap-mcpdm.c @@ -40,7 +40,6 @@ #include <sound/pcm_params.h> #include <sound/soc.h> -#include <plat/dma.h> #include <plat/omap_hwmod.h> #include "omap-mcpdm.h" #include "omap-pcm.h" @@ -71,11 +70,9 @@ struct omap_mcpdm { static struct omap_pcm_dma_data omap_mcpdm_dai_dma_params[] = { { .name = "Audio playback", - .data_type = OMAP_DMA_DATA_TYPE_S32, }, { .name = "Audio capture", - .data_type = OMAP_DMA_DATA_TYPE_S32, }, }; -- 1.7.12
WARNING: multiple messages have this Message-ID (diff)
From: peter.ujfalusi@ti.com (Peter Ujfalusi) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 12/15] ASoC: OMAP: mcbsp, mcpdm, dmic: Let omap-pcm to pick the dma_type Date: Thu, 13 Sep 2012 16:38:02 +0300 [thread overview] Message-ID: <1347543485-339-13-git-send-email-peter.ujfalusi@ti.com> (raw) In-Reply-To: <1347543485-339-1-git-send-email-peter.ujfalusi@ti.com> omap-pcm can figure out the correct dma_type based on the stream's format. In this way we can get rid of the plat/dma.h include from these drivers. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- sound/soc/omap/omap-dmic.c | 2 -- sound/soc/omap/omap-mcbsp.c | 3 --- sound/soc/omap/omap-mcpdm.c | 3 --- 3 files changed, 8 deletions(-) diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index 60b7b8c..df0ff24 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c @@ -33,7 +33,6 @@ #include <linux/slab.h> #include <linux/pm_runtime.h> #include <linux/of_device.h> -#include <plat/dma.h> #include <sound/core.h> #include <sound/pcm.h> @@ -63,7 +62,6 @@ struct omap_dmic { */ static struct omap_pcm_dma_data omap_dmic_dai_dma_params = { .name = "DMIC capture", - .data_type = OMAP_DMA_DATA_TYPE_S32, }; static inline void omap_dmic_write(struct omap_dmic *dmic, u16 reg, u32 val) diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 5b3bacc..a230646 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -34,7 +34,6 @@ #include <sound/initval.h> #include <sound/soc.h> -#include <plat/dma.h> #include <plat/mcbsp.h> #include "mcbsp.h" #include "omap-mcbsp.h" @@ -234,11 +233,9 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, switch (params_format(params)) { case SNDRV_PCM_FORMAT_S16_LE: - dma_data->data_type = OMAP_DMA_DATA_TYPE_S16; wlen = 16; break; case SNDRV_PCM_FORMAT_S32_LE: - dma_data->data_type = OMAP_DMA_DATA_TYPE_S32; wlen = 32; break; default: diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index f90d5de..84743d4 100644 --- a/sound/soc/omap/omap-mcpdm.c +++ b/sound/soc/omap/omap-mcpdm.c @@ -40,7 +40,6 @@ #include <sound/pcm_params.h> #include <sound/soc.h> -#include <plat/dma.h> #include <plat/omap_hwmod.h> #include "omap-mcpdm.h" #include "omap-pcm.h" @@ -71,11 +70,9 @@ struct omap_mcpdm { static struct omap_pcm_dma_data omap_mcpdm_dai_dma_params[] = { { .name = "Audio playback", - .data_type = OMAP_DMA_DATA_TYPE_S32, }, { .name = "Audio capture", - .data_type = OMAP_DMA_DATA_TYPE_S32, }, }; -- 1.7.12
next prev parent reply other threads:[~2012-09-13 13:40 UTC|newest] Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-09-13 13:37 [PATCH v2 00/15] ASoC: OMAP: Convert to use dmaengine Peter Ujfalusi 2012-09-13 13:37 ` Peter Ujfalusi 2012-09-13 13:37 ` Peter Ujfalusi 2012-09-13 13:37 ` [PATCH v2 01/15] dmaengine: omap: Support for element mode in cyclic DMA Peter Ujfalusi 2012-09-13 13:37 ` Peter Ujfalusi 2012-09-13 13:37 ` [PATCH v2 02/15] dmaengine: omap: Add support for pause/resume in cyclic dma mode Peter Ujfalusi 2012-09-13 13:37 ` Peter Ujfalusi 2012-09-13 13:37 ` Peter Ujfalusi 2012-09-13 13:37 ` [PATCH v2 03/15] dmaengine: Add no_wakeup parameter to dmaengine_prep_dma_cyclic() Peter Ujfalusi 2012-09-13 13:37 ` Peter Ujfalusi 2012-09-13 13:37 ` Peter Ujfalusi 2012-09-13 15:27 ` Lars-Peter Clausen 2012-09-13 15:27 ` Lars-Peter Clausen 2012-09-13 15:27 ` Lars-Peter Clausen 2012-09-13 15:38 ` Russell King - ARM Linux 2012-09-13 15:38 ` Russell King - ARM Linux 2012-09-14 3:27 ` Vinod Koul 2012-09-14 3:27 ` Vinod Koul 2012-09-14 3:27 ` Vinod Koul 2012-09-14 7:15 ` Peter Ujfalusi 2012-09-14 7:15 ` Peter Ujfalusi 2012-09-14 7:15 ` Peter Ujfalusi 2012-09-14 3:26 ` Vinod Koul 2012-09-14 3:26 ` Vinod Koul 2012-09-14 3:26 ` Vinod Koul 2012-09-14 7:18 ` [alsa-devel] " Peter Ujfalusi 2012-09-14 7:18 ` Peter Ujfalusi 2012-09-14 7:18 ` Peter Ujfalusi 2012-09-14 8:13 ` Lars-Peter Clausen 2012-09-14 8:13 ` Lars-Peter Clausen 2012-09-14 8:13 ` Lars-Peter Clausen 2012-09-14 8:50 ` Vinod Koul 2012-09-14 8:50 ` Vinod Koul 2012-09-14 8:50 ` Vinod Koul 2012-09-14 9:28 ` Peter Ujfalusi 2012-09-14 9:28 ` Peter Ujfalusi 2012-09-14 9:28 ` Peter Ujfalusi 2012-09-14 9:38 ` Vinod Koul 2012-09-14 9:38 ` Vinod Koul 2012-09-14 9:38 ` Vinod Koul 2012-09-14 10:01 ` Russell King - ARM Linux 2012-09-14 10:01 ` Russell King - ARM Linux 2012-09-14 7:12 ` Peter Ujfalusi 2012-09-14 7:12 ` Peter Ujfalusi 2012-09-13 13:37 ` [PATCH v2 04/15] dmaengine: Pass no_wakeup parameter via device_prep_dma_cyclic() callback Peter Ujfalusi 2012-09-13 13:37 ` Peter Ujfalusi 2012-09-14 3:24 ` Vinod Koul 2012-09-14 3:24 ` Vinod Koul 2012-09-14 3:24 ` Vinod Koul 2012-09-14 7:07 ` Peter Ujfalusi 2012-09-14 7:07 ` Peter Ujfalusi 2012-09-14 7:07 ` Peter Ujfalusi 2012-09-17 6:34 ` Shawn Guo 2012-09-17 6:34 ` Shawn Guo 2012-09-17 6:34 ` Shawn Guo 2012-09-17 7:16 ` Peter Ujfalusi 2012-09-17 7:16 ` Peter Ujfalusi 2012-09-17 7:16 ` Peter Ujfalusi 2012-09-17 7:23 ` Shawn Guo 2012-09-17 7:23 ` Shawn Guo 2012-09-17 9:01 ` Linus Walleij 2012-09-17 9:01 ` Linus Walleij 2012-09-17 9:01 ` Linus Walleij 2012-09-18 8:31 ` Russell King - ARM Linux 2012-09-18 8:31 ` Russell King - ARM Linux 2012-09-18 8:31 ` Russell King - ARM Linux 2012-09-18 9:00 ` Vinod Koul 2012-09-18 9:00 ` Vinod Koul 2012-09-18 9:00 ` Vinod Koul 2012-09-18 12:22 ` Linus Walleij 2012-09-18 12:22 ` Linus Walleij 2012-09-18 12:22 ` Linus Walleij 2012-09-13 13:37 ` [PATCH v2 05/15] dmaengine: omap-dma: Add support for no_wakeup in cyclic mode Peter Ujfalusi 2012-09-13 13:37 ` Peter Ujfalusi 2012-09-13 13:37 ` Peter Ujfalusi 2012-09-13 13:37 ` [PATCH v2 06/15] ASoC: omap-mcbsp: Use sDMA packet mode instead of frame mode Peter Ujfalusi 2012-09-13 13:37 ` Peter Ujfalusi 2012-09-13 13:37 ` [PATCH v2 07/15] ASoC: omap-pcm: Select sDMA synchronization based on packet_size Peter Ujfalusi 2012-09-13 13:37 ` Peter Ujfalusi 2012-09-13 13:37 ` [PATCH v2 08/15] ASoC: OMAP: Remove sync_mode from omap_pcm_dma_data struct Peter Ujfalusi 2012-09-13 13:37 ` Peter Ujfalusi 2012-09-13 13:37 ` [PATCH v2 09/15] ASoC: omap-pcm: Prepare to configure the DMA data_type based on stream properties Peter Ujfalusi 2012-09-13 13:37 ` Peter Ujfalusi 2012-09-13 13:38 ` [PATCH v2 10/15] ARM: OMAP4: hwmod_data: Add resource names to McPDM memory ranges Peter Ujfalusi 2012-09-13 13:38 ` Peter Ujfalusi 2012-09-13 13:38 ` [PATCH v2 11/15] ASoC: omap-mcpdm: Use platform_get_resource_* to get resources Peter Ujfalusi 2012-09-13 13:38 ` Peter Ujfalusi 2012-09-13 13:38 ` Peter Ujfalusi 2012-09-13 13:38 ` Peter Ujfalusi [this message] 2012-09-13 13:38 ` [PATCH v2 12/15] ASoC: OMAP: mcbsp, mcpdm, dmic: Let omap-pcm to pick the dma_type Peter Ujfalusi 2012-09-13 13:38 ` [PATCH v2 13/15] ASoC: omap-pcm, omap-dmic: Change the use of omap_pcm_dma_data->data_type Peter Ujfalusi 2012-09-13 13:38 ` Peter Ujfalusi 2012-09-13 13:38 ` [PATCH v2 14/15] ASoC: OMAP: mcbsp, mcpdm, dmic, hdmi: Set dma_data at startup time Peter Ujfalusi 2012-09-13 13:38 ` Peter Ujfalusi 2012-09-13 13:38 ` [PATCH v2 15/15] ASoC: omap-pcm: Convert to use dmaengine Peter Ujfalusi 2012-09-13 13:38 ` Peter Ujfalusi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1347543485-339-13-git-send-email-peter.ujfalusi@ti.com \ --to=peter.ujfalusi@ti.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@opensource.wolfsonmicro.com \ --cc=djbw@fb.com \ --cc=jarkko.nikula@bitmer.com \ --cc=jkrzyszt@tis.icnet.pl \ --cc=lars@metafoo.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=lrg@ti.com \ --cc=ricardo.neri@ti.com \ --cc=rmk+kernel@arm.linux.org.uk \ --cc=tony@atomide.com \ --cc=vinod.koul@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.