[PATCH v10 14/14] ASoC: Intel: Select catpt and deprecate haswell

Mark Brown broonie at kernel.org
Thu Oct 1 20:33:29 CEST 2020


On Tue, Sep 29, 2020 at 04:12:47PM +0200, Cezary Rojewski wrote:
> Prevent sound/soc/intel/haswell code compile and select catpt instead as
> a recommended solution. Userspace-exposed members are compatible with
> what is exposed by deprecated solution thus no harm is done. The only
> visible difference is the newly added 'Loopback Mute' kcontrol.

This doesn't build against current code with x86 allmodconfig, please
check and resend:

In file included from /mnt/kernel/sound/soc/intel/catpt/core.h:14,
                 from /mnt/kernel/sound/soc/intel/catpt/dsp.c:13:
/mnt/kernel/sound/soc/intel/catpt/dsp.c: In function 'catpt_dsp_set_regs_defaults':
/mnt/kernel/sound/soc/intel/catpt/dsp.c:339:29: error: 'SSCR2' undeclared (first use in this function); did you mean 'SSCR0'?
   catpt_writel_ssp(cdev, i, SSCR2, CATPT_SSCR2_DEFAULT);
                             ^~~~~
/mnt/kernel/sound/soc/intel/catpt/registers.h:152:43: note: in definition of macro 'catpt_writel_ssp'
  writel(val, catpt_ssp_addr(cdev, ssp) + (reg))
                                           ^~~
/mnt/kernel/sound/soc/intel/catpt/dsp.c:339:29: note: each undeclared identifier is reported only once for each function it appears in
   catpt_writel_ssp(cdev, i, SSCR2, CATPT_SSCR2_DEFAULT);
                             ^~~~~
/mnt/kernel/sound/soc/intel/catpt/registers.h:152:43: note: in definition of macro 'catpt_writel_ssp'
  writel(val, catpt_ssp_addr(cdev, ssp) + (reg))
                                           ^~~
/mnt/kernel/sound/soc/intel/catpt/dsp.c:340:29: error: 'SSPSP2' undeclared (first use in this function); did you mean 'SSPSP'?
   catpt_writel_ssp(cdev, i, SSPSP2, CATPT_SSPSP2_DEFAULT);
                             ^~~~~~
/mnt/kernel/sound/soc/intel/catpt/registers.h:152:43: note: in definition of macro 'catpt_writel_ssp'
  writel(val, catpt_ssp_addr(cdev, ssp) + (reg))
                                           ^~~

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://mailman.alsa-project.org/pipermail/alsa-devel/attachments/20201001/9d0ff38c/attachment.sig>


More information about the Alsa-devel mailing list