archives/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-03-08 03:04:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ALSA: hda: Move controller drivers into sound/hda/controllers directory

Browse source 
Now HD-audio controller drivers are moved into sound/hda/controllers
directory as a part of HD-audio code reorganization.  Most of drivers
are independent from PCI bus, hence it makes more sense to put under
sound/hda.

The hda_ prefix is dropped from most of files at moving, as it's
more or less superfluous.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250709160434.1859-6-tiwai@suse.de
This commit is contained in:
Takashi Iwai 2025-07-09 18:04:08 +02:00
parent 146355ee88
commit 2d9223d2d6
11 changed files with 63 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sound/hda/Kconfig
View file

@ -2,6 +2,7 @@
menu "HD-Audio"
source "sound/hda/common/Kconfig"
source "sound/hda/controllers/Kconfig"
source "sound/hda/core/Kconfig"
endmenu

4
sound/hda/Makefile
View file

@ -1,3 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
obj-y += core/
obj-$(CONFIG_SND_HDA) += common/
# 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
obj-$(CONFIG_SND_HDA) += controllers/

42
sound/hda/controllers/Kconfig Normal file
View file

@ -0,0 +1,42 @@
# SPDX-License-Identifier: GPL-2.0-only
config SND_HDA_INTEL
tristate "HD Audio PCI"
depends on SND_PCI
select SND_HDA
select SND_INTEL_DSP_CONFIG
help
Say Y here to include support for Intel "High Definition
Audio" (Azalia) and its compatible devices.
This option enables the HD-audio controller. Don't forget
to choose the appropriate HD-audio codec options.
To compile this driver as a module, choose M here: the module
will be called snd-hda-intel.
config SND_HDA_TEGRA
tristate "NVIDIA Tegra HD Audio"
depends on ARCH_TEGRA
select SND_HDA
select SND_HDA_ALIGNED_MMIO
help
Say Y here to support the HDA controller present in NVIDIA
Tegra SoCs
This options enables support for the HD Audio controller
present in some NVIDIA Tegra SoCs, used to communicate audio
to the HDMI output.
To compile this driver as a module, choose M here: the module
will be called snd-hda-tegra.
config SND_HDA_ACPI
tristate "HD Audio ACPI"
depends on ACPI
select SND_HDA
help
Say Y here to include support for Azalia-compatible HDA controllers
which are advertised via ACPI objects.
To compile this driver as a module, choose M here: the module
will be called snd-hda-acpi.

13
sound/hda/controllers/Makefile Normal file
View file

@ -0,0 +1,13 @@
# SPDX-License-Identifier: GPL-2.0
snd-hda-intel-y := intel.o
snd-hda-tegra-y := tegra.o
snd-hda-acpi-y := acpi.o
subdir-ccflags-y += -I$(src)/../common
# for trace-points
CFLAGS_intel.o := -I$(src)
obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-intel.o
obj-$(CONFIG_SND_HDA_TEGRA) += snd-hda-tegra.o
obj-$(CONFIG_SND_HDA_ACPI) += snd-hda-acpi.o

0
sound/pci/hda/hda_acpi.c → sound/hda/controllers/acpi.c
View file

5
sound/pci/hda/hda_intel.c → sound/hda/controllers/intel.c
View file

@ -54,11 +54,10 @@
#include <linux/apple-gmux.h>
#include <linux/firmware.h>
#include <sound/hda_codec.h>
#include "hda_controller.h"
#include "hda_intel.h"
#include "intel.h"
#define CREATE_TRACE_POINTS
#include "hda_intel_trace.h"
#include "intel_trace.h"
/* position fix mode */
enum {

0
sound/pci/hda/hda_intel.h → sound/hda/controllers/intel.h
View file

2
sound/pci/hda/hda_intel_trace.h → sound/hda/controllers/intel_trace.h
View file

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#undef TRACE_SYSTEM
#define TRACE_SYSTEM hda_intel
#define TRACE_INCLUDE_FILE hda_intel_trace
#define TRACE_INCLUDE_FILE intel_trace
#if !defined(_TRACE_HDA_INTEL_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_HDA_INTEL_H

0
sound/pci/hda/hda_tegra.c → sound/hda/controllers/tegra.c
View file

42
sound/pci/hda/Kconfig
View file

@ -4,48 +4,6 @@ menu "HD-Audio"
config SND_HDA_GENERIC_LEDS
bool
config SND_HDA_INTEL
tristate "HD Audio PCI"
depends on SND_PCI
select SND_HDA
select SND_INTEL_DSP_CONFIG
help
Say Y here to include support for Intel "High Definition
Audio" (Azalia) and its compatible devices.
This option enables the HD-audio controller. Don't forget
to choose the appropriate codec options below.
To compile this driver as a module, choose M here: the module
will be called snd-hda-intel.
config SND_HDA_TEGRA
tristate "NVIDIA Tegra HD Audio"
depends on ARCH_TEGRA
select SND_HDA
select SND_HDA_ALIGNED_MMIO
help
Say Y here to support the HDA controller present in NVIDIA
Tegra SoCs
This options enables support for the HD Audio controller
present in some NVIDIA Tegra SoCs, used to communicate audio
to the HDMI output.
To compile this driver as a module, choose M here: the module
will be called snd-hda-tegra.
config SND_HDA_ACPI
tristate "HD Audio ACPI"
depends on ACPI
select SND_HDA
help
Say Y here to include support for Azalia-compatible HDA controllers
which are advertised via ACPI objects.
To compile this driver as a module, choose M here: the module
will be called snd-hda-acpi.
if SND_HDA
config SND_HDA_CIRRUS_SCODEC

14
sound/pci/hda/Makefile
View file

@ -1,11 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
snd-hda-intel-y := hda_intel.o
snd-hda-tegra-y := hda_tegra.o
snd-hda-acpi-y := hda_acpi.o
# for trace-points
CFLAGS_hda_intel.o := -I$(src)
subdir-ccflags-y += -I$(src)/../../hda/common
snd-hda-codec-generic-y := hda_generic.o
@ -66,10 +59,3 @@ obj-$(CONFIG_SND_HDA_SCODEC_COMPONENT) += snd-hda-scodec-component.o
obj-$(CONFIG_SND_HDA_SCODEC_TAS2781) += snd-hda-scodec-tas2781.o
obj-$(CONFIG_SND_HDA_SCODEC_TAS2781_I2C) += snd-hda-scodec-tas2781-i2c.o
obj-$(CONFIG_SND_HDA_SCODEC_TAS2781_SPI) += snd-hda-scodec-tas2781-spi.o
# 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
obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-intel.o
obj-$(CONFIG_SND_HDA_TEGRA) += snd-hda-tegra.o
obj-$(CONFIG_SND_HDA_ACPI) += snd-hda-acpi.o