[alsa-devel] [PATCH 4/8] ALSA: Add DSP firmware enums and defs to CA0132 codec

[Takashi Iwai]

At Thu, 13 Sep 2012 18:15:54 -0700,
Ian Minett wrote:
> 
> From: Ian Minett <ian_minett at creativelabs.com>
> 
> 
> Signed-off-by: Ian Minett <ian_minett at creativelabs.com>
> 
> diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
> index da65535..8ea3348 100644
> --- a/sound/pci/hda/patch_ca0132.c
> +++ b/sound/pci/hda/patch_ca0132.c
> @@ -27,6 +27,7 @@
>  #include <linux/pci.h>
>  #include <linux/mutex.h>
>  #include <linux/module.h>
> +#include <linux/firmware.h>
>  #include <sound/core.h>
>  #include "hda_codec.h"
>  #include "hda_local.h"
> @@ -34,12 +35,37 @@
>  
>  #include "ca0132_regs.h"
>  
> +#define DSP_DMA_WRITE_BUFLEN_INIT (1UL<<18)
> +#define DSP_DMA_WRITE_BUFLEN_OVLY (1UL<<15)
> +
> +#define DMA_TRANSFER_FRAME_SIZE_NWORDS		8
> +#define DMA_TRANSFER_MAX_FRAME_SIZE_NWORDS	32
> +#define DMA_OVERLAY_FRAME_SIZE_NWORDS		2
> +
> +#define MASTERCONTROL				0x80
> +#define MASTERCONTROL_ALLOC_DMA_CHAN		9
> +
>  #define WIDGET_CHIP_CTRL      0x15
>  #define WIDGET_DSP_CTRL       0x16
>  
>  #define WUH_MEM_CONNID        10
>  #define DSP_MEM_CONNID        16
>  
> +#define MEM_CONNID_MICIN1     3
> +#define MEM_CONNID_MICIN2     5
> +#define MEM_CONNID_MICOUT1    12
> +#define MEM_CONNID_MICOUT2    14
> +#define MEM_CONNID_WUH        10
> +#define MEM_CONNID_DSP        16
> +#define MEM_CONNID_DMIC       100
> +
> +#define SCP_SET    0
> +#define SCP_GET    1
> +
> +#define EFX_FILE   "ctefx.bin"
> +
> +MODULE_FIRMWARE(EFX_FILE);

MODULE_FIRMWARE() line should be added only when the module really
calls request_firmware().  In this patch it's not implemented yet.
That is, this line should be moved to [PATCH 5/8] ALSA: Update CA0132
codec to load DSP firmware binary.


Takashi