From: Takashi Iwai Subject: Re: [PATCH 4/8] ALSA: Add DSP firmware enums and defs to CA0132 codec Date: Fri, 14 Sep 2012 10:40:12 +0200 Message-ID: References: <1347585358-2403-1-git-send-email-ian_minett@creativelabs.com> <1347585358-2403-5-git-send-email-ian_minett@creativelabs.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id DE058262627 for ; Fri, 14 Sep 2012 10:40:12 +0200 (CEST) In-Reply-To: <1347585358-2403-5-git-send-email-ian_minett@creativelabs.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Ian Minett Cc: alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org At Thu, 13 Sep 2012 18:15:54 -0700, Ian Minett wrote: > > From: Ian Minett > > > Signed-off-by: Ian Minett > > 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 > #include > #include > +#include > #include > #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