Commit 31ef9134 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai
Browse files

ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver 



Add a driver for two playback-only FireWire devices based on the OXFW970
chip.

v2: better AMDTP API abstraction; fix fw_unit leak; small fixes
v3: cache the iPCR value
v4: FireWave constraints; fix fw_device reference counting;
    fix PCR caching; small changes and fixes
v5: volume/mute support; fix crashing due to pcm stop races
v6: fix build; one-channel volume for LaCie
v7: use signed values to make volume (range checks) work; fix function
    block IDs for volume/mute; always use channel 0 for LaCie volume

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Acked-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Tested-by: default avatarJay Fenlason <fenlason@redhat.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a5abba98

drivers/firewire/core-iso.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -362,3 +362,4 @@ void fw_iso_resource_manage(struct fw_card *card, int generation, 
		*channel = ret;

		*channel = ret;

	}

	}

}

}

EXPORT_SYMBOL(fw_iso_resource_manage);

drivers/firewire/core.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -147,9 +147,6 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event); 
/* -iso */

/* -iso */





int fw_iso_buffer_map(struct fw_iso_buffer *buffer, struct vm_area_struct *vma);

int fw_iso_buffer_map(struct fw_iso_buffer *buffer, struct vm_area_struct *vma);

void fw_iso_resource_manage(struct fw_card *card, int generation,

			    u64 channels_mask, int *channel, int *bandwidth,

			    bool allocate, __be32 buffer[2]);









/* -topology */

/* -topology */

include/linux/firewire.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,10 @@ 
#define CSR_BROADCAST_CHANNEL		0x234

#define CSR_BROADCAST_CHANNEL		0x234

#define CSR_CONFIG_ROM			0x400

#define CSR_CONFIG_ROM			0x400

#define CSR_CONFIG_ROM_END		0x800

#define CSR_CONFIG_ROM_END		0x800

#define CSR_OMPR			0x900

#define CSR_OPCR(i)			(0x904 + (i) * 4)

#define CSR_IMPR			0x980

#define CSR_IPCR(i)			(0x984 + (i) * 4)

#define CSR_FCP_COMMAND			0xB00

#define CSR_FCP_COMMAND			0xB00

#define CSR_FCP_RESPONSE		0xD00

#define CSR_FCP_RESPONSE		0xD00

#define CSR_FCP_END			0xF00

#define CSR_FCP_END			0xF00
@@ -441,5 +445,8 @@ int fw_iso_context_start(struct fw_iso_context *ctx, 
			 int cycle, int sync, int tags);

			 int cycle, int sync, int tags);

int fw_iso_context_stop(struct fw_iso_context *ctx);

int fw_iso_context_stop(struct fw_iso_context *ctx);

void fw_iso_context_destroy(struct fw_iso_context *ctx);

void fw_iso_context_destroy(struct fw_iso_context *ctx);

void fw_iso_resource_manage(struct fw_card *card, int generation,

			    u64 channels_mask, int *channel, int *bandwidth,

			    bool allocate, __be32 buffer[2]);





#endif /* _LINUX_FIREWIRE_H */
 
#endif /* _LINUX_FIREWIRE_H */

sound/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -97,6 +97,8 @@ source "sound/sh/Kconfig" 
# here assuming USB is defined before ALSA

# here assuming USB is defined before ALSA

source "sound/usb/Kconfig"

source "sound/usb/Kconfig"





source "sound/firewire/Kconfig"



# the following will depend on the order of config.

# the following will depend on the order of config.

# here assuming PCMCIA is defined before ALSA

# here assuming PCMCIA is defined before ALSA

source "sound/pcmcia/Kconfig"

source "sound/pcmcia/Kconfig"

sound/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ obj-$(CONFIG_SOUND_PRIME) += sound_firmware.o 
obj-$(CONFIG_SOUND_PRIME) += oss/

obj-$(CONFIG_SOUND_PRIME) += oss/

obj-$(CONFIG_DMASOUND) += oss/

obj-$(CONFIG_DMASOUND) += oss/

obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \

obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \

	sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/

	firewire/ sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/

obj-$(CONFIG_SND_AOA) += aoa/

obj-$(CONFIG_SND_AOA) += aoa/





# This one must be compilable even if sound is configured out

# This one must be compilable even if sound is configured out

CRA Git | Maintained and supported by SUSTech CRA and CCSE