diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-07-10 15:44:36 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-11 00:24:19 +0400 |
| commit | 977c60238cfff1f9eb07cfd78bc02da91b7b499b (patch) | |
| tree | e44a3e190aa857d1d843366ead8929fd0fe163a6 /sound/aoa/soundbus/i2sbus/i2sbus.h | |
| parent | a08bc4cb09dfea4cb1d29061d82b04338ed7c21a (diff) | |
| download | linux-977c60238cfff1f9eb07cfd78bc02da91b7b499b.tar.xz | |
[PATCH] aoa: i2sbus: revamp control layer
This patch revamps the i2sbus control layer by using the macio/keylargo
functions instead of directly mapping.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/aoa/soundbus/i2sbus/i2sbus.h')
| -rw-r--r-- | sound/aoa/soundbus/i2sbus/i2sbus.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus.h b/sound/aoa/soundbus/i2sbus/i2sbus.h index d32f8a9724d7..0c69d209be50 100644 --- a/sound/aoa/soundbus/i2sbus/i2sbus.h +++ b/sound/aoa/soundbus/i2sbus/i2sbus.h @@ -7,20 +7,22 @@ */ #ifndef __I2SBUS_H #define __I2SBUS_H -#include <asm/dbdma.h> #include <linux/interrupt.h> -#include <sound/pcm.h> #include <linux/spinlock.h> #include <linux/mutex.h> + +#include <sound/pcm.h> + #include <asm/prom.h> +#include <asm/pmac_feature.h> +#include <asm/dbdma.h> + #include "i2sbus-interface.h" -#include "i2sbus-control.h" #include "../soundbus.h" struct i2sbus_control { - volatile struct i2s_control_regs __iomem *controlregs; - struct resource rsrc; struct list_head list; + struct macio_chip *macio; }; #define MAX_DBDMA_COMMANDS 32 |