From: Ben Dooks <ben-alsa@fluff.org>
To: alsa-devel@alsa-project.org
Cc: broonie@opensource.wolfsonmicro.com
Subject: [patch 3/9] S3C: Move <mach/audio.h> to <plat/audio.h>
Date: Wed, 04 Mar 2009 00:49:28 +0000 [thread overview]
Message-ID: <20090304005138.561717090@fluff.org.uk> (raw)
In-Reply-To: 20090304004925.530566010@fluff.org.uk
[-- Attachment #1: audio/move-mach-audio-header.patch --]
[-- Type: text/plain, Size: 6330 bytes --]
From: Ben Dooks <ben@simtec.co.uk>
The <mach/audio.h> file needs to be common to both ARCH_S3C2410 and
ARCH_S3C64XX as they share common driver code, so move it to <plat/audio.h>.
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Index: linux.git/arch/arm/mach-s3c2410/include/mach/audio.h
===================================================================
Index: linux.git/arch/arm/mach-s3c2410/include/mach/audio.h
===================================================================
--- linux.git.orig/arch/arm/mach-s3c2410/include/mach/audio.h 2009-01-15 15:17:05.000000000 +0000
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/audio.h
- *
- * Copyright (c) 2004-2005 Simtec Electronics
- * http://www.simtec.co.uk/products/SWLINUX/
- * Ben Dooks <ben@simtec.co.uk>
- *
- * S3C24XX - Audio platfrom_device info
- *
- * 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.
-*/
-
-#ifndef __ASM_ARCH_AUDIO_H
-#define __ASM_ARCH_AUDIO_H __FILE__
-
-/* struct s3c24xx_iis_ops
- *
- * called from the s3c24xx audio core to deal with the architecture
- * or the codec's setup and control.
- *
- * the pointer to itself is passed through in case the caller wants to
- * embed this in an larger structure for easy reference to it's context.
-*/
-
-struct s3c24xx_iis_ops {
- struct module *owner;
-
- int (*startup)(struct s3c24xx_iis_ops *me);
- void (*shutdown)(struct s3c24xx_iis_ops *me);
- int (*suspend)(struct s3c24xx_iis_ops *me);
- int (*resume)(struct s3c24xx_iis_ops *me);
-
- int (*open)(struct s3c24xx_iis_ops *me, struct snd_pcm_substream *strm);
- int (*close)(struct s3c24xx_iis_ops *me, struct snd_pcm_substream *strm);
- int (*prepare)(struct s3c24xx_iis_ops *me, struct snd_pcm_substream *strm, struct snd_pcm_runtime *rt);
-};
-
-struct s3c24xx_platdata_iis {
- const char *codec_clk;
- struct s3c24xx_iis_ops *ops;
- int (*match_dev)(struct device *dev);
-};
-
-#endif /* __ASM_ARCH_AUDIO_H */
Index: linux.git/arch/arm/plat-s3c/include/plat/audio.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux.git/arch/arm/plat-s3c/include/plat/audio.h 2009-01-19 11:56:35.000000000 +0000
@@ -0,0 +1,45 @@
+/* arch/arm/mach-s3c2410/include/mach/audio.h
+ *
+ * Copyright (c) 2004-2005 Simtec Electronics
+ * http://www.simtec.co.uk/products/SWLINUX/
+ * Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C24XX - Audio platfrom_device info
+ *
+ * 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.
+*/
+
+#ifndef __ASM_ARCH_AUDIO_H
+#define __ASM_ARCH_AUDIO_H __FILE__
+
+/* struct s3c24xx_iis_ops
+ *
+ * called from the s3c24xx audio core to deal with the architecture
+ * or the codec's setup and control.
+ *
+ * the pointer to itself is passed through in case the caller wants to
+ * embed this in an larger structure for easy reference to it's context.
+*/
+
+struct s3c24xx_iis_ops {
+ struct module *owner;
+
+ int (*startup)(struct s3c24xx_iis_ops *me);
+ void (*shutdown)(struct s3c24xx_iis_ops *me);
+ int (*suspend)(struct s3c24xx_iis_ops *me);
+ int (*resume)(struct s3c24xx_iis_ops *me);
+
+ int (*open)(struct s3c24xx_iis_ops *me, struct snd_pcm_substream *strm);
+ int (*close)(struct s3c24xx_iis_ops *me, struct snd_pcm_substream *strm);
+ int (*prepare)(struct s3c24xx_iis_ops *me, struct snd_pcm_substream *strm, struct snd_pcm_runtime *rt);
+};
+
+struct s3c24xx_platdata_iis {
+ const char *codec_clk;
+ struct s3c24xx_iis_ops *ops;
+ int (*match_dev)(struct device *dev);
+};
+
+#endif /* __ASM_ARCH_AUDIO_H */
Index: linux.git/sound/soc/s3c24xx/neo1973_wm8753.c
===================================================================
--- linux.git.orig/sound/soc/s3c24xx/neo1973_wm8753.c 2009-01-19 11:56:33.000000000 +0000
+++ linux.git/sound/soc/s3c24xx/neo1973_wm8753.c 2009-01-19 11:56:35.000000000 +0000
@@ -29,7 +29,7 @@
#include <mach/regs-clock.h>
#include <mach/regs-gpio.h>
#include <mach/hardware.h>
-#include <mach/audio.h>
+#include <plat/audio.h>
#include <linux/io.h>
#include <mach/spi-gpio.h>
Index: linux.git/sound/soc/s3c24xx/s3c2412-i2s.c
===================================================================
--- linux.git.orig/sound/soc/s3c24xx/s3c2412-i2s.c 2009-01-19 11:56:33.000000000 +0000
+++ linux.git/sound/soc/s3c24xx/s3c2412-i2s.c 2009-01-19 11:56:39.000000000 +0000
@@ -34,7 +34,7 @@
#include <plat/regs-s3c2412-iis.h>
#include <mach/regs-gpio.h>
-#include <mach/audio.h>
+#include <plat/audio.h>
#include <mach/dma.h>
#include "s3c24xx-pcm.h"
Index: linux.git/sound/soc/s3c24xx/s3c2443-ac97.c
===================================================================
--- linux.git.orig/sound/soc/s3c24xx/s3c2443-ac97.c 2009-01-15 21:41:03.000000000 +0000
+++ linux.git/sound/soc/s3c24xx/s3c2443-ac97.c 2009-01-19 11:56:35.000000000 +0000
@@ -31,7 +31,7 @@
#include <plat/regs-ac97.h>
#include <mach/regs-gpio.h>
#include <mach/regs-clock.h>
-#include <mach/audio.h>
+#include <plat/audio.h>
#include <asm/dma.h>
#include <mach/dma.h>
Index: linux.git/sound/soc/s3c24xx/s3c24xx-i2s.c
===================================================================
--- linux.git.orig/sound/soc/s3c24xx/s3c24xx-i2s.c 2009-01-19 11:56:33.000000000 +0000
+++ linux.git/sound/soc/s3c24xx/s3c24xx-i2s.c 2009-01-19 11:56:35.000000000 +0000
@@ -30,7 +30,7 @@
#include <mach/hardware.h>
#include <mach/regs-gpio.h>
#include <mach/regs-clock.h>
-#include <mach/audio.h>
+#include <plat/audio.h>
#include <asm/dma.h>
#include <mach/dma.h>
Index: linux.git/sound/soc/s3c24xx/s3c24xx-pcm.c
===================================================================
--- linux.git.orig/sound/soc/s3c24xx/s3c24xx-pcm.c 2009-01-15 21:41:03.000000000 +0000
+++ linux.git/sound/soc/s3c24xx/s3c24xx-pcm.c 2009-01-19 11:56:35.000000000 +0000
@@ -29,7 +29,7 @@
#include <asm/dma.h>
#include <mach/hardware.h>
#include <mach/dma.h>
-#include <mach/audio.h>
+#include <plat/audio.h>
#include "s3c24xx-pcm.h"
--
Ben (ben@fluff.org, http://www.fluff.org/)
'a smiley only costs 4 bytes'
next prev parent reply other threads:[~2009-03-04 0:54 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-04 0:49 [patch 0/9] S3C24XX/S3C64XX updates Ben Dooks
2009-03-04 0:49 ` [patch 1/9] S3C24XX: Move and update IIS headers Ben Dooks
2009-03-04 0:49 ` [patch 2/9] JIVE: Add ASoC audio support Ben Dooks
2009-03-04 14:57 ` Mark Brown
2009-03-04 0:49 ` Ben Dooks [this message]
2009-03-04 0:49 ` [patch 4/9] S3C24XX ASoC: Fix copyright statements on Simtec files Ben Dooks
2009-03-04 19:20 ` Mark Brown
2009-03-04 0:49 ` [patch 5/9] S3C: Split s3c2412-i2s.c into core and SoC specific parts Ben Dooks
2009-03-04 19:52 ` Mark Brown
2009-03-04 0:49 ` [patch 6/9] S3C64XX: Add s3c64xx-i2s support Ben Dooks
2009-03-04 0:56 ` Ben Dooks
2009-03-04 19:56 ` Mark Brown
2009-03-04 0:49 ` [patch 7/9] ASoC: Ensure codec check hw_write error at probe Ben Dooks
2009-03-04 19:57 ` Mark Brown
2009-03-04 0:49 ` [patch 8/9] SMDK6410: Add support for WM8731 on an add-on board Ben Dooks
2009-03-04 20:06 ` Mark Brown
2009-03-04 0:49 ` [patch 9/9] AUDIO: Select DMA if I2S is configured Ben Dooks
2009-03-04 20:29 ` [patch 0/9] S3C24XX/S3C64XX updates Mark Brown
2009-03-05 7:23 ` Takashi Iwai
2009-03-05 10:31 ` Mark Brown
2009-03-05 10:36 ` Takashi Iwai
2009-03-05 11:03 ` Mark Brown
2009-03-11 10:39 ` Ben Dooks
2009-03-11 12:47 ` 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=20090304005138.561717090@fluff.org.uk \
--to=ben-alsa@fluff.org \
--cc=alsa-devel@alsa-project.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