Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40216ce7 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Move SigmaDSP firmware loader to ASoC 



It has been pointed out previously, that the firmware subsystem is not the right
place for the SigmaDSP firmware loader. Furthermore the SigmaDSP is currently
only used in audio products and we are aiming for better integration into the
ASoC framework in the future, with support for ALSA controls for firmware
parameters and support dynamic power management as well. So the natural choice
for the SigmaDSP firmware loader is the ASoC subsystem.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarMike Frysinger <vapier@gentoo.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 1db7c89c

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -542,6 +542,7 @@ F: sound/soc/codecs/adau* 
F:	sound/soc/codecs/adav*

F:	sound/soc/codecs/ad1*

F:	sound/soc/codecs/ssm*

F:	sound/soc/codecs/sigmadsp.*



ANALOG DEVICES INC ASOC DRIVERS

L:	uclinux-dist-devel@blackfin.uclinux.org

drivers/firmware/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -145,18 +145,6 @@ config ISCSI_IBFT 
	  detect iSCSI boot parameters dynamically during system boot, say Y.

	  Otherwise, say N.



config SIGMA

	tristate "SigmaStudio firmware loader"

	depends on I2C

	select CRC32

	default n

	help

	  Enable helper functions for working with Analog Devices SigmaDSP

	  parts and binary firmwares produced by Analog Devices SigmaStudio.



	  If unsure, say N here.  Drivers that need these helpers will select

	  this option automatically.



source "drivers/firmware/google/Kconfig"



endmenu

drivers/firmware/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -12,6 +12,5 @@ obj-$(CONFIG_DMIID) += dmi-id.o 
obj-$(CONFIG_ISCSI_IBFT_FIND)	+= iscsi_ibft_find.o

obj-$(CONFIG_ISCSI_IBFT)	+= iscsi_ibft.o

obj-$(CONFIG_FIRMWARE_MEMMAP)	+= memmap.o

obj-$(CONFIG_SIGMA)		+= sigma.o



obj-$(CONFIG_GOOGLE_FIRMWARE)	+= google/

sound/soc/codecs/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ config SND_SOC_AD73311 
	tristate



config SND_SOC_ADAU1701

	select SIGMA

	select SND_SOC_SIGMADSP

	tristate



config SND_SOC_ADAU1373
@@ -234,6 +234,10 @@ config SND_SOC_RT5631 
config SND_SOC_SGTL5000

	tristate



config SND_SOC_SIGMADSP

	tristate

	select CRC32



config SND_SOC_SN95031

	tristate

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ snd-soc-rt5631-objs := rt5631.o 
snd-soc-sgtl5000-objs := sgtl5000.o

snd-soc-alc5623-objs := alc5623.o

snd-soc-alc5632-objs := alc5632.o

snd-soc-sigmadsp-objs := sigmadsp.o

snd-soc-sn95031-objs := sn95031.o

snd-soc-spdif-objs := spdif_transciever.o

snd-soc-ssm2602-objs := ssm2602.o
@@ -134,6 +135,7 @@ obj-$(CONFIG_SND_SOC_MAX9850) += snd-soc-max9850.o 
obj-$(CONFIG_SND_SOC_PCM3008)	+= snd-soc-pcm3008.o

obj-$(CONFIG_SND_SOC_RT5631)	+= snd-soc-rt5631.o

obj-$(CONFIG_SND_SOC_SGTL5000)  += snd-soc-sgtl5000.o

obj-$(CONFIG_SND_SOC_SIGMADSP)	+= snd-soc-sigmadsp.o

obj-$(CONFIG_SND_SOC_SN95031)	+=snd-soc-sn95031.o

obj-$(CONFIG_SND_SOC_SPDIF)	+= snd-soc-spdif.o

obj-$(CONFIG_SND_SOC_SSM2602)	+= snd-soc-ssm2602.o