From: Jassi Brar <jassi.brar@samsung.com>
To: alsa-devel@alsa-project.org
Cc: broonie@opensource.wolfsonmicro.com,
Jassi Brar <jassi.brar@samsung.com>,
ben-linux@fluff.org
Subject: [PATCH 08/20] ASoC: S3C64XX: I2S: Move RATE and FMT defines to header
Date: Wed, 10 Mar 2010 16:48:57 +0900 [thread overview]
Message-ID: <1268207349-9979-8-git-send-email-jassi.brar@samsung.com> (raw)
In-Reply-To: <1268207349-9979-7-git-send-email-jassi.brar@samsung.com>
In order for the RATE and FMT defines to be reuseable in future by the
i2sv4 driver, move the MACROs out to the header file.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
---
sound/soc/s3c24xx/s3c64xx-i2s.c | 9 ---------
sound/soc/s3c24xx/s3c64xx-i2s.h | 9 +++++++++
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c
index 39563ed..6552894 100644
--- a/sound/soc/s3c24xx/s3c64xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c64xx-i2s.c
@@ -127,15 +127,6 @@ static int s3c64xx_i2s_probe(struct platform_device *pdev,
}
-#define S3C64XX_I2S_RATES \
- (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_16000 | \
- SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
- SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
-
-#define S3C64XX_I2S_FMTS \
- (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE |\
- SNDRV_PCM_FMTBIT_S24_LE)
-
static struct snd_soc_dai_ops s3c64xx_i2s_dai_ops = {
.set_sysclk = s3c64xx_i2s_set_sysclk,
};
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.h b/sound/soc/s3c24xx/s3c64xx-i2s.h
index e350d28..53d2a0a 100644
--- a/sound/soc/s3c24xx/s3c64xx-i2s.h
+++ b/sound/soc/s3c24xx/s3c64xx-i2s.h
@@ -27,6 +27,15 @@ struct clk;
#define S3C64XX_CLKSRC_MUX S3C_I2SV2_CLKSRC_AUDIOBUS
#define S3C64XX_CLKSRC_CDCLK S3C_I2SV2_CLKSRC_CDCLK
+#define S3C64XX_I2S_RATES \
+ (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_16000 | \
+ SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
+ SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
+
+#define S3C64XX_I2S_FMTS \
+ (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE |\
+ SNDRV_PCM_FMTBIT_S24_LE)
+
extern struct snd_soc_dai s3c64xx_i2s_dai[];
extern struct clk *s3c64xx_i2s_get_clock(struct snd_soc_dai *dai);
--
1.6.2.5
next prev parent reply other threads:[~2010-03-10 7:58 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-10 7:48 [PATCH 01/20] ASoC: S3C: I2Sv2: Add missing semicolon Jassi Brar
2010-03-10 7:48 ` [PATCH 02/20] ASoC: S3C: I2Sv2: Reject immidiate register value Jassi Brar
2010-03-10 7:48 ` [PATCH 03/20] ASoC: S3C64XX: I2S: Make BCLK independent of sample size Jassi Brar
2010-03-10 7:48 ` [PATCH 04/20] ASoC: S3C: I2Sv2: Remove S3C_IIS_V2_SUPPORTED define Jassi Brar
2010-03-10 7:48 ` [PATCH 05/20] ASoC: S3C: I2Sv2: Unify clock source IDs Jassi Brar
2010-03-10 7:48 ` [PATCH 06/20] ASoC: s3c-i2s-v2 remove unnecessary headers Jassi Brar
2010-03-10 7:48 ` [PATCH 07/20] ASoC: s3c64xx-i2s remove unncessary headers Jassi Brar
2010-03-10 7:48 ` Jassi Brar [this message]
2010-03-10 7:48 ` [PATCH 09/20] ASoC: S3C: I2Sv2: Segregate hw_params callback Jassi Brar
2010-03-10 7:48 ` [PATCH 10/20] ASoC: S3C: I2Sv2: Move register definitions closer to driver Jassi Brar
2010-03-10 7:49 ` [PATCH 11/20] ASoC: SAMSUNG: I2S: Add bit definitions Jassi Brar
2010-03-10 7:49 ` [PATCH 12/20] ASoC: S3C2412: I2S: Debug IMS field Jassi Brar
2010-03-10 7:49 ` [PATCH 13/20] ASoC: S3C2412: I2S: Return correct source clock Jassi Brar
2010-03-10 7:49 ` [PATCH 14/20] ASoC: S3C: I2Sv2: Discard redundant field iis_clk Jassi Brar
2010-03-10 7:49 ` [PATCH 15/20] ASoC: S3C: I2Sv2: Unify i2s_get_clock callback Jassi Brar
2010-03-10 7:49 ` [PATCH 16/20] ASoC: S3C64XX: I2S: Use s3c2412 defines Jassi Brar
2010-03-10 7:49 ` [PATCH 17/20] ASoC: S3C: I2Sv2: Define new field for controller features Jassi Brar
2010-03-10 7:49 ` [PATCH 18/20] ASoC: S3C: I2S: Move set_sysclk callback to common code Jassi Brar
2010-03-10 7:49 ` [PATCH 19/20] ASoC: S3C64XX: IISv4: Add CPU driver Jassi Brar
2010-03-10 7:49 ` [PATCH 20/20] ASoC: SMDK64XX: Switch to IISv4 " Jassi Brar
2010-03-10 11:40 ` Mark Brown
2010-03-10 13:05 ` jassi brar
2010-03-10 11:39 ` [PATCH 19/20] ASoC: S3C64XX: IISv4: Add " Mark Brown
2010-03-10 12:57 ` jassi brar
2010-03-10 11:09 ` [PATCH 17/20] ASoC: S3C: I2Sv2: Define new field for controller features Mark Brown
2010-03-10 11:11 ` Mark Brown
2010-03-10 11:00 ` [PATCH 11/20] ASoC: SAMSUNG: I2S: Add bit definitions Mark Brown
2010-03-10 12:24 ` jassi brar
2010-03-10 12:38 ` Mark Brown
2010-03-10 12:49 ` jassi brar
2010-03-10 12:56 ` Mark Brown
2010-03-10 13:03 ` jassi brar
2010-03-10 14:11 ` Mark Brown
2010-04-27 2:55 ` [PATCH 10/20] ASoC: S3C: I2Sv2: Move register definitions closer to driver Ben Dooks
2010-03-10 14:14 ` [PATCH 09/20] ASoC: S3C: I2Sv2: Segregate hw_params callback Mark Brown
2010-03-10 18:46 ` Mark Brown
2010-03-10 10:51 ` [PATCH 08/20] ASoC: S3C64XX: I2S: Move RATE and FMT defines to header Mark Brown
2010-03-10 12:52 ` jassi brar
2010-03-10 12:59 ` Mark Brown
2010-03-10 13:01 ` [PATCH 07/20] ASoC: s3c64xx-i2s remove unncessary headers Mark Brown
2010-03-10 13:01 ` [PATCH 06/20] ASoC: s3c-i2s-v2 remove unnecessary headers Mark Brown
2010-03-10 13:01 ` [PATCH 05/20] ASoC: S3C: I2Sv2: Unify clock source IDs Mark Brown
2010-03-10 10:49 ` [PATCH 04/20] ASoC: S3C: I2Sv2: Remove S3C_IIS_V2_SUPPORTED define Mark Brown
2010-03-10 12:38 ` jassi brar
2010-03-10 12:51 ` Mark Brown
2010-03-10 12:31 ` [PATCH 03/20] ASoC: S3C64XX: I2S: Make BCLK independent of sample size Mark Brown
2010-03-10 12:46 ` jassi brar
2010-03-10 13:00 ` Mark Brown
2010-03-10 10:32 ` [PATCH 02/20] ASoC: S3C: I2Sv2: Reject immidiate register value Mark Brown
2010-03-10 12:27 ` jassi brar
2010-03-10 12:48 ` Mark Brown
2010-03-10 12:32 ` [PATCH 01/20] ASoC: S3C: I2Sv2: Add missing semicolon Mark Brown
2010-03-10 13:00 ` 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=1268207349-9979-8-git-send-email-jassi.brar@samsung.com \
--to=jassi.brar@samsung.com \
--cc=alsa-devel@alsa-project.org \
--cc=ben-linux@fluff.org \
--cc=broonie@opensource.wolfsonmicro.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).