projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
[deliverable/linux.git]
/
sound
/
soc
/
s3c24xx
/
s3c2412-i2s.c
diff --git
a/sound/soc/s3c24xx/s3c2412-i2s.c
b/sound/soc/s3c24xx/s3c2412-i2s.c
index c4a46dd589b3b1565f6c3d2e450465a3a4c6744b..ded7d995a9228a5f0d9080cbc4575cfd2216cd32 100644
(file)
--- a/
sound/soc/s3c24xx/s3c2412-i2s.c
+++ b/
sound/soc/s3c24xx/s3c2412-i2s.c
@@
-28,16
+28,16
@@
#include <sound/pcm_params.h>
#include <sound/initval.h>
#include <sound/soc.h>
#include <sound/pcm_params.h>
#include <sound/initval.h>
#include <sound/soc.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <linux/io.h>
#include <asm/dma.h>
#include <asm/plat-s3c24xx/regs-s3c2412-iis.h>
#include <linux/io.h>
#include <asm/dma.h>
#include <asm/plat-s3c24xx/regs-s3c2412-iis.h>
-#include <
asm/ar
ch/regs-gpio.h>
-#include <
asm/ar
ch/audio.h>
-#include <
asm/ar
ch/dma.h>
+#include <
ma
ch/regs-gpio.h>
+#include <
ma
ch/audio.h>
+#include <
ma
ch/dma.h>
#include "s3c24xx-pcm.h"
#include "s3c2412-i2s.h"
#include "s3c24xx-pcm.h"
#include "s3c2412-i2s.h"
@@
-295,7
+295,7
@@
static inline int s3c2412_snd_is_clkmaster(void)
/*
* Set S3C2412 I2S DAI format
*/
/*
* Set S3C2412 I2S DAI format
*/
-static int s3c2412_i2s_set_fmt(struct snd_soc_
cpu_
dai *cpu_dai,
+static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
unsigned int fmt)
{
u32 iismod;
unsigned int fmt)
{
u32 iismod;
@@
-500,7
+500,7
@@
EXPORT_SYMBOL_GPL(s3c2412_iis_calc_rate);
/*
* Set S3C2412 Clock source
*/
/*
* Set S3C2412 Clock source
*/
-static int s3c2412_i2s_set_sysclk(struct snd_soc_
cpu_
dai *cpu_dai,
+static int s3c2412_i2s_set_sysclk(struct snd_soc_dai *cpu_dai,
int clk_id, unsigned int freq, int dir)
{
u32 iismod = readl(s3c2412_i2s.regs + S3C2412_IISMOD);
int clk_id, unsigned int freq, int dir)
{
u32 iismod = readl(s3c2412_i2s.regs + S3C2412_IISMOD);
@@
-528,7
+528,7
@@
static int s3c2412_i2s_set_sysclk(struct snd_soc_cpu_dai *cpu_dai,
/*
* Set S3C2412 Clock dividers
*/
/*
* Set S3C2412 Clock dividers
*/
-static int s3c2412_i2s_set_clkdiv(struct snd_soc_
cpu_
dai *cpu_dai,
+static int s3c2412_i2s_set_clkdiv(struct snd_soc_dai *cpu_dai,
int div_id, int div)
{
struct s3c2412_i2s_info *i2s = &s3c2412_i2s;
int div_id, int div)
{
struct s3c2412_i2s_info *i2s = &s3c2412_i2s;
@@
-601,7
+601,8
@@
struct clk *s3c2412_get_iisclk(void)
EXPORT_SYMBOL_GPL(s3c2412_get_iisclk);
EXPORT_SYMBOL_GPL(s3c2412_get_iisclk);
-static int s3c2412_i2s_probe(struct platform_device *pdev)
+static int s3c2412_i2s_probe(struct platform_device *pdev,
+ struct snd_soc_dai *dai)
{
DBG("Entered %s\n", __func__);
{
DBG("Entered %s\n", __func__);
@@
-647,7
+648,7
@@
static int s3c2412_i2s_probe(struct platform_device *pdev)
#ifdef CONFIG_PM
static int s3c2412_i2s_suspend(struct platform_device *dev,
#ifdef CONFIG_PM
static int s3c2412_i2s_suspend(struct platform_device *dev,
- struct snd_soc_
cpu_
dai *dai)
+ struct snd_soc_dai *dai)
{
struct s3c2412_i2s_info *i2s = &s3c2412_i2s;
u32 iismod;
{
struct s3c2412_i2s_info *i2s = &s3c2412_i2s;
u32 iismod;
@@
-675,7
+676,7
@@
static int s3c2412_i2s_suspend(struct platform_device *dev,
}
static int s3c2412_i2s_resume(struct platform_device *pdev,
}
static int s3c2412_i2s_resume(struct platform_device *pdev,
- struct snd_soc_
cpu_
dai *dai)
+ struct snd_soc_dai *dai)
{
struct s3c2412_i2s_info *i2s = &s3c2412_i2s;
{
struct s3c2412_i2s_info *i2s = &s3c2412_i2s;
@@
-707,7
+708,7
@@
static int s3c2412_i2s_resume(struct platform_device *pdev,
SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
-struct snd_soc_
cpu_
dai s3c2412_i2s_dai = {
+struct snd_soc_dai s3c2412_i2s_dai = {
.name = "s3c2412-i2s",
.id = 0,
.type = SND_SOC_DAI_I2S,
.name = "s3c2412-i2s",
.id = 0,
.type = SND_SOC_DAI_I2S,
This page took
0.029302 seconds
and
5
git commands to generate.