ALSA: hda: Move HD-audio core stuff into sound/hda/core
This is a part of HD-audio code restructuring. Simply move the current code of sound/hda/* into the subdirectory sound/hda/core, so that more stuff can be moved into sound/hda cleanly later. Most of file names with hdac_ and hdac_ext_ prefix are renamed without the prefix, since they can be identified well in the directory name and superfluous. Signed-off-by: Takashi Iwai <tiwai@suse.de> Link: https://patch.msgid.link/20250709160434.1859-3-tiwai@suse.de
This commit is contained in:
@@ -1,67 +1,2 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
config SND_HDA_CORE
|
||||
tristate
|
||||
select REGMAP
|
||||
|
||||
config SND_HDA_DSP_LOADER
|
||||
bool
|
||||
|
||||
config SND_HDA_ALIGNED_MMIO
|
||||
bool
|
||||
|
||||
config SND_HDA_COMPONENT
|
||||
bool
|
||||
|
||||
config SND_HDA_I915
|
||||
bool
|
||||
select SND_HDA_COMPONENT
|
||||
|
||||
config SND_HDA_EXT_CORE
|
||||
tristate
|
||||
select SND_HDA_CORE
|
||||
|
||||
config SND_HDA_PREALLOC_SIZE
|
||||
int "Pre-allocated buffer size for HD-audio driver"
|
||||
range 0 32768
|
||||
default 0 if SND_DMA_SGBUF
|
||||
default 64 if !SND_DMA_SGBUF
|
||||
help
|
||||
Specifies the default pre-allocated buffer-size in kB for the
|
||||
HD-audio driver. A larger buffer (e.g. 2048) is preferred
|
||||
for systems using PulseAudio. The default 64 is chosen just
|
||||
for compatibility reasons.
|
||||
On x86 systems, the default is zero as S/G allocation works
|
||||
and no preallocation is needed in most cases.
|
||||
|
||||
Note that the pre-allocation size can be changed dynamically
|
||||
via a proc file (/proc/asound/card*/pcm*/sub*/prealloc), too.
|
||||
|
||||
config SND_INTEL_NHLT
|
||||
bool
|
||||
# this config should be selected only for Intel ACPI platforms.
|
||||
# A fallback is provided so that the code compiles in all cases.
|
||||
|
||||
config SND_INTEL_DSP_CONFIG
|
||||
tristate
|
||||
select ACPI_NHLT if ACPI
|
||||
select SND_INTEL_NHLT if ACPI
|
||||
select SND_INTEL_SOUNDWIRE_ACPI if ACPI
|
||||
# this config should be selected only for Intel DSP platforms.
|
||||
# A fallback is provided so that the code compiles in all cases.
|
||||
|
||||
config SND_INTEL_SOUNDWIRE_ACPI
|
||||
tristate
|
||||
|
||||
config SND_INTEL_BYT_PREFER_SOF
|
||||
bool "Prefer SOF driver over SST on BY/CHT platforms"
|
||||
depends on SND_SST_ATOM_HIFI2_PLATFORM_ACPI && SND_SOC_SOF_BAYTRAIL
|
||||
default n
|
||||
help
|
||||
The kernel has 2 drivers for the Low Power Engine audio-block on
|
||||
Bay- and Cherry-Trail SoCs. The old SST driver and the new SOF
|
||||
driver. If both drivers are enabled then the kernel will default
|
||||
to using the old SST driver, unless told otherwise through the
|
||||
snd_intel_dspcfg.dsp_driver module-parameter.
|
||||
|
||||
Set this option to Y to make the kernel default to the new SOF
|
||||
driver instead.
|
||||
source "sound/hda/core/Kconfig"
|
||||
|
||||
@@ -1,22 +1,2 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
snd-hda-core-y := hda_bus_type.o hdac_bus.o hdac_device.o hdac_sysfs.o \
|
||||
hdac_regmap.o hdac_controller.o hdac_stream.o array.o hdmi_chmap.o
|
||||
|
||||
snd-hda-core-y += trace.o
|
||||
CFLAGS_trace.o := -I$(src)
|
||||
|
||||
# for sync with i915 gfx driver
|
||||
snd-hda-core-$(CONFIG_SND_HDA_COMPONENT) += hdac_component.o
|
||||
snd-hda-core-$(CONFIG_SND_HDA_I915) += hdac_i915.o
|
||||
|
||||
obj-$(CONFIG_SND_HDA_CORE) += snd-hda-core.o
|
||||
|
||||
#extended hda
|
||||
obj-$(CONFIG_SND_HDA_EXT_CORE) += ext/
|
||||
|
||||
snd-intel-dspcfg-y := intel-dsp-config.o
|
||||
snd-intel-dspcfg-$(CONFIG_SND_INTEL_NHLT) += intel-nhlt.o
|
||||
obj-$(CONFIG_SND_INTEL_DSP_CONFIG) += snd-intel-dspcfg.o
|
||||
|
||||
snd-intel-sdw-acpi-y := intel-sdw-acpi.o
|
||||
obj-$(CONFIG_SND_INTEL_SOUNDWIRE_ACPI) += snd-intel-sdw-acpi.o
|
||||
obj-y += core/
|
||||
|
||||
67
sound/hda/core/Kconfig
Normal file
67
sound/hda/core/Kconfig
Normal file
@@ -0,0 +1,67 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
config SND_HDA_CORE
|
||||
tristate
|
||||
select REGMAP
|
||||
|
||||
config SND_HDA_DSP_LOADER
|
||||
bool
|
||||
|
||||
config SND_HDA_ALIGNED_MMIO
|
||||
bool
|
||||
|
||||
config SND_HDA_COMPONENT
|
||||
bool
|
||||
|
||||
config SND_HDA_I915
|
||||
bool
|
||||
select SND_HDA_COMPONENT
|
||||
|
||||
config SND_HDA_EXT_CORE
|
||||
tristate
|
||||
select SND_HDA_CORE
|
||||
|
||||
config SND_HDA_PREALLOC_SIZE
|
||||
int "Pre-allocated buffer size for HD-audio driver"
|
||||
range 0 32768
|
||||
default 0 if SND_DMA_SGBUF
|
||||
default 64 if !SND_DMA_SGBUF
|
||||
help
|
||||
Specifies the default pre-allocated buffer-size in kB for the
|
||||
HD-audio driver. A larger buffer (e.g. 2048) is preferred
|
||||
for systems using PulseAudio. The default 64 is chosen just
|
||||
for compatibility reasons.
|
||||
On x86 systems, the default is zero as S/G allocation works
|
||||
and no preallocation is needed in most cases.
|
||||
|
||||
Note that the pre-allocation size can be changed dynamically
|
||||
via a proc file (/proc/asound/card*/pcm*/sub*/prealloc), too.
|
||||
|
||||
config SND_INTEL_NHLT
|
||||
bool
|
||||
# this config should be selected only for Intel ACPI platforms.
|
||||
# A fallback is provided so that the code compiles in all cases.
|
||||
|
||||
config SND_INTEL_DSP_CONFIG
|
||||
tristate
|
||||
select ACPI_NHLT if ACPI
|
||||
select SND_INTEL_NHLT if ACPI
|
||||
select SND_INTEL_SOUNDWIRE_ACPI if ACPI
|
||||
# this config should be selected only for Intel DSP platforms.
|
||||
# A fallback is provided so that the code compiles in all cases.
|
||||
|
||||
config SND_INTEL_SOUNDWIRE_ACPI
|
||||
tristate
|
||||
|
||||
config SND_INTEL_BYT_PREFER_SOF
|
||||
bool "Prefer SOF driver over SST on BY/CHT platforms"
|
||||
depends on SND_SST_ATOM_HIFI2_PLATFORM_ACPI && SND_SOC_SOF_BAYTRAIL
|
||||
default n
|
||||
help
|
||||
The kernel has 2 drivers for the Low Power Engine audio-block on
|
||||
Bay- and Cherry-Trail SoCs. The old SST driver and the new SOF
|
||||
driver. If both drivers are enabled then the kernel will default
|
||||
to using the old SST driver, unless told otherwise through the
|
||||
snd_intel_dspcfg.dsp_driver module-parameter.
|
||||
|
||||
Set this option to Y to make the kernel default to the new SOF
|
||||
driver instead.
|
||||
22
sound/hda/core/Makefile
Normal file
22
sound/hda/core/Makefile
Normal file
@@ -0,0 +1,22 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
snd-hda-core-y := hda_bus_type.o bus.o device.o sysfs.o \
|
||||
regmap.o controller.o stream.o array.o hdmi_chmap.o
|
||||
|
||||
snd-hda-core-y += trace.o
|
||||
CFLAGS_trace.o := -I$(src)
|
||||
|
||||
# for sync with i915 gfx driver
|
||||
snd-hda-core-$(CONFIG_SND_HDA_COMPONENT) += component.o
|
||||
snd-hda-core-$(CONFIG_SND_HDA_I915) += i915.o
|
||||
|
||||
obj-$(CONFIG_SND_HDA_CORE) += snd-hda-core.o
|
||||
|
||||
#extended hda
|
||||
obj-$(CONFIG_SND_HDA_EXT_CORE) += ext/
|
||||
|
||||
snd-intel-dspcfg-y := intel-dsp-config.o
|
||||
snd-intel-dspcfg-$(CONFIG_SND_INTEL_NHLT) += intel-nhlt.o
|
||||
obj-$(CONFIG_SND_INTEL_DSP_CONFIG) += snd-intel-dspcfg.o
|
||||
|
||||
snd-intel-sdw-acpi-y := intel-sdw-acpi.o
|
||||
obj-$(CONFIG_SND_INTEL_SOUNDWIRE_ACPI) += snd-intel-sdw-acpi.o
|
||||
@@ -1,4 +1,4 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
snd-hda-ext-core-y := hdac_ext_bus.o hdac_ext_controller.o hdac_ext_stream.o
|
||||
snd-hda-ext-core-y := bus.o controller.o stream.o
|
||||
|
||||
obj-$(CONFIG_SND_HDA_EXT_CORE) += snd-hda-ext-core.o
|
||||
Reference in New Issue
Block a user