Commit 6014e902 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda: Move codec drivers into sound/hda/codecs directory 



Now move the all remaining codec drivers from sound/pci/hda to
sound/hda/codecs subdirectory.  Some drivers are put under the further
vendor subdirectory, and the vendor helper code (*_helper.c) are put
under helpers subdirectory.  Also the sub-codec drivers are moved under
a different subdirectory, sound/hda/codecs/sub-codecs, for
distinguishing from the main HD-audio codec drivers.

The prefix patch_ and hda_ as well as the suffix _helper are dropped
from file names as they are mostly superfluous.

No functional changes but just file path shuffling.

Reviewed-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250709160434.1859-7-tiwai@suse.de
parent 2d9223d2

sound/hda/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ menu "HD-Audio" 


source "sound/hda/common/Kconfig"

source "sound/hda/controllers/Kconfig"

source "sound/hda/codecs/Kconfig"

source "sound/hda/core/Kconfig"



endmenu

sound/hda/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-y += core/

obj-$(CONFIG_SND_HDA) += common/

obj-$(CONFIG_SND_HDA) += codecs/

# this must be the last entry after codec drivers;

# otherwise the codec patches won't be hooked before the PCI probe

# when built in kernel

sound/pci/hda/Kconfig→sound/hda/codecs/Kconfig

+4 −154
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

menu "HD-Audio"

if SND_HDA



config SND_HDA_GENERIC_LEDS

       bool



if SND_HDA



config SND_HDA_CIRRUS_SCODEC

	tristate



config SND_HDA_CIRRUS_SCODEC_KUNIT_TEST

	tristate "KUnit test for Cirrus side-codec library" if !KUNIT_ALL_TESTS

	depends on SND_HDA_CIRRUS_SCODEC && GPIOLIB && KUNIT

	default KUNIT_ALL_TESTS

	help

	  This builds KUnit tests for the cirrus side-codec library.

	  For more information on KUnit and unit tests in general,

	  please refer to the KUnit documentation in

	  Documentation/dev-tools/kunit/.

	  If in doubt, say "N".



config SND_HDA_SCODEC_CS35L41

	tristate

	select SND_HDA_GENERIC

	select REGMAP_IRQ

	select FW_CS_DSP



config SND_HDA_SCODEC_COMPONENT

	tristate



config SND_HDA_SCODEC_CS35L41_I2C

	tristate "Build CS35L41 HD-audio side codec support for I2C Bus"

	depends on I2C

	depends on ACPI

	depends on EFI

	depends on SND_SOC

	select SND_SOC_CS35L41_LIB

	select SND_HDA_SCODEC_CS35L41

	select SND_SOC_CS_AMP_LIB

	help

	  Say Y or M here to include CS35L41 I2C HD-audio side codec support

	  in snd-hda-intel driver, such as ALC287.



comment "Set to Y if you want auto-loading the side codec driver"

	depends on SND_HDA=y && SND_HDA_SCODEC_CS35L41_I2C=m



config SND_HDA_SCODEC_CS35L41_SPI

	tristate "Build CS35L41 HD-audio codec support for SPI Bus"

	depends on SPI_MASTER

	depends on ACPI

	depends on EFI

	depends on SND_SOC

	select SND_SOC_CS35L41_LIB

	select SND_HDA_SCODEC_CS35L41

	select SND_SOC_CS_AMP_LIB

	help

	  Say Y or M here to include CS35L41 SPI HD-audio side codec support

	  in snd-hda-intel driver, such as ALC287.



comment "Set to Y if you want auto-loading the side codec driver"

	depends on SND_HDA=y && SND_HDA_SCODEC_CS35L41_SPI=m



config SND_HDA_SCODEC_CS35L56

	tristate



config SND_HDA_SCODEC_CS35L56_I2C

	tristate "Build CS35L56 HD-audio side codec support for I2C Bus"

	depends on I2C

	depends on ACPI

	depends on SND_SOC

	select FW_CS_DSP

	imply SERIAL_MULTI_INSTANTIATE

	select SND_HDA_GENERIC

	select SND_SOC_CS35L56_SHARED

	select SND_HDA_SCODEC_CS35L56

	select SND_HDA_CIRRUS_SCODEC

	select SND_SOC_CS_AMP_LIB

	help

	  Say Y or M here to include CS35L56 amplifier support with

	  I2C control.



config SND_HDA_SCODEC_CS35L56_SPI

	tristate "Build CS35L56 HD-audio side codec support for SPI Bus"

	depends on SPI_MASTER

	depends on ACPI

	depends on SND_SOC

	select FW_CS_DSP

	imply SERIAL_MULTI_INSTANTIATE

	select SND_HDA_GENERIC

	select SND_SOC_CS35L56_SHARED

	select SND_HDA_SCODEC_CS35L56

	select SND_HDA_CIRRUS_SCODEC

	select SND_SOC_CS_AMP_LIB

	help

	  Say Y or M here to include CS35L56 amplifier support with

	  SPI control.



config SND_HDA_SCODEC_TAS2781

	tristate

	select SND_HDA_GENERIC



config SND_HDA_SCODEC_TAS2781_I2C

	tristate "Build TAS2781 HD-audio side codec support for I2C Bus"

	depends on I2C

	depends on ACPI

	depends on EFI

	depends on SND_SOC

	select SND_HDA_SCODEC_TAS2781

	select SND_SOC_TAS2781_COMLIB_I2C

	select SND_SOC_TAS2781_FMWLIB

	select CRC32

	help

	  Say Y or M here to include TAS2781 I2C HD-audio side codec support

	  in snd-hda-intel driver, such as ALC287.



comment "Set to Y if you want auto-loading the side codec driver"

	depends on SND_HDA=y && SND_HDA_SCODEC_TAS2781_I2C=m



config SND_HDA_SCODEC_TAS2781_SPI

	tristate "Build TAS2781 HD-audio side codec support for SPI Bus"

	depends on SPI_MASTER

	depends on ACPI

	depends on EFI

	depends on SND_SOC

	select SND_HDA_SCODEC_TAS2781

	select SND_SOC_TAS2781_COMLIB

	select SND_SOC_TAS2781_FMWLIB

	select CRC8

	select CRC32

	help

	  Say Y or M here to include TAS2781 SPI HD-audio side codec support

	  in snd-hda-intel driver, such as ALC287.



comment "Set to Y if you want auto-loading the side codec driver"

	depends on SND_HDA=y && SND_HDA_SCODEC_TAS2781_SPI=m



config SND_HDA_CODEC_REALTEK

	tristate "Build Realtek HD-audio codec support"

	depends on INPUT
@@ -194,26 +63,6 @@ config SND_HDA_CODEC_HDMI 
comment "Set to Y if you want auto-loading the codec driver"

	depends on SND_HDA=y && SND_HDA_CODEC_HDMI=m



config SND_HDA_CODEC_CIRRUS

	tristate "Build Cirrus Logic codec support"

	select SND_HDA_GENERIC

	help

	  Say Y or M here to include Cirrus Logic codec support in

	  snd-hda-intel driver, such as CS4206.



comment "Set to Y if you want auto-loading the codec driver"

	depends on SND_HDA=y && SND_HDA_CODEC_CIRRUS=m



config SND_HDA_CODEC_CS8409

	tristate "Build Cirrus Logic HDA bridge support"

	select SND_HDA_GENERIC

	help

	  Say Y or M here to include Cirrus Logic HDA bridge support in

	  snd-hda-intel driver, such as CS8409.



comment "Set to Y if you want auto-loading the codec driver"

	depends on SND_HDA=y && SND_HDA_CODEC_CS8409=m



config SND_HDA_CODEC_CONEXANT

	tristate "Build Conexant HD-audio codec support"

	select SND_HDA_GENERIC
@@ -313,6 +162,7 @@ config SND_HDA_INTEL_HDMI_SILENT_STREAM 
	  This feature can impact power consumption as resources

	  are kept reserved both at transmitter and receiver.



endif

source "sound/hda/codecs/cirrus/Kconfig"

source "sound/hda/codecs/side-codecs/Kconfig"



endmenu
 
endif # SND_HDA

sound/hda/codecs/Makefile

0 → 100644
+31 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

subdir-ccflags-y += -I$(src)/../common



snd-hda-codec-generic-y :=	generic.o

snd-hda-codec-analog-y :=	analog.o

snd-hda-codec-ca0110-y :=	ca0110.o

snd-hda-codec-ca0132-y :=	ca0132.o

snd-hda-codec-cmedia-y :=	cmedia.o

snd-hda-codec-conexant-y :=	conexant.o

snd-hda-codec-idt-y :=		sigmatel.o

snd-hda-codec-realtek-y :=	realtek.o

snd-hda-codec-senarytech-y :=	senarytech.o

snd-hda-codec-si3054-y :=	si3054.o

snd-hda-codec-via-y :=		via.o



obj-y += cirrus/

obj-y += hdmi/

obj-y += side-codecs/



# codec drivers

obj-$(CONFIG_SND_HDA_GENERIC) += snd-hda-codec-generic.o

obj-$(CONFIG_SND_HDA_CODEC_ANALOG) += snd-hda-codec-analog.o

obj-$(CONFIG_SND_HDA_CODEC_CA0110) += snd-hda-codec-ca0110.o

obj-$(CONFIG_SND_HDA_CODEC_CA0132) += snd-hda-codec-ca0132.o

obj-$(CONFIG_SND_HDA_CODEC_CMEDIA) += snd-hda-codec-cmedia.o

obj-$(CONFIG_SND_HDA_CODEC_CONEXANT) += snd-hda-codec-conexant.o

obj-$(CONFIG_SND_HDA_CODEC_SIGMATEL) += snd-hda-codec-idt.o

obj-$(CONFIG_SND_HDA_CODEC_REALTEK) += snd-hda-codec-realtek.o

obj-$(CONFIG_SND_HDA_CODEC_SENARYTECH) += snd-hda-codec-senarytech.o

obj-$(CONFIG_SND_HDA_CODEC_SI3054) += snd-hda-codec-si3054.o

obj-$(CONFIG_SND_HDA_CODEC_VIA) += snd-hda-codec-via.o

sound/pci/hda/patch_analog.c→sound/hda/codecs/analog.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include "hda_auto_parser.h"

#include "hda_beep.h"

#include "hda_jack.h"

#include "hda_generic.h"

#include "generic.h"





struct ad198x_spec {