Commit 3c2fcf36 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/hdsp' into for-linus 

* topic/hdsp:
  ALSA: hdsp - Add a comment about external firmwares for hdsp
  ALSA: hdsp: allow firmware loading from inside the kernel
parents 81ad969d 511b4c17

sound/pci/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -542,6 +542,9 @@ config SND_HDSP 
	  To compile this driver as a module, choose M here: the module

	  will be called snd-hdsp.



comment "Don't forget to add built-in firmwares for HDSP driver"

	depends on SND_HDSP=y



config SND_HDSPM

	tristate "RME Hammerfall DSP MADI"

	select SND_HWDEP

sound/pci/rme9652/hdsp.c

+2 −2
Original line number Diff line number Diff line
@@ -403,9 +403,9 @@ MODULE_FIRMWARE("digiface_firmware_rev11.bin"); 
#define HDSP_DMA_AREA_BYTES ((HDSP_MAX_CHANNELS+1) * HDSP_CHANNEL_BUFFER_BYTES)

#define HDSP_DMA_AREA_KILOBYTES (HDSP_DMA_AREA_BYTES/1024)



/* use hotplug firmeare loader? */

/* use hotplug firmware loader? */

#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)

#if !defined(HDSP_USE_HWDEP_LOADER) && !defined(CONFIG_SND_HDSP)

#if !defined(HDSP_USE_HWDEP_LOADER)

#define HDSP_FW_LOADER

#endif

#endif