Commit 9b4ffa48 authored by Jaya Kumar's avatar Jaya Kumar Committed by Jaroslav Kysela

[ALSA] Add support for the CS5535 Audio device

Add support for the CS5535 Audio device.  I've fixed up some errors as per
Takashi's advice from the thread:

http://lkml.org/lkml/2005/9/15/119

 From: Alan Cox <alan@lxorguk.ukuu.org.uk>

        cs5535 is a 32bit x86 only device using weird CPU features
Signed-off-by: default avatarJaya Kumar <jayakumar.alsa@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c3e6f7d8
...@@ -1883,6 +1883,7 @@ N: Jaya Kumar ...@@ -1883,6 +1883,7 @@ N: Jaya Kumar
E: jayalk@intworks.biz E: jayalk@intworks.biz
W: http://www.intworks.biz W: http://www.intworks.biz
D: Arc monochrome LCD framebuffer driver, x86 reboot fixups D: Arc monochrome LCD framebuffer driver, x86 reboot fixups
D: pirq addr, CS5535 alsa audio driver
S: Gurgaon, India S: Gurgaon, India
S: Kuala Lumpur, Malaysia S: Kuala Lumpur, Malaysia
......
...@@ -650,6 +650,11 @@ L: linux-crypto@vger.kernel.org ...@@ -650,6 +650,11 @@ L: linux-crypto@vger.kernel.org
T: git kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git T: git kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
S: Maintained S: Maintained
CS5535 Audio ALSA driver
P: Jaya Kumar
M: jayakumar.alsa@gmail.com
S: Maintained
CYBERPRO FB DRIVER CYBERPRO FB DRIVER
P: Russell King P: Russell King
M: rmk@arm.linux.org.uk M: rmk@arm.linux.org.uk
......
...@@ -376,6 +376,10 @@ ...@@ -376,6 +376,10 @@
#define PCI_DEVICE_ID_NS_87560_USB 0x0012 #define PCI_DEVICE_ID_NS_87560_USB 0x0012
#define PCI_DEVICE_ID_NS_83815 0x0020 #define PCI_DEVICE_ID_NS_83815 0x0020
#define PCI_DEVICE_ID_NS_83820 0x0022 #define PCI_DEVICE_ID_NS_83820 0x0022
#define PCI_DEVICE_ID_NS_CS5535_IDE 0x002d
#define PCI_DEVICE_ID_NS_CS5535_AUDIO 0x002e
#define PCI_DEVICE_ID_NS_CS5535_USB 0x002f
#define PCI_DEVICE_ID_NS_CS5535_VIDEO 0x0030
#define PCI_DEVICE_ID_NS_SATURN 0x0035 #define PCI_DEVICE_ID_NS_SATURN 0x0035
#define PCI_DEVICE_ID_NS_SCx200_BRIDGE 0x0500 #define PCI_DEVICE_ID_NS_SCx200_BRIDGE 0x0500
#define PCI_DEVICE_ID_NS_SCx200_SMI 0x0501 #define PCI_DEVICE_ID_NS_SCx200_SMI 0x0501
......
...@@ -359,6 +359,19 @@ config SND_ENS1370 ...@@ -359,6 +359,19 @@ config SND_ENS1370
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called snd-ens1370. will be called snd-ens1370.
config SND_CS5535AUDIO
tristate "CS5535 Audio"
depends on SND && X86 && !X86_64
select SND_PCM
select SND_AC97_CODEC
help
Say Y here to include support for audio on CS5535 chips. It is
referred to as NS CS5535 IO or AMD CS5535 IO companion in
various literature.
To compile this driver as a module, choose M here: the module
will be called snd-cs5535audio.
config SND_ENS1371 config SND_ENS1371
tristate "(Creative) Ensoniq AudioPCI 1371/1373" tristate "(Creative) Ensoniq AudioPCI 1371/1373"
depends on SND depends on SND
......
...@@ -54,6 +54,7 @@ obj-$(CONFIG_SND) += \ ...@@ -54,6 +54,7 @@ obj-$(CONFIG_SND) += \
au88x0/ \ au88x0/ \
ca0106/ \ ca0106/ \
cs46xx/ \ cs46xx/ \
cs5535audio/ \
emu10k1/ \ emu10k1/ \
hda/ \ hda/ \
ice1712/ \ ice1712/ \
......
#
# Makefile for cs5535audio
#
snd-cs5535audio-objs := cs5535audio.o cs5535audio_pcm.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_CS5535AUDIO) += snd-cs5535audio.o
This diff is collapsed.
#ifndef __SOUND_CS5535AUDIO_H
#define __SOUND_CS5535AUDIO_H
#define cs_writel(cs5535au, reg, val) outl(val, (int) cs5535au->port + reg)
#define cs_writeb(cs5535au, reg, val) outb(val, (int) cs5535au->port + reg)
#define cs_readl(cs5535au, reg) inl((unsigned short) (cs5535au->port + reg))
#define cs_readw(cs5535au, reg) inw((unsigned short) (cs5535au->port + reg))
#define cs_readb(cs5535au, reg) inb((unsigned short) (cs5535au->port + reg))
#define CS5535AUDIO_MAX_DESCRIPTORS 128
/* acc_codec bar0 reg addrs */
#define ACC_GPIO_STATUS 0x00
#define ACC_CODEC_STATUS 0x08
#define ACC_CODEC_CNTL 0x0C
#define ACC_IRQ_STATUS 0x12
#define ACC_BM0_CMD 0x20
#define ACC_BM1_CMD 0x28
#define ACC_BM2_CMD 0x30
#define ACC_BM3_CMD 0x38
#define ACC_BM4_CMD 0x40
#define ACC_BM5_CMD 0x48
#define ACC_BM6_CMD 0x50
#define ACC_BM7_CMD 0x58
#define ACC_BM0_PRD 0x24
#define ACC_BM1_PRD 0x2C
#define ACC_BM2_PRD 0x34
#define ACC_BM3_PRD 0x3C
#define ACC_BM4_PRD 0x44
#define ACC_BM5_PRD 0x4C
#define ACC_BM6_PRD 0x54
#define ACC_BM7_PRD 0x5C
#define ACC_BM0_STATUS 0x21
#define ACC_BM1_STATUS 0x29
#define ACC_BM2_STATUS 0x31
#define ACC_BM3_STATUS 0x39
#define ACC_BM4_STATUS 0x41
#define ACC_BM5_STATUS 0x49
#define ACC_BM6_STATUS 0x51
#define ACC_BM7_STATUS 0x59
#define ACC_BM0_PNTR 0x60
#define ACC_BM1_PNTR 0x64
#define ACC_BM2_PNTR 0x68
#define ACC_BM3_PNTR 0x6C
#define ACC_BM4_PNTR 0x70
#define ACC_BM5_PNTR 0x74
#define ACC_BM6_PNTR 0x78
#define ACC_BM7_PNTR 0x7C
/* acc_codec bar0 reg bits */
/* ACC_IRQ_STATUS */
#define IRQ_STS 0
#define WU_IRQ_STS 1
#define BM0_IRQ_STS 2
#define BM1_IRQ_STS 3
#define BM2_IRQ_STS 4
#define BM3_IRQ_STS 5
#define BM4_IRQ_STS 6
#define BM5_IRQ_STS 7
#define BM6_IRQ_STS 8
#define BM7_IRQ_STS 9
/* ACC_BMX_STATUS */
#define EOP (1<<0)
#define BM_EOP_ERR (1<<1)
/* ACC_BMX_CTL */
#define BM_CTL_EN 0x00000001
#define BM_CTL_PAUSE 0x00000011
#define BM_CTL_DIS 0x00000000
#define BM_CTL_BYTE_ORD_LE 0x00000000
#define BM_CTL_BYTE_ORD_BE 0x00000100
/* cs5535 specific ac97 codec register defines */
#define CMD_MASK 0xFF00FFFF
#define CMD_NEW 0x00010000
#define STS_NEW 0x00020000
#define PRM_RDY_STS 0x00800000
#define ACC_CODEC_CNTL_WR_CMD (~0x80000000)
#define ACC_CODEC_CNTL_RD_CMD 0x80000000
#define PRD_JMP 0x2000
#define PRD_EOP 0x4000
#define PRD_EOT 0x8000
typedef struct _snd_cs5535audio cs5535audio_t;
typedef struct snd_cs5535audio_dma cs5535audio_dma_t;
typedef struct snd_cs5535audio_dma_ops cs5535audio_dma_ops_t;
enum { CS5535AUDIO_DMA_PLAYBACK, CS5535AUDIO_DMA_CAPTURE, NUM_CS5535AUDIO_DMAS };
struct snd_cs5535audio_dma_ops {
int type;
void (*enable_dma)(cs5535audio_t *cs5535au);
void (*disable_dma)(cs5535audio_t *cs5535au);
void (*pause_dma)(cs5535audio_t *cs5535au);
void (*setup_prd)(cs5535audio_t *cs5535au, u32 prd_addr);
u32 (*read_dma_pntr)(cs5535audio_t *cs5535au);
};
typedef struct cs5535audio_dma_desc {
u32 addr;
u16 size;
u16 ctlreserved;
} cs5535audio_dma_desc_t;
struct snd_cs5535audio_dma {
const cs5535audio_dma_ops_t *ops;
struct snd_dma_buffer desc_buf;
snd_pcm_substream_t *substream;
unsigned int buf_addr, buf_bytes;
unsigned int period_bytes, periods;
};
struct _snd_cs5535audio {
snd_card_t *card;
ac97_t *ac97;
int irq;
struct pci_dev *pci;
unsigned long port;
spinlock_t reg_lock;
snd_pcm_substream_t *playback_substream;
snd_pcm_substream_t *capture_substream;
cs5535audio_dma_t dmas[NUM_CS5535AUDIO_DMAS];
};
int __devinit snd_cs5535audio_pcm(cs5535audio_t *cs5535audio);
#endif /* __SOUND_CS5535AUDIO_H */
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment