From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Jyri Sarha <jsarha@ti.com>,
alsa-devel@alsa-project.org, linux-omap@vger.kernel.org
Cc: broonie@kernel.org, liam.r.girdwood@linux.intel.com, detheridge@ti.com
Subject: Re: [PATCH] ASoC: omap-pcm: Move omap-pcm under include/sound
Date: Mon, 26 May 2014 12:00:14 +0300 [thread overview]
Message-ID: <5383029E.8080508@ti.com> (raw)
In-Reply-To: <1401094274-5266-1-git-send-email-jsarha@ti.com>
On 05/26/2014 11:51 AM, Jyri Sarha wrote:
> Make including the omap-pcm.h outside sound/soc/omap more convenient.
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
>
> Signed-off-by: Jyri Sarha <jsarha@ti.com>
> ---
> It would be nice to get this applied at ASAP for OMAP HDMI audio
> rework patches depend on this and it would help a lot if this would
> already be there when applying to OMAPDSS side patches.
>
> include/sound/omap-pcm.h | 30 ++++++++++++++++++++++++++++++
> sound/soc/davinci/davinci-mcasp.c | 2 +-
> sound/soc/omap/omap-dmic.c | 2 +-
> sound/soc/omap/omap-hdmi.c | 2 +-
> sound/soc/omap/omap-mcbsp.c | 2 +-
> sound/soc/omap/omap-mcpdm.c | 2 +-
> sound/soc/omap/omap-pcm.h | 30 ------------------------------
> 7 files changed, 35 insertions(+), 35 deletions(-)
> create mode 100644 include/sound/omap-pcm.h
> delete mode 100644 sound/soc/omap/omap-pcm.h
>
> diff --git a/include/sound/omap-pcm.h b/include/sound/omap-pcm.h
> new file mode 100644
> index 0000000..c1d2f31
> --- /dev/null
> +++ b/include/sound/omap-pcm.h
> @@ -0,0 +1,30 @@
> +/*
> + * omap-pcm.h - OMAP PCM driver
> + *
> + * Copyright (C) 2014 Texas Instruments, Inc.
> + *
> + * Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * version 2 as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * General Public License for more details.
> + */
> +
> +#ifndef __OMAP_PCM_H__
> +#define __OMAP_PCM_H__
> +
> +#if IS_ENABLED(CONFIG_SND_OMAP_SOC)
> +int omap_pcm_platform_register(struct device *dev);
> +#else
> +static inline int omap_pcm_platform_register(struct device *dev)
> +{
> + return 0;
> +}
> +#endif /* CONFIG_SND_OMAP_SOC */
> +
> +#endif /* __OMAP_PCM_H__ */
> diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
> index 14058dc..9afb146 100644
> --- a/sound/soc/davinci/davinci-mcasp.c
> +++ b/sound/soc/davinci/davinci-mcasp.c
> @@ -33,10 +33,10 @@
> #include <sound/initval.h>
> #include <sound/soc.h>
> #include <sound/dmaengine_pcm.h>
> +#include <sound/omap-pcm.h>
>
> #include "davinci-pcm.h"
> #include "davinci-mcasp.h"
> -#include "../omap/omap-pcm.h"
>
> #define MCASP_MAX_AFIFO_DEPTH 64
>
> diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
> index 53da041..6925d71 100644
> --- a/sound/soc/omap/omap-dmic.c
> +++ b/sound/soc/omap/omap-dmic.c
> @@ -40,9 +40,9 @@
> #include <sound/initval.h>
> #include <sound/soc.h>
> #include <sound/dmaengine_pcm.h>
> +#include <sound/omap-pcm.h>
>
> #include "omap-dmic.h"
> -#include "omap-pcm.h"
>
> struct omap_dmic {
> struct device *dev;
> diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c
> index 537a1ec..eb9c392 100644
> --- a/sound/soc/omap/omap-hdmi.c
> +++ b/sound/soc/omap/omap-hdmi.c
> @@ -34,9 +34,9 @@
> #include <sound/asoundef.h>
> #include <sound/dmaengine_pcm.h>
> #include <video/omapdss.h>
> +#include <sound/omap-pcm.h>
>
> #include "omap-hdmi.h"
> -#include "omap-pcm.h"
>
> #define DRV_NAME "omap-hdmi-audio-dai"
>
> diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
> index 71d2266..efe2cd6 100644
> --- a/sound/soc/omap/omap-mcbsp.c
> +++ b/sound/soc/omap/omap-mcbsp.c
> @@ -34,11 +34,11 @@
> #include <sound/initval.h>
> #include <sound/soc.h>
> #include <sound/dmaengine_pcm.h>
> +#include <sound/omap-pcm.h>
>
> #include <linux/platform_data/asoc-ti-mcbsp.h>
> #include "mcbsp.h"
> #include "omap-mcbsp.h"
> -#include "omap-pcm.h"
>
> #define OMAP_MCBSP_RATES (SNDRV_PCM_RATE_8000_96000)
>
> diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
> index d8ebb52..f0e2ebe 100644
> --- a/sound/soc/omap/omap-mcpdm.c
> +++ b/sound/soc/omap/omap-mcpdm.c
> @@ -40,9 +40,9 @@
> #include <sound/pcm_params.h>
> #include <sound/soc.h>
> #include <sound/dmaengine_pcm.h>
> +#include <sound/omap-pcm.h>
>
> #include "omap-mcpdm.h"
> -#include "omap-pcm.h"
>
> struct mcpdm_link_config {
> u32 link_mask; /* channel mask for the direction */
> diff --git a/sound/soc/omap/omap-pcm.h b/sound/soc/omap/omap-pcm.h
> deleted file mode 100644
> index c1d2f31..0000000
> --- a/sound/soc/omap/omap-pcm.h
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -/*
> - * omap-pcm.h - OMAP PCM driver
> - *
> - * Copyright (C) 2014 Texas Instruments, Inc.
> - *
> - * Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License
> - * version 2 as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful, but
> - * WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - * General Public License for more details.
> - */
> -
> -#ifndef __OMAP_PCM_H__
> -#define __OMAP_PCM_H__
> -
> -#if IS_ENABLED(CONFIG_SND_OMAP_SOC)
> -int omap_pcm_platform_register(struct device *dev);
> -#else
> -static inline int omap_pcm_platform_register(struct device *dev)
> -{
> - return 0;
> -}
> -#endif /* CONFIG_SND_OMAP_SOC */
> -
> -#endif /* __OMAP_PCM_H__ */
>
next prev parent reply other threads:[~2014-05-26 9:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-26 8:51 [PATCH] ASoC: omap-pcm: Move omap-pcm under include/sound Jyri Sarha
2014-05-26 9:00 ` Peter Ujfalusi [this message]
2014-05-26 14:32 ` Mark Brown
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=5383029E.8080508@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=detheridge@ti.com \
--cc=jsarha@ti.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=linux-omap@vger.kernel.org \
/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: link
Be 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.