Prepare Sound Open Firmware (SOF) driver integration
Subsystems (3)
cover Prepare Sound Open Firmware (SOF) driver integration
The Sound Open Firmware work [1] is progressing quickly and drivers for the 1.0 release will soon be submitted upstream. Before we do so, there is a new to reshuffle the ACPI integration and Intel Kconfig/Makefiles. This RFC is a preview of what's coming, feedback would be greatly appreciated.
We already have three incompatible drivers (BYT/HSW/BDW, Atom/BYT/CHT, SKL+) for historical reasons, blindly adding yet another one would be silly. We need to avoid having the same ACPI routines and machine tables duplicated in 3 locations (soc/intel/common, soc/atom/sst and the upcoming soc/sof).
The ACPI routines should be part of sound/soc since there is no real hardware dependency (ACPI is not limited to Intel).
The ACPI table definitions and quirks are moved to a soc/intel/common module so that when new HIDs or quirks are added "legacy" and the SOF drivers are updated at once.
The Makefiles/Kconfig are also modified to select the SOC(s) first and the machine driver(s) second. The existing code only exposes machine drivers which precludes reuse of machine drivers when SOF platform drivers are selected. SOF drivers will be exposed in parallel to the 'Intel SST' ones (with an exclusive choice needed), but machine drivers will be shared.
These patches apply on top of broonie/for-next + all the patches I submitted this week (no dependency on SOF). For people with allergic reactions to patches over email, the code is here:
https://github.com/plbossart/sound/commits/topic/acpi-updates
This patchset does not address the case where two drivers are selected for the same ACPI HID. I just don't know of any technical solution to that problem.
[1] https://www.alsa-project.org/main/index.php/Firmware
Pierre-Louis Bossart (8):
ASoC: move ACPI common code out of Intel/sst tree
ASoC: Intel: common: use c99 syntax for ACPI/machine tables
ASoC: ACPI: add new fields for SOF support
ASoC: Intel: move all ACPI match tables to common module
ASoC: Intel: add SOF firmare/topology file information
ASoC: Intel: move machine drivers to dedicated KConfig
ASoC: Intel: reorder boards Kconfig by chronological order
ASoC: Intel: clarify Kconfig dependencies
include/sound/soc-acpi-intel-match.h | 32 ++
include/sound/soc-acpi.h | 107 ++++++
sound/soc/Kconfig | 3 +
sound/soc/Makefile | 6 +
sound/soc/intel/Kconfig | 299 ++-------------
sound/soc/intel/Makefile | 2 +-
sound/soc/intel/atom/sst/sst_acpi.c | 319 ++--------------
sound/soc/intel/boards/Kconfig | 286 +++++++++++++++
sound/soc/intel/boards/bytcht_da7213.c | 6 +-
sound/soc/intel/boards/bytcht_es8316.c | 2 +-
sound/soc/intel/boards/bytcr_rt5640.c | 11 +-
sound/soc/intel/boards/bytcr_rt5651.c | 8 +-
sound/soc/intel/boards/cht_bsw_rt5645.c | 11 +-
sound/soc/intel/boards/cht_bsw_rt5672.c | 7 +-
sound/soc/intel/common/Makefile | 4 +-
sound/soc/intel/common/soc-acpi-intel-match.c | 400 +++++++++++++++++++++
sound/soc/intel/common/sst-acpi.c | 36 +-
sound/soc/intel/common/sst-acpi.h | 82 -----
sound/soc/intel/skylake/skl.c | 40 +--
.../{intel/common/sst-match-acpi.c => soc-acpi.c} | 56 +--
20 files changed, 965 insertions(+), 752 deletions(-)
create mode 100644 include/sound/soc-acpi-intel-match.h
create mode 100644 include/sound/soc-acpi.h
create mode 100644 sound/soc/intel/boards/Kconfig
create mode 100644 sound/soc/intel/common/soc-acpi-intel-match.c
delete mode 100644 sound/soc/intel/common/sst-acpi.h
rename sound/soc/{intel/common/sst-match-acpi.c => soc-acpi.c} (63%)Signature · 1 line
2.9.3
RFC PATCH 1/8 ASoC: move ACPI common code out of Intel/sst tree
ACPI support is not specific to the Intel/SST driver. Move the enumeration and matching code which is not hardware-dependent to sound/soc and rename relevant sst_acpi_ structures and functions with snd_soc_acpi_ prefix
---
.../common/sst-acpi.h => include/sound/soc-acpi.h | 44 ++++++++++-------
sound/soc/Kconfig | 3 ++
sound/soc/Makefile | 6 +++
sound/soc/intel/Kconfig | 1 +
sound/soc/intel/atom/sst/sst_acpi.c | 24 +++++-----
sound/soc/intel/boards/bytcht_da7213.c | 6 +--
sound/soc/intel/boards/bytcht_es8316.c | 2 +-
sound/soc/intel/boards/bytcr_rt5640.c | 11 +++--
sound/soc/intel/boards/bytcr_rt5651.c | 8 ++--
sound/soc/intel/boards/cht_bsw_rt5645.c | 11 +++--
sound/soc/intel/boards/cht_bsw_rt5672.c | 7 +--
sound/soc/intel/common/Makefile | 2 -
sound/soc/intel/common/sst-acpi.c | 18 +++----
sound/soc/intel/skylake/skl.c | 40 ++++++++--------
.../{intel/common/sst-match-acpi.c => soc-acpi.c} | 56 +++++++++++-----------
15 files changed, 130 insertions(+), 109 deletions(-)
rename sound/soc/intel/common/sst-acpi.h => include/sound/soc-acpi.h (55%)
rename sound/soc/{intel/common/sst-match-acpi.c => soc-acpi.c} (63%)include/sound/soc-acpi.h renamed from sound/soc/intel/common/sst-acpi.h +26 -18
@@ -12,10 +12,13 @@* */ +#ifndef __LINUX_SND_SOC_ACPI_H +#define __LINUX_SND_SOC_ACPI_H + #include <linux/stddef.h> #include <linux/acpi.h> -struct sst_acpi_package_context { +struct snd_soc_acpi_package_context { char *name; /* package name */ int length; /* number of elements */ struct acpi_buffer *format;
@@ -25,29 +28,32 @@ struct sst_acpi_package_context {#if IS_ENABLED (CONFIG_ACPI )/* translation fron HID to I2C name, needed for DAI codec_name */ -const char *sst_acpi_find_name_from_hid (const u8 hid[ACPI_ID_LEN ]); -bool sst_acpi_find_package_from_hid (const u8 hid[ACPI_ID_LEN ], -struct sst_acpi_package_context *ctx); +const char *snd_soc_acpi_find_name_from_hid (const u8 hid[ACPI_ID_LEN ]); +bool snd_soc_acpi_find_package_from_hid (const u8 hid[ACPI_ID_LEN ], +struct snd_soc_acpi_package_context *ctx);#else -static inline const char *sst_acpi_find_name_from_hid (const u8 hid[ACPI_ID_LEN ]) +static inline const char * +snd_soc_acpi_find_name_from_hid (const u8 hid[ACPI_ID_LEN ]) {return NULL ; } -static inline bool sst_acpi_find_package_from_hid (const u8 hid[ACPI_ID_LEN ], -struct sst_acpi_package_context *ctx) +static inline bool +snd_soc_acpi_find_package_from_hid (const u8 hid[ACPI_ID_LEN ], +struct snd_soc_acpi_package_context *ctx) {return false; }#endif /* acpi match */ -struct sst_acpi_mach *sst_acpi_find_machine (struct sst_acpi_mach *machines); +struct snd_soc_acpi_mach * +snd_soc_acpi_find_machine (struct snd_soc_acpi_mach *machines);/* acpi check hid */ -bool sst_acpi_check_hid (const u8 hid[ACPI_ID_LEN ]); +bool snd_soc_acpi_check_hid (const u8 hid[ACPI_ID_LEN ]);/* Descriptor for SST ASoC machine driver */ -struct sst_acpi_mach { +struct snd_soc_acpi_mach {/* ACPI ID for the matching machine driver. Audio codec for instance */ const u8 id[ACPI_ID_LEN ];/* machine driver name */
@@ -57,26 +63,28 @@ struct sst_acpi_mach {/* board name */ const char *board; -struct sst_acpi_mach * (*machine_quirk)(void *arg); +struct snd_soc_acpi_mach * (*machine_quirk)(void *arg);const void *quirk_data; void *pdata; }; -#define SST_ACPI_MAX_CODECS 3 +#define SND_SOC_ACPI_MAX_CODECS 3/** -* struct sst_codecs: Structure to hold secondary codec information apart from -* the matched one, this data will be passed to the quirk function to match -* with the ACPI detected devices +* struct snd_soc_acpi_codecs: Structure to hold secondary codec information +* apart from the matched one, this data will be passed to the quirk function +* to match with the ACPI detected devices * * @num_codecs: number of secondary codecs used in the platform * @codecs: holds the codec IDs * */ -struct sst_codecs { +struct snd_soc_acpi_codecs {int num_codecs; -u8 codecs[SST_ACPI_MAX_CODECS ][ACPI_ID_LEN ]; +u8 codecs[SND_SOC_ACPI_MAX_CODECS ][ACPI_ID_LEN ]; };/* check all codecs */ -struct sst_acpi_mach *sst_acpi_codec_list (void *arg); +struct snd_soc_acpi_mach *snd_soc_acpi_codec_list (void *arg); + +#endif
sound/soc/Kconfig +3 -0
@@ -36,6 +36,9 @@ config SND_SOC_COMPRESS config SND_SOC_TOPOLOGY bool +config SND_SOC_ACPI + tristate + # All the supported SoCs source "sound/soc/adi/Kconfig" source "sound/soc/amd/Kconfig"
sound/soc/Makefile +6 -0
@@ -14,6 +14,12 @@ ifneq ($(CONFIG_SND_SOC_AC97_BUS),) snd-soc-core-objs += soc-ac97.o endif +ifneq ($(CONFIG_SND_SOC_ACPI),) +snd-soc-acpi-objs := soc-acpi.o +endif + +obj-$(CONFIG_SND_SOC_ACPI) += snd-soc-acpi.o + obj-$(CONFIG_SND_SOC) += snd-soc-core.o obj-$(CONFIG_SND_SOC) += codecs/ obj-$(CONFIG_SND_SOC) += generic/
sound/soc/intel/Kconfig +1 -0
@@ -41,6 +41,7 @@ config SND_SOC_INTEL_SST_ACPI config SND_SOC_INTEL_SST_MATCH tristate + select SND_SOC_ACPI if ACPI config SND_SOC_INTEL_HASWELL tristate
sound/soc/intel/atom/sst/sst_acpi.c +12 -12
@@ -41,9 +41,9 @@#include <acpi/acpi_bus.h> #include <asm/cpu_device_id.h> #include <asm/iosf_mbi.h> +#include <sound/soc-acpi.h> #include "../sst-mfld-platform.h" #include "../../common/sst-dsp.h" -#include "../../common/sst-acpi.h" #include "sst.h" /* LPE viewpoint addresses */
@@ -285,7 +285,7 @@ static int sst_acpi_probe(struct platform_device *pdev)int ret =0 ;struct intel_sst_drv *ctx;const struct acpi_device_id *id; -struct sst_acpi_mach *mach; +struct snd_soc_acpi_mach *mach;struct platform_device *mdev;struct platform_device *plat_dev;struct sst_platform_info *pdata;
@@ -297,8 +297,8 @@ static int sst_acpi_probe(struct platform_device *pdev)return -ENODEV ;dev_dbg (dev,"for %s\n" , id->id); - mach = (struct sst_acpi_mach *)id->driver_data; - mach =sst_acpi_find_machine (mach); + mach = (struct snd_soc_acpi_mach *)id->driver_data; + mach =snd_soc_acpi_find_machine (mach);if (mach ==NULL ) {dev_err (dev,"No matching machine driver found\n" );return -ENODEV ;
@@ -436,7 +436,7 @@ static const struct dmi_system_id cht_table[] = { }; -static struct sst_acpi_mach cht_surface_mach = { +static struct snd_soc_acpi_mach cht_surface_mach = { .id ="10EC5640" , .drv_name ="cht-bsw-rt5645" , .fw_filename ="intel/fw_sst_22a8.bin" ,
@@ -444,7 +444,7 @@ static struct sst_acpi_mach cht_surface_mach = { .pdata = &chv_platform_data, }; -static struct sst_acpi_mach byt_thinkpad_10 = { +static struct snd_soc_acpi_mach byt_thinkpad_10 = { .id ="10EC5640" , .drv_name ="cht-bsw-rt5672" , .fw_filename ="intel/fw_sst_0f28.bin" ,
@@ -452,9 +452,9 @@ static struct sst_acpi_mach byt_thinkpad_10 = { .pdata = &byt_rvp_platform_data, }; -static struct sst_acpi_mach *cht_quirk (void *arg) +static struct snd_soc_acpi_mach *cht_quirk (void *arg) { -struct sst_acpi_mach *mach = arg; +struct snd_soc_acpi_mach *mach = arg;dmi_check_system (cht_table);
@@ -464,9 +464,9 @@ static struct sst_acpi_mach *cht_quirk(void *arg)return mach; } -static struct sst_acpi_mach *byt_quirk (void *arg) +static struct snd_soc_acpi_mach *byt_quirk (void *arg) { -struct sst_acpi_mach *mach = arg; +struct snd_soc_acpi_mach *mach = arg;dmi_check_system (byt_table);
@@ -477,7 +477,7 @@ static struct sst_acpi_mach *byt_quirk(void *arg) } -static struct sst_acpi_mach sst_acpi_bytcr[] = { +static struct snd_soc_acpi_mach sst_acpi_bytcr[] = { { .id ="10EC5640" , .drv_name ="bytcr_rt5640" ,
@@ -561,7 +561,7 @@ static struct sst_acpi_mach sst_acpi_bytcr[] = { };/* Cherryview-based platforms: CherryTrail and Braswell */ -static struct sst_acpi_mach sst_acpi_chv[] = { +static struct snd_soc_acpi_mach sst_acpi_chv[] = { { .id ="10EC5670" , .drv_name ="cht-bsw-rt5672" ,
sound/soc/intel/boards/bytcht_da7213.c +3 -3
@@ -27,9 +27,9 @@#include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> +#include <sound/soc-acpi.h> #include "../../codecs/da7213.h" #include "../atom/sst-atom-controls.h" -#include "../common/sst-acpi.h" static const struct snd_kcontrol_new controls[] = {SOC_DAPM_PIN_SWITCH ("Headphone Jack" ),
@@ -234,7 +234,7 @@ static int bytcht_da7213_probe(struct platform_device *pdev)int ret_val =0 ;int i;struct snd_soc_card *card; -struct sst_acpi_mach *mach; +struct snd_soc_acpi_mach *mach;const char *i2c_name =NULL ;int dai_index =0 ;
@@ -252,7 +252,7 @@ static int bytcht_da7213_probe(struct platform_device *pdev) }/* fixup codec name based on HID */ - i2c_name =sst_acpi_find_name_from_hid (mach->id); + i2c_name =snd_soc_acpi_find_name_from_hid (mach->id);if (i2c_name !=NULL ) {snprintf (codec_name,sizeof (codec_name),"%s%s" ,"i2c-" , i2c_name);
sound/soc/intel/boards/bytcht_es8316.c +1 -1
@@ -29,8 +29,8 @@#include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> +#include <sound/soc-acpi.h> #include "../atom/sst-atom-controls.h" -#include "../common/sst-acpi.h" #include "../common/sst-dsp.h" struct byt_cht_es8316_private {
sound/soc/intel/boards/bytcr_rt5640.c +6 -5
@@ -32,9 +32,9 @@#include <sound/pcm_params.h> #include <sound/soc.h> #include <sound/jack.h> +#include <sound/soc-acpi.h> #include "../../codecs/rt5640.h" #include "../atom/sst-atom-controls.h" -#include "../common/sst-acpi.h" #include "../common/sst-dsp.h" enum {
@@ -759,7 +759,7 @@ struct acpi_chan_package { /* ACPICA seems to require 64 bit integers */static int snd_byt_rt5640_mc_probe (struct platform_device *pdev) {int ret_val =0 ; -struct sst_acpi_mach *mach; +struct snd_soc_acpi_mach *mach;const char *i2c_name =NULL ;int i;int dai_index;
@@ -785,7 +785,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) }/* fixup codec name based on HID */ - i2c_name =sst_acpi_find_name_from_hid (mach->id); + i2c_name =snd_soc_acpi_find_name_from_hid (mach->id);if (i2c_name !=NULL ) {snprintf (byt_rt5640_codec_name,sizeof (byt_rt5640_codec_name),"%s%s" ,"i2c-" , i2c_name);
@@ -819,7 +819,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)/* format specified: 2 64-bit integers */ struct acpi_buffer format = {sizeof ("NN" ),"NN" };struct acpi_buffer state = {0 ,NULL }; -struct sst_acpi_package_context pkg_ctx; +struct snd_soc_acpi_package_context pkg_ctx;bool pkg_found = false; state.length =sizeof (chan_package);
@@ -831,7 +831,8 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) pkg_ctx.state = &state; pkg_ctx.data_valid = false; - pkg_found =sst_acpi_find_package_from_hid (mach->id, &pkg_ctx); + pkg_found =snd_soc_acpi_find_package_from_hid (mach->id, + &pkg_ctx);if (pkg_found) {if (chan_package.aif_value ==1 ) {dev_info (&pdev->dev,"BIOS Routing: AIF1 connected\n" );
sound/soc/intel/boards/bytcr_rt5651.c +4 -4
@@ -31,9 +31,9 @@#include <sound/pcm_params.h> #include <sound/soc.h> #include <sound/jack.h> +#include <sound/soc-acpi.h> #include "../../codecs/rt5651.h" #include "../atom/sst-atom-controls.h" -#include "../common/sst-acpi.h" enum {BYT_RT5651_DMIC_MAP ,
@@ -450,7 +450,7 @@ static char byt_rt5651_codec_name[16]; /* i2c-<HID>:00 with HID being 8 chars */static int snd_byt_rt5651_mc_probe (struct platform_device *pdev) {int ret_val =0 ; -struct sst_acpi_mach *mach; +struct snd_soc_acpi_mach *mach;const char *i2c_name =NULL ;int i;int dai_index;
@@ -474,7 +474,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) }/* fixup codec name based on HID */ - i2c_name =sst_acpi_find_name_from_hid (mach->id); + i2c_name =snd_soc_acpi_find_name_from_hid (mach->id);if (i2c_name !=NULL ) {snprintf (byt_rt5651_codec_name,sizeof (byt_rt5651_codec_name),"%s%s" ,"i2c-" , i2c_name);
@@ -495,7 +495,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) }/* fixup codec name based on HID */ - i2c_name =sst_acpi_find_name_from_hid (mach->id); + i2c_name =snd_soc_acpi_find_name_from_hid (mach->id);if (i2c_name !=NULL ) {snprintf (byt_rt5651_codec_name,sizeof (byt_rt5651_codec_name),"%s%s" ,"i2c-" , i2c_name);
sound/soc/intel/boards/cht_bsw_rt5645.c +6 -5
@@ -32,9 +32,9 @@#include <sound/pcm_params.h> #include <sound/soc.h> #include <sound/jack.h> +#include <sound/soc-acpi.h> #include "../../codecs/rt5645.h" #include "../atom/sst-atom-controls.h" -#include "../common/sst-acpi.h" #define CHT_PLAT_CLK_3_HZ 19200000#define CHT_CODEC_DAI1 "rt5645-aif1"
@@ -549,7 +549,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev)int i;struct cht_mc_private *drv;struct snd_soc_card *card = snd_soc_cards[0 ].soc_card; -struct sst_acpi_mach *mach; +struct snd_soc_acpi_mach *mach;const char *i2c_name =NULL ;int dai_index =0 ;bool found = false;
@@ -589,7 +589,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) }/* fixup codec name based on HID */ - i2c_name =sst_acpi_find_name_from_hid (mach->id); + i2c_name =snd_soc_acpi_find_name_from_hid (mach->id);if (i2c_name !=NULL ) {snprintf (cht_rt5645_codec_name,sizeof (cht_rt5645_codec_name),"%s%s" ,"i2c-" , i2c_name);
@@ -622,7 +622,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev)/* format specified: 2 64-bit integers */ struct acpi_buffer format = {sizeof ("NN" ),"NN" };struct acpi_buffer state = {0 ,NULL }; -struct sst_acpi_package_context pkg_ctx; +struct snd_soc_acpi_package_context pkg_ctx;bool pkg_found = false; state.length =sizeof (chan_package);
@@ -634,7 +634,8 @@ static int snd_cht_mc_probe(struct platform_device *pdev) pkg_ctx.state = &state; pkg_ctx.data_valid = false; - pkg_found =sst_acpi_find_package_from_hid (mach->id, &pkg_ctx); + pkg_found =snd_soc_acpi_find_package_from_hid (mach->id, + &pkg_ctx);if (pkg_found) {if (chan_package.aif_value ==1 ) {dev_info (&pdev->dev,"BIOS Routing: AIF1 connected\n" );
sound/soc/intel/boards/cht_bsw_rt5672.c +4 -3
@@ -24,9 +24,10 @@#include <sound/pcm_params.h> #include <sound/soc.h> #include <sound/jack.h> +#include <sound/soc-acpi.h> #include "../../codecs/rt5670.h" #include "../atom/sst-atom-controls.h" -#include "../common/sst-acpi.h" +/* The platform clock #3 outputs 19.2Mhz clock to codec as I2S MCLK */ #define CHT_PLAT_CLK_3_HZ 19200000
@@ -403,7 +404,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) {int ret_val =0 ;struct cht_mc_private *drv; -struct sst_acpi_mach *mach = pdev->dev.platform_data; +struct snd_soc_acpi_mach *mach = pdev->dev.platform_data;const char *i2c_name;int i;
@@ -415,7 +416,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev)/* fixup codec name based on HID */ if (mach) { - i2c_name =sst_acpi_find_name_from_hid (mach->id); + i2c_name =snd_soc_acpi_find_name_from_hid (mach->id);if (i2c_name) {snprintf (drv->codec_name,sizeof (drv->codec_name),"i2c-%s" , i2c_name);
sound/soc/intel/common/Makefile +0 -2
@@ -1,10 +1,8 @@ snd-soc-sst-dsp-objs := sst-dsp.o snd-soc-sst-acpi-objs := sst-acpi.o -snd-soc-sst-match-objs := sst-match-acpi.o snd-soc-sst-ipc-objs := sst-ipc.o snd-soc-sst-firmware-objs := sst-firmware.o obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o snd-soc-sst-ipc.o obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o -obj-$(CONFIG_SND_SOC_INTEL_SST_MATCH) += snd-soc-sst-match.o obj-$(CONFIG_SND_SOC_INTEL_SST_FIRMWARE) += snd-soc-sst-firmware.o
sound/soc/intel/common/sst-acpi.c +9 -9
@@ -21,7 +21,7 @@#include <linux/platform_device.h> #include "sst-dsp.h" -#include "sst-acpi.h" +#include <sound/soc-acpi.h> #define SST_LPT_DSP_DMA_ADDR_OFFSET 0x0F0000#define SST_WPT_DSP_DMA_ADDR_OFFSET 0x0FE000
@@ -30,7 +30,7 @@/* Descriptor for setting up SST platform data */ struct sst_acpi_desc {const char *drv_name; -struct sst_acpi_mach *machines; +struct snd_soc_acpi_mach *machines;/* Platform resource indexes. Must set to -1 if not used */ int resindex_lpe_base;int resindex_pcicfg_base;
@@ -49,7 +49,7 @@ struct sst_acpi_priv {struct platform_device *pdev_pcm;struct sst_pdata sst_pdata;struct sst_acpi_desc *desc; -struct sst_acpi_mach *mach; +struct snd_soc_acpi_mach *mach; };static void sst_acpi_fw_cb (const struct firmware *fw,void *context)
@@ -59,7 +59,7 @@ static void sst_acpi_fw_cb(const struct firmware *fw, void *context)struct sst_acpi_priv *sst_acpi =platform_get_drvdata (pdev);struct sst_pdata *sst_pdata = &sst_acpi->sst_pdata;struct sst_acpi_desc *desc = sst_acpi->desc; -struct sst_acpi_mach *mach = sst_acpi->mach; +struct snd_soc_acpi_mach *mach = sst_acpi->mach; sst_pdata->fw = fw;if (!fw) {
@@ -85,7 +85,7 @@ static int sst_acpi_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct sst_acpi_priv *sst_acpi;struct sst_pdata *sst_pdata; -struct sst_acpi_mach *mach; +struct snd_soc_acpi_mach *mach;struct sst_acpi_desc *desc;struct resource *mmio;int ret =0 ;
@@ -99,7 +99,7 @@ static int sst_acpi_probe(struct platform_device *pdev)return -ENODEV ; desc = (struct sst_acpi_desc *)id->driver_data; - mach =sst_acpi_find_machine (desc->machines); + mach =snd_soc_acpi_find_machine (desc->machines);if (mach ==NULL ) {dev_err (dev,"No matching ASoC machine driver found\n" );return -ENODEV ;
@@ -179,7 +179,7 @@ static int sst_acpi_remove(struct platform_device *pdev)return 0 ; } -static struct sst_acpi_mach haswell_machines[] = { +static struct snd_soc_acpi_mach haswell_machines[] = { {"INT33CA" ,"haswell-audio" ,"intel/IntcSST1.bin" ,NULL ,NULL ,NULL }, {} };
@@ -197,7 +197,7 @@ static struct sst_acpi_desc sst_acpi_haswell_desc = { .dma_size = SST_LPT_DSP_DMA_SIZE, }; -static struct sst_acpi_mach broadwell_machines[] = { +static struct snd_soc_acpi_mach broadwell_machines[] = { {"INT343A" ,"broadwell-audio" ,"intel/IntcSST2.bin" ,NULL ,NULL ,NULL }, {"RT5677CE" ,"bdw-rt5677" ,"intel/IntcSST2.bin" ,NULL ,NULL ,NULL }, {}
@@ -217,7 +217,7 @@ static struct sst_acpi_desc sst_acpi_broadwell_desc = { };#if !IS_ENABLED (CONFIG_SND_SST_IPC_ACPI ) -static struct sst_acpi_mach baytrail_machines[] = { +static struct snd_soc_acpi_mach baytrail_machines[] = { {"10EC5640" ,"byt-rt5640" ,"intel/fw_sst_0f28.bin-48kHz_i2s_master" ,NULL ,NULL ,NULL }, {"193C9890" ,"byt-max98090" ,"intel/fw_sst_0f28.bin-48kHz_i2s_master" ,NULL ,NULL ,NULL }, {}
sound/soc/intel/skylake/skl.c +20 -20
@@ -28,7 +28,7 @@#include <linux/firmware.h> #include <linux/delay.h> #include <sound/pcm.h> -#include "../common/sst-acpi.h" +#include <sound/soc-acpi.h> #include <sound/hda_register.h> #include <sound/hdaudio.h> #include <sound/hda_i915.h>
@@ -439,10 +439,10 @@ static int skl_machine_device_register(struct skl *skl, void *driver_data) {struct hdac_bus *bus =ebus_to_hbus (&skl->ebus);struct platform_device *pdev; -struct sst_acpi_mach *mach = driver_data; +struct snd_soc_acpi_mach *mach = driver_data;int ret; - mach =sst_acpi_find_machine (mach); + mach =snd_soc_acpi_find_machine (mach);if (mach ==NULL ) {dev_err (bus->dev,"No matching machine driver found\n" );return -ENODEV ;
@@ -875,33 +875,33 @@ static void skl_remove(struct pci_dev *pci)dev_set_drvdata (&pci->dev,NULL ); } -static struct sst_codecs skl_codecs = { +static struct snd_soc_acpi_codecs skl_codecs = { .num_codecs =1 , .codecs = {"10508825" } }; -static struct sst_codecs kbl_codecs = { +static struct snd_soc_acpi_codecs kbl_codecs = { .num_codecs =1 , .codecs = {"10508825" } }; -static struct sst_codecs bxt_codecs = { +static struct snd_soc_acpi_codecs bxt_codecs = { .num_codecs =1 , .codecs = {"MX98357A" } }; -static struct sst_codecs kbl_poppy_codecs = { +static struct snd_soc_acpi_codecs kbl_poppy_codecs = { .num_codecs =1 , .codecs = {"10EC5663" } }; -static struct sst_codecs kbl_5663_5514_codecs = { +static struct snd_soc_acpi_codecs kbl_5663_5514_codecs = { .num_codecs =2 , .codecs = {"10EC5663" ,"10EC5514" } }; -static struct sst_acpi_mach sst_skl_devdata[] = { +static struct snd_soc_acpi_mach sst_skl_devdata[] = { { .id ="INT343A" , .drv_name ="skl_alc286s_i2s" ,
@@ -911,7 +911,7 @@ static struct sst_acpi_mach sst_skl_devdata[] = { .id = "INT343B", .drv_name = "skl_n88l25_s4567", .fw_filename = "intel/dsp_fw_release.bin", - .machine_quirk = sst_acpi_codec_list, + .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &skl_codecs, .pdata = &skl_dmic_data },
@@ -919,14 +919,14 @@ static struct sst_acpi_mach sst_skl_devdata[] = { .id = "MX98357A", .drv_name = "skl_n88l25_m98357a", .fw_filename = "intel/dsp_fw_release.bin", - .machine_quirk = sst_acpi_codec_list, + .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &skl_codecs, .pdata = &skl_dmic_data }, {} }; -static struct sst_acpi_mach sst_bxtp_devdata[] = { +static struct snd_soc_acpi_mach sst_bxtp_devdata[] = { { .id ="INT343A" , .drv_name ="bxt_alc298s_i2s" ,
@@ -936,13 +936,13 @@ static struct sst_acpi_mach sst_bxtp_devdata[] = { .id = "DLGS7219", .drv_name = "bxt_da7219_max98357a_i2s", .fw_filename = "intel/dsp_fw_bxtn.bin", - .machine_quirk = sst_acpi_codec_list, + .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &bxt_codecs, }, {} }; -static struct sst_acpi_mach sst_kbl_devdata[] = { +static struct snd_soc_acpi_mach sst_kbl_devdata[] = { { .id ="INT343A" , .drv_name ="kbl_alc286s_i2s" ,
@@ -952,7 +952,7 @@ static struct sst_acpi_mach sst_kbl_devdata[] = { .id = "INT343B", .drv_name = "kbl_n88l25_s4567", .fw_filename = "intel/dsp_fw_kbl.bin", - .machine_quirk = sst_acpi_codec_list, + .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &kbl_codecs, .pdata = &skl_dmic_data },
@@ -960,7 +960,7 @@ static struct sst_acpi_mach sst_kbl_devdata[] = { .id = "MX98357A", .drv_name = "kbl_n88l25_m98357a", .fw_filename = "intel/dsp_fw_kbl.bin", - .machine_quirk = sst_acpi_codec_list, + .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &kbl_codecs, .pdata = &skl_dmic_data },
@@ -968,7 +968,7 @@ static struct sst_acpi_mach sst_kbl_devdata[] = { .id = "MX98927", .drv_name = "kbl_r5514_5663_max", .fw_filename = "intel/dsp_fw_kbl.bin", - .machine_quirk = sst_acpi_codec_list, + .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &kbl_5663_5514_codecs, .pdata = &skl_dmic_data },
@@ -976,7 +976,7 @@ static struct sst_acpi_mach sst_kbl_devdata[] = { .id = "MX98927", .drv_name = "kbl_rt5663_m98927", .fw_filename = "intel/dsp_fw_kbl.bin", - .machine_quirk = sst_acpi_codec_list, + .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &kbl_poppy_codecs, .pdata = &skl_dmic_data },
@@ -989,7 +989,7 @@ static struct sst_acpi_mach sst_kbl_devdata[] = { {} }; -static struct sst_acpi_mach sst_glk_devdata[] = { +static struct snd_soc_acpi_mach sst_glk_devdata[] = { { .id ="INT343A" , .drv_name ="glk_alc298s_i2s" ,
@@ -998,7 +998,7 @@ static struct sst_acpi_mach sst_glk_devdata[] = { {} }; -static const struct sst_acpi_mach sst_cnl_devdata[] = { +static const struct snd_soc_acpi_mach sst_cnl_devdata[] = { { .id ="INT34C2" , .drv_name ="cnl_rt274" ,
sound/soc/soc-acpi.c renamed from sound/soc/intel/common/sst-match-acpi.c +29 -27
141 lines not on this page · raw message
Signature · 1 line
2.9.3
RFC PATCH 2/8 ASoC: Intel: common: use c99 syntax for ACPI/machine tables
In reply to Pierre-Louis BossartBefore we add new fields for SOF support, move to C99 syntax as done for atom/sst and legacy hsw/bdw code
No functional change
--- sound/soc/intel/common/sst-acpi.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-)
sound/soc/intel/common/sst-acpi.c +25 -5
@@ -180,7 +180,11 @@ static int sst_acpi_remove(struct platform_device *pdev) }static struct snd_soc_acpi_mach haswell_machines[] = { - {"INT33CA" ,"haswell-audio" ,"intel/IntcSST1.bin" ,NULL ,NULL ,NULL }, + { + .id ="INT33CA" , + .drv_name ="haswell-audio" , + .fw_filename ="intel/IntcSST1.bin" , + }, {} };
@@ -198,8 +202,16 @@ static struct sst_acpi_desc sst_acpi_haswell_desc = { };static struct snd_soc_acpi_mach broadwell_machines[] = { - {"INT343A" ,"broadwell-audio" ,"intel/IntcSST2.bin" ,NULL ,NULL ,NULL }, - {"RT5677CE" ,"bdw-rt5677" ,"intel/IntcSST2.bin" ,NULL ,NULL ,NULL }, + { + .id ="INT343A" , + .drv_name ="broadwell-audio" , + .fw_filename ="intel/IntcSST2.bin" , + }, + { + .id ="RT5677CE" , + .drv_name ="bdw-rt5677" , + .fw_filename ="intel/IntcSST2.bin" , + }, {} };
@@ -218,8 +230,16 @@ static struct sst_acpi_desc sst_acpi_broadwell_desc = {#if !IS_ENABLED (CONFIG_SND_SST_IPC_ACPI )static struct snd_soc_acpi_mach baytrail_machines[] = { - {"10EC5640" ,"byt-rt5640" ,"intel/fw_sst_0f28.bin-48kHz_i2s_master" ,NULL ,NULL ,NULL }, - {"193C9890" ,"byt-max98090" ,"intel/fw_sst_0f28.bin-48kHz_i2s_master" ,NULL ,NULL ,NULL }, + { + .id ="10EC5640" , + .drv_name ="byt-rt5640" , + .fw_filename ="intel/fw_sst_0f28.bin-48kHz_i2s_master" , + }, + { + .id ="193C9890" , + .drv_name ="byt-max98090" , + .fw_filename ="intel/fw_sst_0f28.bin-48kHz_i2s_master" , + }, {} };
Signature · 1 line
2.9.3
Mark Brown
maintainerApplied "ASoC: Intel: common: use c99 syntax for ACPI/machine tables" to the asoc tree
The patch
ASoC: Intel: common: use c99 syntax for ACPI/machine tables
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
928c8a8f1188dd59065e22bcedae57cb6156d836Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Thu, 12 Oct 2017 18:49:39 -0500
Subject: [PATCH] ASoC: Intel: common: use c99 syntax for ACPI/machine tables
Before we add new fields for SOF support, move to C99 syntax as done for atom/sst and legacy hsw/bdw code
No functional change
--- sound/soc/intel/common/sst-acpi.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-)
sound/soc/intel/common/sst-acpi.c +25 -5
@@ -180,7 +180,11 @@ static int sst_acpi_remove(struct platform_device *pdev) }static struct snd_soc_acpi_mach haswell_machines[] = { - {"INT33CA" ,"haswell-audio" ,"intel/IntcSST1.bin" ,NULL ,NULL ,NULL }, + { + .id ="INT33CA" , + .drv_name ="haswell-audio" , + .fw_filename ="intel/IntcSST1.bin" , + }, {} };
@@ -198,8 +202,16 @@ static struct sst_acpi_desc sst_acpi_haswell_desc = { };static struct snd_soc_acpi_mach broadwell_machines[] = { - {"INT343A" ,"broadwell-audio" ,"intel/IntcSST2.bin" ,NULL ,NULL ,NULL }, - {"RT5677CE" ,"bdw-rt5677" ,"intel/IntcSST2.bin" ,NULL ,NULL ,NULL }, + { + .id ="INT343A" , + .drv_name ="broadwell-audio" , + .fw_filename ="intel/IntcSST2.bin" , + }, + { + .id ="RT5677CE" , + .drv_name ="bdw-rt5677" , + .fw_filename ="intel/IntcSST2.bin" , + }, {} };
@@ -218,8 +230,16 @@ static struct sst_acpi_desc sst_acpi_broadwell_desc = {#if !IS_ENABLED (CONFIG_SND_SST_IPC_ACPI )static struct snd_soc_acpi_mach baytrail_machines[] = { - {"10EC5640" ,"byt-rt5640" ,"intel/fw_sst_0f28.bin-48kHz_i2s_master" ,NULL ,NULL ,NULL }, - {"193C9890" ,"byt-max98090" ,"intel/fw_sst_0f28.bin-48kHz_i2s_master" ,NULL ,NULL ,NULL }, + { + .id ="10EC5640" , + .drv_name ="byt-rt5640" , + .fw_filename ="intel/fw_sst_0f28.bin-48kHz_i2s_master" , + }, + { + .id ="193C9890" , + .drv_name ="byt-max98090" , + .fw_filename ="intel/fw_sst_0f28.bin-48kHz_i2s_master" , + }, {} };
Signature · 1 line
2.14.1
RFC PATCH 3/8 ASoC: ACPI: add new fields for SOF support
In reply to Pierre-Louis BossartTo prepare for SOF integration, we need new fields in the machine table. It is intended that the same table is used for both closed-source and open-source firmware to avoid repeating ACPI-related information multiple times
No functional change
--- include/sound/soc-acpi.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
include/sound/soc-acpi.h +18 -1
@@ -60,12 +60,29 @@ struct snd_soc_acpi_mach {const char *drv_name;/* firmware file name */ const char *fw_filename; -/* board name */ const char *board;struct snd_soc_acpi_mach * (*machine_quirk)(void *arg);const void *quirk_data; + +/* intended for platform data or machine specific-ops */ void *pdata; + +/* SOF firmware file name */ +const char *sof_fw_filename; +/* SOF default topology */ +const char *sof_tplg_filename; + +/* ASoC platform name - used for binding machine drivers if non NULL */ +const char *asoc_plat_name; + +/* machine driver private data fixup */ +struct platform_device * (*new_mach_data)(void *pdata); + +/* FIXME: is this needed, was only used for BYTCR-detection +int (*confirm_mach)(struct device *dev, +const struct sof_dev_desc **desc); +*/ };#define SND_SOC_ACPI_MAX_CODECS 3
Signature · 1 line
2.9.3
Re: [RFC PATCH 3/8] ASoC: ACPI: add new fields for SOF support
Quoted 28 lines · Pierre-Louis Bossart
To prepare for SOF integration, we need new fields in the machine table. It is intended that the same table is used for both closed-source and open-source firmware to avoid repeating ACPI-related information multiple times
No functional changeSigned-off-by Pierre-Louis Bossart <[email protected]>--- include/sound/soc-acpi.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)include/sound/soc-acpi.h +3
-1@@ -60,12 +60,29 @@ struct snd_soc_acpi_mach {const char *drv_name;/* firmware file name */ const char *fw_filename; -/* board name */ const char *board;struct snd_soc_acpi_mach * (*machine_quirk)(void *arg);const void *quirk_data; + +/* intended for platform data or machine specific-ops */ void *pdata; +
include/sound/soc-acpi.h struct snd_soc_acpi_mach { · line 80
Quoted 10 lines
include/sound/soc-acpi.h +10
-0+/* SOF firmware file name */ +const char *sof_fw_filename; +/* SOF default topology */ +const char *sof_tplg_filename; + +/* ASoC platform name - used for binding machine drivers if non NULL */ +const char *asoc_plat_name; + +/* machine driver private data fixup */ +struct platform_device * (*new_mach_data)(void *pdata);
good comments, can we move them to kernel-doc style please
include/sound/soc-acpi.h struct snd_soc_acpi_mach { · line 85
Quoted 5 lines
include/sound/soc-acpi.h +5
-0+ +/* FIXME: is this needed, was only used for BYTCR-detection +int (*confirm_mach)(struct device *dev, +const struct sof_dev_desc **desc); +*/
this is dummy, lets remove it and add when required
Signature · 1 line
~Vinod
Re: [RFC PATCH 3/8] ASoC: ACPI: add new fields for SOF support
Quoted 33 lines · Vinod Koul
Quoted 32 lines · Pierre-Louis Bossart
To prepare for SOF integration, we need new fields in the machine table. It is intended that the same table is used for both closed-source and open-source firmware to avoid repeating ACPI-related information multiple times
No functional changeSigned-off-by Pierre-Louis Bossart <[email protected]>--- include/sound/soc-acpi.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)include/sound/soc-acpi.h +7
-1@@ -60,12 +60,29 @@ struct snd_soc_acpi_mach {const char *drv_name;/* firmware file name */ const char *fw_filename; -/* board name */ const char *board;struct snd_soc_acpi_mach * (*machine_quirk)(void *arg);const void *quirk_data; + +/* intended for platform data or machine specific-ops */ void *pdata; + +/* SOF firmware file name */ +const char *sof_fw_filename; +/* SOF default topology */ +const char *sof_tplg_filename;
Quoted 8 lines
include/sound/soc-acpi.h struct snd_soc_acpi_mach { · line 80
Quoted 6 lines
include/sound/soc-acpi.h +6
-0+ +/* ASoC platform name - used for binding machine drivers if non NULL */ +const char *asoc_plat_name; + +/* machine driver private data fixup */ +struct platform_device * (*new_mach_data)(void *pdata);good comments, can we move them to kernel-doc style please
ok
Quoted 7 lines
include/sound/soc-acpi.h struct snd_soc_acpi_mach { · line 85
Quoted 5 lines
include/sound/soc-acpi.h +5
-0+ +/* FIXME: is this needed, was only used for BYTCR-detection +int (*confirm_mach)(struct device *dev, +const struct sof_dev_desc **desc); +*/ this is dummy, lets remove it and add when required
ok
RFC PATCH 4/8 ASoC: Intel: move all ACPI match tables to common module
In reply to Pierre-Louis BossartFirst step of cleaning, move all tables to soc-acpi-intel-match module
--- include/sound/soc-acpi-intel-match.h | 32 +++ sound/soc/intel/Kconfig | 24 +- sound/soc/intel/Makefile | 2 +- sound/soc/intel/atom/sst/sst_acpi.c | 311 ++----------------------- sound/soc/intel/common/Makefile | 2 + sound/soc/intel/common/soc-acpi-intel-match.c | 323 ++++++++++++++++++++++++++ sound/soc/intel/common/sst-acpi.c | 44 +--- 7 files changed, 395 insertions(+), 343 deletions(-) create mode 100644 include/sound/soc-acpi-intel-match.h create mode 100644 sound/soc/intel/common/soc-acpi-intel-match.c
include/sound/soc-acpi-intel-match.h new file +32 -0
@@ -0,0 +1,32 @@ + +/* +* Copyright (C) 2017, Intel Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version +* 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ + +#ifndef __LINUX_SND_SOC_ACPI_INTEL_MATCH_H +#define __LINUX_SND_SOC_ACPI_INTEL_MATCH_H + +#include <linux/stddef.h> +#include <linux/acpi.h> + +/* +* these tables are not constants, some fields can be used for +* pdata or machine ops +*/ +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_haswell_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_legacy_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[]; + +#endif
sound/soc/intel/Kconfig +14 -10
@@ -27,10 +27,14 @@ config SND_SST_IPC_ACPI select SND_SOC_INTEL_SST select IOSF_MBI +config SND_SOC_INTEL_COMMON + tristate + config SND_SOC_INTEL_SST tristate + select SND_SOC_INTEL_COMMON select SND_SOC_INTEL_SST_ACPI if ACPI - select SND_SOC_INTEL_SST_MATCH if ACPI + select SND_SOC_ACPI_INTEL_MATCH if ACPI config SND_SOC_INTEL_SST_FIRMWARE tristate
@@ -39,7 +43,7 @@ config SND_SOC_INTEL_SST_FIRMWARE config SND_SOC_INTEL_SST_ACPI tristate -config SND_SOC_INTEL_SST_MATCH +config SND_SOC_ACPI_INTEL_MATCH tristate select SND_SOC_ACPI if ACPI
@@ -145,7 +149,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH select SND_SOC_RT5640 select SND_SST_ATOM_HIFI2_PLATFORM select SND_SST_IPC_ACPI - select SND_SOC_INTEL_SST_MATCH if ACPI + select SND_SOC_ACPI_INTEL_MATCH if ACPI help This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR platforms with RT5640 audio codec.
@@ -158,7 +162,7 @@ config SND_SOC_INTEL_BYTCR_RT5651_MACH select SND_SOC_RT5651 select SND_SST_ATOM_HIFI2_PLATFORM select SND_SST_IPC_ACPI - select SND_SOC_INTEL_SST_MATCH if ACPI + select SND_SOC_ACPI_INTEL_MATCH if ACPI help This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR platforms with RT5651 audio codec.
@@ -171,7 +175,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH select SND_SOC_RT5670 select SND_SST_ATOM_HIFI2_PLATFORM select SND_SST_IPC_ACPI - select SND_SOC_INTEL_SST_MATCH if ACPI + select SND_SOC_ACPI_INTEL_MATCH if ACPI help This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell platforms with RT5672 audio codec.
@@ -184,7 +188,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5645_MACH select SND_SOC_RT5645 select SND_SST_ATOM_HIFI2_PLATFORM select SND_SST_IPC_ACPI - select SND_SOC_INTEL_SST_MATCH if ACPI + select SND_SOC_ACPI_INTEL_MATCH if ACPI help This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell platforms with RT5645/5650 audio codec.
@@ -197,7 +201,7 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH select SND_SOC_TS3A227E select SND_SST_ATOM_HIFI2_PLATFORM select SND_SST_IPC_ACPI - select SND_SOC_INTEL_SST_MATCH if ACPI + select SND_SOC_ACPI_INTEL_MATCH if ACPI help This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell platforms with MAX98090 audio codec it also can support TI jack chip as aux device.
@@ -209,7 +213,7 @@ config SND_SOC_INTEL_BYT_CHT_DA7213_MACH select SND_SOC_DA7213 select SND_SST_ATOM_HIFI2_PLATFORM select SND_SST_IPC_ACPI - select SND_SOC_INTEL_SST_MATCH if ACPI + select SND_SOC_ACPI_INTEL_MATCH if ACPI help This adds support for ASoC machine driver for Intel(R) Baytrail & CherryTrail platforms with DA7212/7213 audio codec.
@@ -221,7 +225,7 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH select SND_SOC_ES8316 select SND_SST_ATOM_HIFI2_PLATFORM select SND_SST_IPC_ACPI - select SND_SOC_INTEL_SST_MATCH if ACPI + select SND_SOC_ACPI_INTEL_MATCH if ACPI help This adds support for ASoC machine driver for Intel(R) Baytrail & Cherrytrail platforms with ES8316 audio codec.
@@ -232,7 +236,7 @@ config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH depends on X86_INTEL_LPSS && I2C && ACPI select SND_SST_ATOM_HIFI2_PLATFORM select SND_SST_IPC_ACPI - select SND_SOC_INTEL_SST_MATCH if ACPI + select SND_SOC_ACPI_INTEL_MATCH if ACPI help This adds support for ASoC machine driver for the MinnowBoard Max or Up boards and provides access to I2S signals on the Low-Speed
sound/soc/intel/Makefile +1 -1
@@ -1,5 +1,5 @@ # Core support -obj-$(CONFIG_SND_SOC_INTEL_SST) += common/ +obj-$(CONFIG_SND_SOC_INTEL_COMMON) += common/ # Platform Support obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/
sound/soc/intel/atom/sst/sst_acpi.c +19 -292
344 lines not on this page · raw message
sound/soc/intel/common/Makefile +2 -0
@@ -2,7 +2,9 @@ snd-soc-sst-dsp-objs := sst-dsp.o snd-soc-sst-acpi-objs := sst-acpi.o snd-soc-sst-ipc-objs := sst-ipc.o snd-soc-sst-firmware-objs := sst-firmware.o +snd-soc-acpi-intel-match-objs := soc-acpi-intel-match.o obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o snd-soc-sst-ipc.o obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o obj-$(CONFIG_SND_SOC_INTEL_SST_FIRMWARE) += snd-soc-sst-firmware.o +obj-$(CONFIG_SND_SOC_ACPI_INTEL_MATCH) += snd-soc-acpi-intel-match.o
sound/soc/intel/common/soc-acpi-intel-match.c new file +323 -0
323 lines not on this page · raw message
sound/soc/intel/common/sst-acpi.c +4 -40
74 lines not on this page · raw message
Signature · 1 line
2.9.3
Re: [RFC PATCH 4/8] ASoC: Intel: move all ACPI match tables to common module
Quoted 28 lines · Pierre-Louis Bossart
First step of cleaning, move all tables to soc-acpi-intel-match module
Signed-off-by Pierre-Louis Bossart <[email protected]>--- include/sound/soc-acpi-intel-match.h | 32 +++ sound/soc/intel/Kconfig | 24 +- sound/soc/intel/Makefile | 2 +- sound/soc/intel/atom/sst/sst_acpi.c | 311 ++----------------------- sound/soc/intel/common/Makefile | 2 + sound/soc/intel/common/soc-acpi-intel-match.c | 323 ++++++++++++++++++++++++++ sound/soc/intel/common/sst-acpi.c | 44 +--- 7 files changed, 395 insertions(+), 343 deletions(-) create mode 100644 include/sound/soc-acpi-intel-match.h create mode 100644 sound/soc/intel/common/soc-acpi-intel-match.cinclude/sound/soc-acpi-intel-match.h new file +7
-0@@ -0,0 +1,32 @@ + +/* +* Copyright (C) 2017, Intel Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version +* 2 as published by the Free Software Foundation.
include/sound/soc-acpi-intel-match.h line 17
Quoted 10 lines
include/sound/soc-acpi-intel-match.h new file +10
-0+* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ + +#ifndef __LINUX_SND_SOC_ACPI_INTEL_MATCH_H +#define __LINUX_SND_SOC_ACPI_INTEL_MATCH_H
do we need LINUX on this one, it already too long :)
include/sound/soc-acpi-intel-match.h line 30
Quoted 13 lines
include/sound/soc-acpi-intel-match.h new file +13
-0+ +#include <linux/stddef.h> +#include <linux/acpi.h> + +/* +* these tables are not constants, some fields can be used for +* pdata or machine ops +*/ +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_haswell_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_legacy_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[];
so the header is just for externs, not a pretty thing, can we avoid these somehow. Do they need to be in common file, why not keep then in respective byt/hsw file.
Quoted 16 lines
include/sound/soc-acpi-intel-match.h new file +6
-2+config SND_SOC_INTEL_COMMON +tristate + config SND_SOC_INTEL_SST tristate + select SND_SOC_INTEL_COMMON select SND_SOC_INTEL_SST_ACPI if ACPI - select SND_SOC_INTEL_SST_MATCH if ACPI + select SND_SOC_ACPI_INTEL_MATCH if ACPI -config SND_SOC_INTEL_SST_MATCH +config SND_SOC_ACPI_INTEL_MATCH tristate select SND_SOC_ACPI if ACPI
include/sound/soc-acpi-intel-match.h config SND_SOC_INTEL_BYTCR_RT5640_MACH · line 152
Quoted 5 lines
include/sound/soc-acpi-intel-match.h new file +1
-1@@ -145,7 +149,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH select SND_SOC_RT5640 select SND_SST_ATOM_HIFI2_PLATFORM select SND_SST_IPC_ACPI - select SND_SOC_INTEL_SST_MATCH if ACPI + select SND_SOC_ACPI_INTEL_MATCH if ACPI
why do you need this change, SND_SOC_INTEL_SST selects SND_SOC_ACPI_INTEL_MATCH, so we should select top symbol which is SND_SOC_INTEL_SST
Signature · 1 line
~Vinod
Re: [RFC PATCH 4/8] ASoC: Intel: move all ACPI match tables to common module
Quoted 33 lines · Vinod Koul
Quoted 32 lines · Pierre-Louis Bossart
First step of cleaning, move all tables to soc-acpi-intel-match module
Signed-off-by Pierre-Louis Bossart <[email protected]>--- include/sound/soc-acpi-intel-match.h | 32 +++ sound/soc/intel/Kconfig | 24 +- sound/soc/intel/Makefile | 2 +- sound/soc/intel/atom/sst/sst_acpi.c | 311 ++----------------------- sound/soc/intel/common/Makefile | 2 + sound/soc/intel/common/soc-acpi-intel-match.c | 323 ++++++++++++++++++++++++++ sound/soc/intel/common/sst-acpi.c | 44 +--- 7 files changed, 395 insertions(+), 343 deletions(-)create mode 100644
include/sound/soc-acpi-intel-match.hcreate mode 100644sound/soc/intel/common/soc-acpi-intel-match.cinclude/sound/soc-acpi-intel-match.h new file +11
-0@@ -0,0 +1,32 @@ + +/* +* Copyright (C) 2017, Intel Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version +* 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Quoted 8 lines
include/sound/soc-acpi-intel-match.h line 17
Quoted 6 lines
include/sound/soc-acpi-intel-match.h new file +6
-0+* GNU General Public License for more details. +* +*/ + +#ifndef __LINUX_SND_SOC_ACPI_INTEL_MATCH_H +#define __LINUX_SND_SOC_ACPI_INTEL_MATCH_Hdo we need LINUX on this one, it already too long :)
I checked and all include/sound/soc* files have this LINUX_SND_SOC prefix. I don't mind removing it but then someone will object it's not consistent.
Quoted 10 lines
Quoted 10 lines
include/sound/soc-acpi-intel-match.h new file +9
-0+ +#include <linux/stddef.h> +#include <linux/acpi.h> + +/* +* these tables are not constants, some fields can be used for +* pdata or machine ops +*/ +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_haswell_machines[];
Quoted 8 lines
include/sound/soc-acpi-intel-match.h line 30
Quoted 4 lines
include/sound/soc-acpi-intel-match.h new file +4
-0+extern struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_legacy_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[];so the header is just for externs, not a pretty thing, can we avoid these somehow. Do they need to be in common file, why not keep then in respective byt/hsw file.
Because they will be shared between drivers, that's the whole point.
I can't put a common table in either of sound/soc/sof or sound/soc/intel/atom. I didn't find a better solution than a module with just tables + matching functions in it.
Quoted 17 lines
Quoted 17 lines
include/sound/soc-acpi-intel-match.h new file +6
-2+config SND_SOC_INTEL_COMMON +tristate + config SND_SOC_INTEL_SST tristate + select SND_SOC_INTEL_COMMON select SND_SOC_INTEL_SST_ACPI if ACPI - select SND_SOC_INTEL_SST_MATCH if ACPI + select SND_SOC_ACPI_INTEL_MATCH if ACPI -config SND_SOC_INTEL_SST_MATCH +config SND_SOC_ACPI_INTEL_MATCH tristate select SND_SOC_ACPI if ACPI
Quoted 10 lines
include/sound/soc-acpi-intel-match.h config SND_SOC_INTEL_BYTCR_RT5640_MACH · line 152
Quoted 6 lines
include/sound/soc-acpi-intel-match.h new file +1
-1@@ -145,7 +149,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH select SND_SOC_RT5640 select SND_SST_ATOM_HIFI2_PLATFORM select SND_SST_IPC_ACPI - select SND_SOC_INTEL_SST_MATCH if ACPI + select SND_SOC_ACPI_INTEL_MATCH if ACPIwhy do you need this change,
SND_SOC_INTEL_SSTselectsSND_SOC_ACPI_INTEL_MATCH, so we should select top symbol which isSND_SOC_INTEL_SST
The idea is also to share machine drivers between SOF and closed-source based platform drivers, so if we keep the semantic of INTEL_SST as is then it needs to go away from the machine parts.
Re: [RFC PATCH 4/8] ASoC: Intel: move all ACPI match tables to common module
Quoted 43 lines · Pierre-Louis Bossart
Quoted 33 lines · Vinod Koul
Quoted 32 lines · Pierre-Louis Bossart
First step of cleaning, move all tables to soc-acpi-intel-match module
Signed-off-by Pierre-Louis Bossart <[email protected]>--- include/sound/soc-acpi-intel-match.h | 32 +++ sound/soc/intel/Kconfig | 24 +- sound/soc/intel/Makefile | 2 +- sound/soc/intel/atom/sst/sst_acpi.c | 311 ++----------------------- sound/soc/intel/common/Makefile | 2 + sound/soc/intel/common/soc-acpi-intel-match.c | 323 ++++++++++++++++++++++++++ sound/soc/intel/common/sst-acpi.c | 44 +--- 7 files changed, 395 insertions(+), 343 deletions(-) create mode 100644 include/sound/soc-acpi-intel-match.h create mode 100644 sound/soc/intel/common/soc-acpi-intel-match.cinclude/sound/soc-acpi-intel-match.h new file +11
-0@@ -0,0 +1,32 @@ + +/* +* Copyright (C) 2017, Intel Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version +* 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Quoted 8 lines
include/sound/soc-acpi-intel-match.h line 17
Quoted 6 lines
include/sound/soc-acpi-intel-match.h new file +6
-0+* GNU General Public License for more details. +* +*/ + +#ifndef __LINUX_SND_SOC_ACPI_INTEL_MATCH_H +#define __LINUX_SND_SOC_ACPI_INTEL_MATCH_Hdo we need LINUX on this one, it already too long :)
Quoted 2 lines
I checked and all
include/sound/soc*files have thisLINUX_SND_SOCprefix. I don't mind removing it but then someone will object it's not consistent.
I didnt realize we had that in soc files :)
$ grep __LINUX include/sound/* |wc -l 56 $ grep -L __LINUX include/sound/* |wc -l 118
Take your pick :D
Quoted 20 lines
Quoted 11 lines
Quoted 11 lines
include/sound/soc-acpi-intel-match.h new file +9
-0+ +#include <linux/stddef.h> +#include <linux/acpi.h> + +/* +* these tables are not constants, some fields can be used for +* pdata or machine ops +*/ +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_haswell_machines[];Quoted 8 lines
include/sound/soc-acpi-intel-match.h line 30
Quoted 4 lines
include/sound/soc-acpi-intel-match.h new file +4
-0+extern struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_legacy_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[];so the header is just for externs, not a pretty thing, can we avoid these somehow. Do they need to be in common file, why not keep then in respective byt/hsw file.
Quoted 4 lines
Because they will be shared between drivers, that's the whole point. I can't put a common table in either of
sound/soc/soforsound/soc/intel/atom. I didn't find a better solution than a module with just tables + matching functions in it.
yes but shared between byt family or hsw family, maybe a common byt-tables.c hsw-tables.c and we can move skl ones out to skl-tables.c
Quoted 27 lines
Quoted 18 lines
Quoted 18 lines
include/sound/soc-acpi-intel-match.h new file +6
-2+config SND_SOC_INTEL_COMMON +tristate + config SND_SOC_INTEL_SST tristate + select SND_SOC_INTEL_COMMON select SND_SOC_INTEL_SST_ACPI if ACPI - select SND_SOC_INTEL_SST_MATCH if ACPI + select SND_SOC_ACPI_INTEL_MATCH if ACPI -config SND_SOC_INTEL_SST_MATCH +config SND_SOC_ACPI_INTEL_MATCH tristate select SND_SOC_ACPI if ACPI@@ -145,7 +149,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACHselect SND_SOC_RT5640 Quoted 8 lines
include/sound/soc-acpi-intel-match.h config SND_SOC_INTEL_BYTCR_RT5640_MACH · line 152
Quoted 4 lines
include/sound/soc-acpi-intel-match.h new file +1
-1select SND_SST_ATOM_HIFI2_PLATFORM select SND_SST_IPC_ACPI - select SND_SOC_INTEL_SST_MATCH if ACPI + select SND_SOC_ACPI_INTEL_MATCH if ACPIwhy do you need this change,
SND_SOC_INTEL_SSTselectsSND_SOC_ACPI_INTEL_MATCH, so we should select top symbol which isSND_SOC_INTEL_SST
Quoted 3 lines
The idea is also to share machine drivers between SOF and closed-source based platform drivers, so if we keep the semantic of
INTEL_SSTas is then it needs to go away from the machine parts.
ok
Signature · 1 line
~Vinod
Re: [RFC PATCH 4/8] ASoC: Intel: move all ACPI match tables to common module
Quoted 76 lines · Vinod Koul
Quoted 43 lines · Pierre-Louis Bossart
Quoted 33 lines · Vinod Koul
Quoted 32 lines · Pierre-Louis Bossart
First step of cleaning, move all tables to soc-acpi-intel-match module
Signed-off-by Pierre-Louis Bossart <[email protected]>--- include/sound/soc-acpi-intel-match.h | 32 +++ sound/soc/intel/Kconfig | 24 +- sound/soc/intel/Makefile | 2 +- sound/soc/intel/atom/sst/sst_acpi.c | 311 ++----------------------- sound/soc/intel/common/Makefile | 2 + sound/soc/intel/common/soc-acpi-intel-match.c | 323 ++++++++++++++++++++++++++ sound/soc/intel/common/sst-acpi.c | 44 +--- 7 files changed, 395 insertions(+), 343 deletions(-)create mode 100644
include/sound/soc-acpi-intel-match.hcreate mode 100644sound/soc/intel/common/soc-acpi-intel-match.cinclude/sound/soc-acpi-intel-match.h new file +11
-0@@ -0,0 +1,32 @@ + +/* +* Copyright (C) 2017, Intel Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version +* 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Quoted 8 lines
include/sound/soc-acpi-intel-match.h line 17
Quoted 6 lines
include/sound/soc-acpi-intel-match.h new file +6
-0+* GNU General Public License for more details. +* +*/ + +#ifndef __LINUX_SND_SOC_ACPI_INTEL_MATCH_H +#define __LINUX_SND_SOC_ACPI_INTEL_MATCH_Hdo we need LINUX on this one, it already too long :)
Quoted 2 lines
I checked and all
include/sound/soc*files have thisLINUX_SND_SOCprefix. I don't mind removing it but then someone will object it's not consistent.I didnt realize we had that in soc files :)
$ grep __LINUX include/sound/* |wc -l 56 $ grep -L __LINUX include/sound/* |wc -l 118Take your pick :D
Quoted 20 lines
Quoted 19 lines
Quoted 5 lines
include/sound/soc-acpi-intel-match.h new file +3
-0+ +#include <linux/stddef.h> +#include <linux/acpi.h> include/sound/soc-acpi-intel-match.h line 30
Quoted 10 lines
include/sound/soc-acpi-intel-match.h new file +10
-0+ +/* +* these tables are not constants, some fields can be used for +* pdata or machine ops +*/ +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_haswell_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_legacy_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[];so the header is just for externs, not a pretty thing, can we avoid these somehow. Do they need to be in common file, why not keep then in respective byt/hsw file.
Quoted 7 lines
Quoted 4 lines
Because they will be shared between drivers, that's the whole point. I can't put a common table in either of
sound/soc/soforsound/soc/intel/atom. I didn't find a better solution than a module with just tables + matching functions in it.yes but shared between byt family or hsw family, maybe a common
byt-tables.chsw-tables.cand we can move skl ones out toskl-tables.c
oh, if you are talking about splitting the tables in different files yes this is no issue. I thought you objected to the declaration of the tables themselves.
Quoted 34 lines
Quoted 28 lines
Quoted 19 lines
Quoted 19 lines
include/sound/soc-acpi-intel-match.h new file +6
-2+config SND_SOC_INTEL_COMMON +tristate + config SND_SOC_INTEL_SST tristate + select SND_SOC_INTEL_COMMON select SND_SOC_INTEL_SST_ACPI if ACPI - select SND_SOC_INTEL_SST_MATCH if ACPI + select SND_SOC_ACPI_INTEL_MATCH if ACPI -config SND_SOC_INTEL_SST_MATCH +config SND_SOC_ACPI_INTEL_MATCH tristate select SND_SOC_ACPI if ACPI@@ -145,7 +149,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACHselect SND_SOC_RT5640 Quoted 8 lines
include/sound/soc-acpi-intel-match.h config SND_SOC_INTEL_BYTCR_RT5640_MACH · line 152
Quoted 4 lines
include/sound/soc-acpi-intel-match.h new file +1
-1select SND_SST_ATOM_HIFI2_PLATFORM select SND_SST_IPC_ACPI - select SND_SOC_INTEL_SST_MATCH if ACPI + select SND_SOC_ACPI_INTEL_MATCH if ACPIwhy do you need this change,
SND_SOC_INTEL_SSTselectsSND_SOC_ACPI_INTEL_MATCH, so we should select top symbol which isSND_SOC_INTEL_SSTQuoted 3 lines
The idea is also to share machine drivers between SOF and closed-source based platform drivers, so if we keep the semantic of
INTEL_SSTas is then it needs to go away from the machine parts.ok
Re: [RFC PATCH 4/8] ASoC: Intel: move all ACPI match tables to common module
Quoted 20 lines · Pierre-Louis Bossart
Quoted 19 lines · Vinod Koul
Quoted 17 lines · Pierre-Louis Bossart
Quoted 11 lines · Vinod Koul
include/sound/soc-acpi-intel-match.h line 30
Quoted 5 lines · Pierre-Louis Bossart
include/sound/soc-acpi-intel-match.h new file +5
-0+extern struct snd_soc_acpi_mach snd_soc_acpi_intel_haswell_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_legacy_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[];so the header is just for externs, not a pretty thing, can we avoid these somehow. Do they need to be in common file, why not keep then in respective byt/hsw file.
Because they will be shared between drivers, that's the whole point. I can't put a common table in either of
sound/soc/soforsound/soc/intel/atom. I didn't find a better solution than a module with just tables + matching functions in it.
Quoted 6 lines
Quoted 2 lines
yes but shared between byt family or hsw family, maybe a common
byt-tables.chsw-tables.cand we can move skl ones out toskl-tables.coh, if you are talking about splitting the tables in different files yes this is no issue. I thought you objected to the declaration of the tables themselves.
Yes. I would like to avoid an endless file for externs. Let the respective platform build those into that driver
Signature · 1 line
~Vinod
Re: [RFC PATCH 4/8] ASoC: Intel: move all ACPI match tables to common module
Quoted 24 lines · Vinod Koul
Quoted 23 lines · Pierre-Louis Bossart
Quoted 21 lines · Vinod Koul
Quoted 13 lines · Pierre-Louis Bossart
Quoted 11 lines · Vinod Koul
include/sound/soc-acpi-intel-match.h line 30
Quoted 5 lines · Pierre-Louis Bossart
include/sound/soc-acpi-intel-match.h new file +5
-0+extern struct snd_soc_acpi_mach snd_soc_acpi_intel_haswell_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_legacy_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[];so the header is just for externs, not a pretty thing, can we avoid these somehow. Do they need to be in common file, why not keep then in respective byt/hsw file.
Quoted 4 lines
Because they will be shared between drivers, that's the whole point. I can't put a common table in either of
sound/soc/soforsound/soc/intel/atom. I didn't find a better solution than a module with just tables + matching functions in it.yes but shared between byt family or hsw family, maybe a common
byt-tables.chsw-tables.cand we can move skl ones out toskl-tables.c
Quoted 6 lines
Quoted 3 lines
oh, if you are talking about splitting the tables in different files yes this is no issue. I thought you objected to the declaration of the tables themselves.
Yes. I would like to avoid an endless file for externs. Let the respective platform build those into that driver
I don't get what you are suggesting and what an 'endless' file is.
RFC PATCH 5/8 ASoC: Intel: add SOF firmare/topology file information
In reply to Pierre-Louis BossartPrepare for SOF integration, no functional change
--- sound/soc/intel/common/soc-acpi-intel-match.c | 79 ++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-)
sound/soc/intel/common/soc-acpi-intel-match.c +78 -1
@@ -116,6 +116,9 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_haswell_machines[] = { .id = "INT33CA", .drv_name = "haswell-audio", .fw_filename = "intel/IntcSST1.bin", + .sof_fw_filename = "intel/reef-hsw.ri", + .sof_tplg_filename = "intel/reef-hsw.tplg", + .asoc_plat_name = "haswell-pcm-audio", }, {} };
@@ -126,12 +129,24 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[] = { .id = "INT343A", .drv_name = "broadwell-audio", .fw_filename = "intel/IntcSST2.bin", + .sof_fw_filename = "intel/reef-bdw.ri", + .sof_tplg_filename = "intel/reef-bdw-rt286.tplg", + .asoc_plat_name = "haswell-pcm-audio", }, { .id = "RT5677CE", .drv_name = "bdw-rt5677", .fw_filename = "intel/IntcSST2.bin", + .sof_fw_filename = "intel/reef-bdw.ri", + .sof_tplg_filename = "intel/reef-bdw-rt286.tplg", + .asoc_plat_name = "haswell-pcm-audio", }, + +/* FIXME: this was in SOF code but is this right ? +{ "INT33CA", "haswell-audio", "intel/reef-bdw.ri", +"intel/reef-bdw-rt5640.tplg", "haswell-pcm-audio", +&snd_sof_bdw_ops }, +*/ {} };EXPORT_SYMBOL_GPL (snd_soc_acpi_intel_broadwell_machines);
@@ -158,36 +173,54 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[] = { .fw_filename = "intel/fw_sst_0f28.bin", .board = "bytcr_rt5640", .machine_quirk = byt_quirk, + .sof_fw_filename = "intel/reef-byt.ri", + .sof_tplg_filename = "intel/reef-byt-rt5640.tplg", + .asoc_plat_name = "sst-mfld-platform", }, { .id = "10EC5642", .drv_name = "bytcr_rt5640", .fw_filename = "intel/fw_sst_0f28.bin", .board = "bytcr_rt5640", + .sof_fw_filename = "intel/reef-byt.ri", + .sof_tplg_filename = "intel/reef-byt-rt5640.tplg", + .asoc_plat_name = "sst-mfld-platform", }, { .id = "INTCCFFD", .drv_name = "bytcr_rt5640", .fw_filename = "intel/fw_sst_0f28.bin", .board = "bytcr_rt5640", + .sof_fw_filename = "intel/reef-byt.ri", + .sof_tplg_filename = "intel/reef-byt-rt5640.tplg", + .asoc_plat_name = "sst-mfld-platform", }, { .id = "10EC5651", .drv_name = "bytcr_rt5651", .fw_filename = "intel/fw_sst_0f28.bin", .board = "bytcr_rt5651", + .sof_fw_filename = "intel/reef-byt.ri", + .sof_tplg_filename = "intel/reef-byt-rt5651.tplg", + .asoc_plat_name = "sst-mfld-platform", }, { .id = "DLGS7212", .drv_name = "bytcht_da7213", .fw_filename = "intel/fw_sst_0f28.bin", .board = "bytcht_da7213", + .sof_fw_filename = "intel/reef-byt.ri", + .sof_tplg_filename = "intel/reef-byt-da7213.tplg", + .asoc_plat_name = "sst-mfld-platform", }, { .id = "DLGS7213", .drv_name = "bytcht_da7213", .fw_filename = "intel/fw_sst_0f28.bin", .board = "bytcht_da7213", + .sof_fw_filename = "intel/reef-byt.ri", + .sof_tplg_filename = "intel/reef-byt-da7213.tplg", + .asoc_plat_name = "sst-mfld-platform", }, /* some Baytrail platforms rely on RT5645, use CHT machine driver */ {
@@ -195,12 +228,18 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[] = { .drv_name = "cht-bsw-rt5645", .fw_filename = "intel/fw_sst_0f28.bin", .board = "cht-bsw", + .sof_fw_filename = "intel/reef-byt.ri", + .sof_tplg_filename = "intel/reef-byt-rt5645.tplg", + .asoc_plat_name = "sst-mfld-platform", }, { .id = "10EC5648", .drv_name = "cht-bsw-rt5645", .fw_filename = "intel/fw_sst_0f28.bin", .board = "cht-bsw", + .sof_fw_filename = "intel/reef-byt.ri", + .sof_tplg_filename = "intel/reef-byt-rt5645.tplg", + .asoc_plat_name = "sst-mfld-platform", },/* use CHT driver to Baytrail Chromebooks */ {
@@ -208,7 +247,9 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[] = { .drv_name = "cht-bsw-max98090", .fw_filename = "intel/fw_sst_0f28.bin", .board = "cht-bsw", - .pdata = &byt_rvp_platform_data + .sof_fw_filename = "intel/reef-byt.ri", + .sof_tplg_filename = "intel/reef-byt-max98090.tplg", + .asoc_plat_name = "sst-mfld-platform", },#if IS_ENABLED (CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH )/*
@@ -233,54 +274,81 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { .drv_name = "cht-bsw-rt5672", .fw_filename = "intel/fw_sst_22a8.bin", .board = "cht-bsw", + .sof_fw_filename = "intel/reef-cht.ri", + .sof_tplg_filename = "intel/reef-cht-rt5670.tplg", + .asoc_plat_name = "sst-mfld-platform", }, { .id = "10EC5672", .drv_name = "cht-bsw-rt5672", .fw_filename = "intel/fw_sst_22a8.bin", .board = "cht-bsw", + .sof_fw_filename = "intel/reef-cht.ri", + .sof_tplg_filename = "intel/reef-cht-rt5670.tplg", + .asoc_plat_name = "sst-mfld-platform", }, { .id = "10EC5645", .drv_name = "cht-bsw-rt5645", .fw_filename = "intel/fw_sst_22a8.bin", .board = "cht-bsw", + .sof_fw_filename = "intel/reef-cht.ri.ri", + .sof_tplg_filename = "intel/reef-cht-rt5645.tplg", + .asoc_plat_name = "sst-mfld-platform", }, { .id = "10EC5650", .drv_name = "cht-bsw-rt5645", .fw_filename = "intel/fw_sst_22a8.bin", .board = "cht-bsw", + .sof_fw_filename = "intel/reef-cht.ri", + .sof_tplg_filename = "intel/reef-cht-rt5645.tplg", + .asoc_plat_name = "sst-mfld-platform", }, { .id = "10EC3270", .drv_name = "cht-bsw-rt5645", .fw_filename = "intel/fw_sst_22a8.bin", .board = "cht-bsw", + .sof_fw_filename = "intel/reef-cht.ri", + .sof_tplg_filename = "intel/reef-cht-rt5645.tplg", + .asoc_plat_name = "sst-mfld-platform", }, { .id = "193C9890", .drv_name = "cht-bsw-max98090", .fw_filename = "intel/fw_sst_22a8.bin", .board = "cht-bsw", + .sof_fw_filename = "intel/reef-cht.ri", + .sof_tplg_filename = "intel/reef-cht-max98090.tplg", + .asoc_plat_name = "sst-mfld-platform", }, { .id = "DLGS7212", .drv_name = "bytcht_da7213", .fw_filename = "intel/fw_sst_22a8.bin", .board = "bytcht_da7213", + .sof_fw_filename = "intel/reef-cht.ri", + .sof_tplg_filename = "intel/reef-cht-da7213.tplg", + .asoc_plat_name = "sst-mfld-platform", }, { .id = "DLGS7213", .drv_name = "bytcht_da7213", .fw_filename = "intel/fw_sst_22a8.bin", .board = "bytcht_da7213", + .sof_fw_filename = "intel/reef-cht.ri", + .sof_tplg_filename = "intel/reef-cht-da7213.tplg", + .asoc_plat_name = "sst-mfld-platform", }, { .id = "ESSX8316", .drv_name = "bytcht_es8316", .fw_filename = "intel/fw_sst_22a8.bin", .board = "bytcht_es8316", + .sof_fw_filename = "intel/reef-cht.ri", + .sof_tplg_filename = "intel/reef-cht-es8316.tplg", + .asoc_plat_name = "sst-mfld-platform", }, /* some CHT-T platforms rely on RT5640, use Baytrail machine driver */ {
@@ -289,12 +357,18 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { .fw_filename = "intel/fw_sst_22a8.bin", .board = "bytcr_rt5640", .machine_quirk = cht_quirk, + .sof_fw_filename = "intel/reef-cht.ri", + .sof_tplg_filename = "intel/reef-cht-rt5640.tplg", + .asoc_plat_name = "sst-mfld-platform", }, { .id = "10EC3276", .drv_name = "bytcr_rt5640", .fw_filename = "intel/fw_sst_22a8.bin", .board = "bytcr_rt5640", + .sof_fw_filename = "intel/reef-cht.ri", + .sof_tplg_filename = "intel/reef-cht-rt5640.tplg", + .asoc_plat_name = "sst-mfld-platform", },/* some CHT-T platforms rely on RT5651, use Baytrail machine driver */ {
@@ -302,6 +376,9 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { .drv_name = "bytcr_rt5651", .fw_filename = "intel/fw_sst_22a8.bin", .board = "bytcr_rt5651", + .sof_fw_filename = "intel/reef-cht.ri", + .sof_tplg_filename = "intel/reef-cht-rt5651.tplg", + .asoc_plat_name = "sst-mfld-platform", },#if IS_ENABLED (CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH )/*
Signature · 1 line
2.9.3
RFC PATCH 6/8 ASoC: Intel: move machine drivers to dedicated KConfig
In reply to Pierre-Louis Bossartsplit Kconfig to prepare for reuse of machine drivers for SOF support
no functional change or edits
--- sound/soc/intel/Kconfig | 271 +---------------------------------------- sound/soc/intel/boards/Kconfig | 269 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 271 insertions(+), 269 deletions(-) create mode 100644 sound/soc/intel/boards/Kconfig
sound/soc/intel/Kconfig +2 -269
@@ -1,15 +1,3 @@ -config SND_MFLD_MACHINE - tristate "SOC Machine Audio driver for Intel Medfield MID platform" - depends on INTEL_SCU_IPC - select SND_SOC_SN95031 - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_PCI - help - This adds support for ASoC machine driver for Intel(R) MID Medfield platform - used as alsa device in audio substem in Intel(R) MID devices - Say Y if you have such a device. - If unsure select "N". - config SND_SST_ATOM_HIFI2_PLATFORM tristate select SND_SOC_COMPRESS
@@ -57,223 +45,6 @@ config SND_SOC_INTEL_BAYTRAIL select SND_SOC_INTEL_SST select SND_SOC_INTEL_SST_FIRMWARE -config SND_SOC_INTEL_HASWELL_MACH - tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint" - depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM - depends on DMADEVICES - select SND_SOC_INTEL_HASWELL - select SND_SOC_RT5640 - help - This adds support for the Lynxpoint Audio DSP on Intel(R) Haswell - Ultrabook platforms. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH - tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode" - depends on X86 && ACPI && I2C - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_DA7219 - select SND_SOC_MAX98357A - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - select SND_HDA_DSP_LOADER - help - This adds support for ASoC machine driver for Broxton-P platforms - with DA7219 + MAX98357A I2S audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_BXT_RT298_MACH - tristate "ASoC Audio driver for Broxton with RT298 I2S mode" - depends on X86 && ACPI && I2C - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_RT298 - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - select SND_HDA_DSP_LOADER - help - This adds support for ASoC machine driver for Broxton platforms - with RT286 I2S audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_BYT_RT5640_MACH - tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec" - depends on X86_INTEL_LPSS && I2C - depends on DMADEVICES - depends on SND_SST_IPC_ACPI = n - select SND_SOC_INTEL_BAYTRAIL - select SND_SOC_RT5640 - help - This adds audio driver for Intel Baytrail platform based boards - with the RT5640 audio codec. This driver is deprecated, use - SND_SOC_INTEL_BYTCR_RT5640_MACH instead for better functionality. - -config SND_SOC_INTEL_BYT_MAX98090_MACH - tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec" - depends on X86_INTEL_LPSS && I2C - depends on DMADEVICES - depends on SND_SST_IPC_ACPI = n - select SND_SOC_INTEL_BAYTRAIL - select SND_SOC_MAX98090 - help - This adds audio driver for Intel Baytrail platform based boards - with the MAX98090 audio codec. - -config SND_SOC_INTEL_BDW_RT5677_MACH - tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec" - depends on X86_INTEL_LPSS && GPIOLIB && I2C - depends on DMADEVICES - select SND_SOC_INTEL_HASWELL - select SND_SOC_RT5677 - help - This adds support for Intel Broadwell platform based boards with - the RT5677 audio codec. - -config SND_SOC_INTEL_BROADWELL_MACH - tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint" - depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM - depends on DMADEVICES - select SND_SOC_INTEL_HASWELL - select SND_SOC_RT286 - help - This adds support for the Wilcatpoint Audio DSP on Intel(R) Broadwell - Ultrabook platforms. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_BYTCR_RT5640_MACH - tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec" - depends on X86 && I2C && ACPI - select SND_SOC_RT5640 - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI - help - This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR - platforms with RT5640 audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_BYTCR_RT5651_MACH - tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec" - depends on X86 && I2C && ACPI - select SND_SOC_RT5651 - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI - help - This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR - platforms with RT5651 audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_CHT_BSW_RT5672_MACH - tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec" - depends on X86_INTEL_LPSS && I2C && ACPI - select SND_SOC_RT5670 - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI - help - This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell - platforms with RT5672 audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_CHT_BSW_RT5645_MACH - tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec" - depends on X86_INTEL_LPSS && I2C && ACPI - select SND_SOC_RT5645 - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI - help - This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell - platforms with RT5645/5650 audio codec. - If unsure select "N". - -config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH - tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with MAX98090 & TI codec" - depends on X86_INTEL_LPSS && I2C && ACPI - select SND_SOC_MAX98090 - select SND_SOC_TS3A227E - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI - help - This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell - platforms with MAX98090 audio codec it also can support TI jack chip as aux device. - If unsure select "N". - -config SND_SOC_INTEL_BYT_CHT_DA7213_MACH - tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec" - depends on X86_INTEL_LPSS && I2C && ACPI - select SND_SOC_DA7213 - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI - help - This adds support for ASoC machine driver for Intel(R) Baytrail & CherryTrail - platforms with DA7212/7213 audio codec. - If unsure select "N". - -config SND_SOC_INTEL_BYT_CHT_ES8316_MACH - tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with ES8316 codec" - depends on X86_INTEL_LPSS && I2C && ACPI - select SND_SOC_ES8316 - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI - help - This adds support for ASoC machine driver for Intel(R) Baytrail & - Cherrytrail platforms with ES8316 audio codec. - If unsure select "N". - -config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH - tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)" - depends on X86_INTEL_LPSS && I2C && ACPI - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI - help - This adds support for ASoC machine driver for the MinnowBoard Max or - Up boards and provides access to I2S signals on the Low-Speed - connector - If unsure select "N". - -config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH - tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode" - depends on X86_INTEL_LPSS && I2C - select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_RT5663 - select SND_SOC_MAX98927 - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - help - This adds support for ASoC Onboard Codec I2S machine driver. This will - create an alsa sound card for RT5663 + MAX98927. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH - tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode" - depends on X86_INTEL_LPSS && I2C && SPI - select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_RT5663 - select SND_SOC_RT5514 - select SND_SOC_RT5514_SPI - select SND_SOC_MAX98927 - select SND_SOC_HDAC_HDMI - help - This adds support for ASoC Onboard Codec I2S machine driver. This will - create an alsa sound card for RT5663 + RT5514 + MAX98927. - Say Y if you have such a device. - If unsure select "N". - config SND_SOC_INTEL_SKYLAKE tristate select SND_HDA_EXT_CORE
@@ -281,43 +52,5 @@ config SND_SOC_INTEL_SKYLAKE select SND_SOC_TOPOLOGY select SND_SOC_INTEL_SST -config SND_SOC_INTEL_SKL_RT286_MACH - tristate "ASoC Audio driver for SKL with RT286 I2S mode" - depends on X86 && ACPI && I2C - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_RT286 - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - help - This adds support for ASoC machine driver for Skylake platforms - with RT286 I2S audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH - tristate "ASoC Audio driver for SKL with NAU88L25 and SSM4567 in I2S Mode" - depends on X86_INTEL_LPSS && I2C - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_NAU8825 - select SND_SOC_SSM4567 - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - help - This adds support for ASoC Onboard Codec I2S machine driver. This will - create an alsa sound card for NAU88L25 + SSM4567. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH - tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode" - depends on X86_INTEL_LPSS && I2C - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_NAU8825 - select SND_SOC_MAX98357A - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - help - This adds support for ASoC Onboard Codec I2S machine driver. This will - create an alsa sound card for NAU88L25 + MAX98357A. - Say Y if you have such a device. - If unsure select "N". +# ASoC codec drivers +source "sound/soc/intel/boards/Kconfig"
sound/soc/intel/boards/Kconfig new file +269 -0
269 lines not on this page · raw message
Signature · 1 line
2.9.3
Mark Brown
maintainerApplied "ASoC: Intel: move machine drivers to dedicated KConfig" to the asoc tree
The patch
ASoC: Intel: move machine drivers to dedicated KConfig
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
ea2851bd82f8a319741a90a847b615c66fd6693bMon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Thu, 12 Oct 2017 18:49:43 -0500
Subject: [PATCH] ASoC: Intel: move machine drivers to dedicated KConfig
split Kconfig to prepare for reuse of machine drivers for SOF support
no functional change or edits
--- sound/soc/intel/Kconfig | 271 +---------------------------------------- sound/soc/intel/boards/Kconfig | 269 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 271 insertions(+), 269 deletions(-) create mode 100644 sound/soc/intel/boards/Kconfig
sound/soc/intel/Kconfig +2 -269
@@ -1,15 +1,3 @@ -config SND_MFLD_MACHINE - tristate "SOC Machine Audio driver for Intel Medfield MID platform" - depends on INTEL_SCU_IPC - select SND_SOC_SN95031 - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_PCI - help - This adds support for ASoC machine driver for Intel(R) MID Medfield platform - used as alsa device in audio substem in Intel(R) MID devices - Say Y if you have such a device. - If unsure select "N". - config SND_SST_ATOM_HIFI2_PLATFORM tristate select SND_SOC_COMPRESS
@@ -57,223 +45,6 @@ config SND_SOC_INTEL_BAYTRAIL select SND_SOC_INTEL_SST select SND_SOC_INTEL_SST_FIRMWARE -config SND_SOC_INTEL_HASWELL_MACH - tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint" - depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM - depends on DMADEVICES - select SND_SOC_INTEL_HASWELL - select SND_SOC_RT5640 - help - This adds support for the Lynxpoint Audio DSP on Intel(R) Haswell - Ultrabook platforms. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH - tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode" - depends on X86 && ACPI && I2C - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_DA7219 - select SND_SOC_MAX98357A - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - select SND_HDA_DSP_LOADER - help - This adds support for ASoC machine driver for Broxton-P platforms - with DA7219 + MAX98357A I2S audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_BXT_RT298_MACH - tristate "ASoC Audio driver for Broxton with RT298 I2S mode" - depends on X86 && ACPI && I2C - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_RT298 - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - select SND_HDA_DSP_LOADER - help - This adds support for ASoC machine driver for Broxton platforms - with RT286 I2S audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_BYT_RT5640_MACH - tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec" - depends on X86_INTEL_LPSS && I2C - depends on DMADEVICES - depends on SND_SST_IPC_ACPI = n - select SND_SOC_INTEL_BAYTRAIL - select SND_SOC_RT5640 - help - This adds audio driver for Intel Baytrail platform based boards - with the RT5640 audio codec. This driver is deprecated, use - SND_SOC_INTEL_BYTCR_RT5640_MACH instead for better functionality. - -config SND_SOC_INTEL_BYT_MAX98090_MACH - tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec" - depends on X86_INTEL_LPSS && I2C - depends on DMADEVICES - depends on SND_SST_IPC_ACPI = n - select SND_SOC_INTEL_BAYTRAIL - select SND_SOC_MAX98090 - help - This adds audio driver for Intel Baytrail platform based boards - with the MAX98090 audio codec. - -config SND_SOC_INTEL_BDW_RT5677_MACH - tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec" - depends on X86_INTEL_LPSS && GPIOLIB && I2C - depends on DMADEVICES - select SND_SOC_INTEL_HASWELL - select SND_SOC_RT5677 - help - This adds support for Intel Broadwell platform based boards with - the RT5677 audio codec. - -config SND_SOC_INTEL_BROADWELL_MACH - tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint" - depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM - depends on DMADEVICES - select SND_SOC_INTEL_HASWELL - select SND_SOC_RT286 - help - This adds support for the Wilcatpoint Audio DSP on Intel(R) Broadwell - Ultrabook platforms. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_BYTCR_RT5640_MACH - tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec" - depends on X86 && I2C && ACPI - select SND_SOC_RT5640 - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI - help - This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR - platforms with RT5640 audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_BYTCR_RT5651_MACH - tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec" - depends on X86 && I2C && ACPI - select SND_SOC_RT5651 - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI - help - This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR - platforms with RT5651 audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_CHT_BSW_RT5672_MACH - tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec" - depends on X86_INTEL_LPSS && I2C && ACPI - select SND_SOC_RT5670 - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI - help - This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell - platforms with RT5672 audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_CHT_BSW_RT5645_MACH - tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec" - depends on X86_INTEL_LPSS && I2C && ACPI - select SND_SOC_RT5645 - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI - help - This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell - platforms with RT5645/5650 audio codec. - If unsure select "N". - -config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH - tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with MAX98090 & TI codec" - depends on X86_INTEL_LPSS && I2C && ACPI - select SND_SOC_MAX98090 - select SND_SOC_TS3A227E - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI - help - This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell - platforms with MAX98090 audio codec it also can support TI jack chip as aux device. - If unsure select "N". - -config SND_SOC_INTEL_BYT_CHT_DA7213_MACH - tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec" - depends on X86_INTEL_LPSS && I2C && ACPI - select SND_SOC_DA7213 - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI - help - This adds support for ASoC machine driver for Intel(R) Baytrail & CherryTrail - platforms with DA7212/7213 audio codec. - If unsure select "N". - -config SND_SOC_INTEL_BYT_CHT_ES8316_MACH - tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with ES8316 codec" - depends on X86_INTEL_LPSS && I2C && ACPI - select SND_SOC_ES8316 - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI - help - This adds support for ASoC machine driver for Intel(R) Baytrail & - Cherrytrail platforms with ES8316 audio codec. - If unsure select "N". - -config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH - tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)" - depends on X86_INTEL_LPSS && I2C && ACPI - select SND_SST_ATOM_HIFI2_PLATFORM - select SND_SST_IPC_ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI - help - This adds support for ASoC machine driver for the MinnowBoard Max or - Up boards and provides access to I2S signals on the Low-Speed - connector - If unsure select "N". - -config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH - tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode" - depends on X86_INTEL_LPSS && I2C - select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_RT5663 - select SND_SOC_MAX98927 - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - help - This adds support for ASoC Onboard Codec I2S machine driver. This will - create an alsa sound card for RT5663 + MAX98927. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH - tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode" - depends on X86_INTEL_LPSS && I2C && SPI - select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_RT5663 - select SND_SOC_RT5514 - select SND_SOC_RT5514_SPI - select SND_SOC_MAX98927 - select SND_SOC_HDAC_HDMI - help - This adds support for ASoC Onboard Codec I2S machine driver. This will - create an alsa sound card for RT5663 + RT5514 + MAX98927. - Say Y if you have such a device. - If unsure select "N". - config SND_SOC_INTEL_SKYLAKE tristate select SND_HDA_EXT_CORE
@@ -281,43 +52,5 @@ config SND_SOC_INTEL_SKYLAKE select SND_SOC_TOPOLOGY select SND_SOC_INTEL_SST -config SND_SOC_INTEL_SKL_RT286_MACH - tristate "ASoC Audio driver for SKL with RT286 I2S mode" - depends on X86 && ACPI && I2C - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_RT286 - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - help - This adds support for ASoC machine driver for Skylake platforms - with RT286 I2S audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH - tristate "ASoC Audio driver for SKL with NAU88L25 and SSM4567 in I2S Mode" - depends on X86_INTEL_LPSS && I2C - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_NAU8825 - select SND_SOC_SSM4567 - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - help - This adds support for ASoC Onboard Codec I2S machine driver. This will - create an alsa sound card for NAU88L25 + SSM4567. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH - tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode" - depends on X86_INTEL_LPSS && I2C - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_NAU8825 - select SND_SOC_MAX98357A - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - help - This adds support for ASoC Onboard Codec I2S machine driver. This will - create an alsa sound card for NAU88L25 + MAX98357A. - Say Y if you have such a device. - If unsure select "N". +# ASoC codec drivers +source "sound/soc/intel/boards/Kconfig"
sound/soc/intel/boards/Kconfig new file +269 -0
269 lines not on this page · raw message
Signature · 1 line
2.14.1
RFC PATCH 7/8 ASoC: Intel: reorder boards Kconfig by chronological order
In reply to Pierre-Louis BossartThis file is a mess, order by generation with more recent last
--- sound/soc/intel/boards/Kconfig | 166 ++++++++++++++++++++--------------------- 1 file changed, 83 insertions(+), 83 deletions(-)
sound/soc/intel/boards/Kconfig +83 -83
@@ -22,58 +22,6 @@ config SND_SOC_INTEL_HASWELL_MACH Say Y if you have such a device. If unsure select "N". -config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH - tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode" - depends on X86 && ACPI && I2C - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_DA7219 - select SND_SOC_MAX98357A - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - select SND_HDA_DSP_LOADER - help - This adds support for ASoC machine driver for Broxton-P platforms - with DA7219 + MAX98357A I2S audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_BXT_RT298_MACH - tristate "ASoC Audio driver for Broxton with RT298 I2S mode" - depends on X86 && ACPI && I2C - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_RT298 - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - select SND_HDA_DSP_LOADER - help - This adds support for ASoC machine driver for Broxton platforms - with RT286 I2S audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_BYT_RT5640_MACH - tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec" - depends on X86_INTEL_LPSS && I2C - depends on DMADEVICES - depends on SND_SST_IPC_ACPI = n - select SND_SOC_INTEL_BAYTRAIL - select SND_SOC_RT5640 - help - This adds audio driver for Intel Baytrail platform based boards - with the RT5640 audio codec. This driver is deprecated, use - SND_SOC_INTEL_BYTCR_RT5640_MACH instead for better functionality. - -config SND_SOC_INTEL_BYT_MAX98090_MACH - tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec" - depends on X86_INTEL_LPSS && I2C - depends on DMADEVICES - depends on SND_SST_IPC_ACPI = n - select SND_SOC_INTEL_BAYTRAIL - select SND_SOC_MAX98090 - help - This adds audio driver for Intel Baytrail platform based boards - with the MAX98090 audio codec. - config SND_SOC_INTEL_BDW_RT5677_MACH tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec" depends on X86_INTEL_LPSS && GPIOLIB && I2C
@@ -96,6 +44,29 @@ config SND_SOC_INTEL_BROADWELL_MACH Say Y if you have such a device. If unsure select "N". +config SND_SOC_INTEL_BYT_MAX98090_MACH + tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec" + depends on X86_INTEL_LPSS && I2C + depends on DMADEVICES + depends on SND_SST_IPC_ACPI = n + select SND_SOC_INTEL_BAYTRAIL + select SND_SOC_MAX98090 + help + This adds audio driver for Intel Baytrail platform based boards + with the MAX98090 audio codec. + +config SND_SOC_INTEL_BYT_RT5640_MACH + tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec" + depends on X86_INTEL_LPSS && I2C + depends on DMADEVICES + depends on SND_SST_IPC_ACPI = n + select SND_SOC_INTEL_BAYTRAIL + select SND_SOC_RT5640 + help + This adds audio driver for Intel Baytrail platform based boards + with the RT5640 audio codec. This driver is deprecated, use + SND_SOC_INTEL_BYTCR_RT5640_MACH instead for better functionality. + config SND_SOC_INTEL_BYTCR_RT5640_MACH tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec" depends on X86 && I2C && ACPI
@@ -196,37 +167,6 @@ config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH connector If unsure select "N". -config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH - tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode" - depends on X86_INTEL_LPSS && I2C - select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_RT5663 - select SND_SOC_MAX98927 - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - help - This adds support for ASoC Onboard Codec I2S machine driver. This will - create an alsa sound card for RT5663 + MAX98927. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH - tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode" - depends on X86_INTEL_LPSS && I2C && SPI - select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_RT5663 - select SND_SOC_RT5514 - select SND_SOC_RT5514_SPI - select SND_SOC_MAX98927 - select SND_SOC_HDAC_HDMI - help - This adds support for ASoC Onboard Codec I2S machine driver. This will - create an alsa sound card for RT5663 + RT5514 + MAX98927. - Say Y if you have such a device. - If unsure select "N". - config SND_SOC_INTEL_SKL_RT286_MACH tristate "ASoC Audio driver for SKL with RT286 I2S mode" depends on X86 && ACPI && I2C
@@ -267,3 +207,63 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH create an alsa sound card for NAU88L25 + MAX98357A. Say Y if you have such a device. If unsure select "N". + +config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH + tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode" + depends on X86 && ACPI && I2C + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_DA7219 + select SND_SOC_MAX98357A + select SND_SOC_DMIC + select SND_SOC_HDAC_HDMI + select SND_HDA_DSP_LOADER + help + This adds support for ASoC machine driver for Broxton-P platforms + with DA7219 + MAX98357A I2S audio codec. + Say Y if you have such a device. + If unsure select "N". + +config SND_SOC_INTEL_BXT_RT298_MACH + tristate "ASoC Audio driver for Broxton with RT298 I2S mode" + depends on X86 && ACPI && I2C + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_RT298 + select SND_SOC_DMIC + select SND_SOC_HDAC_HDMI + select SND_HDA_DSP_LOADER + help + This adds support for ASoC machine driver for Broxton platforms + with RT286 I2S audio codec. + Say Y if you have such a device. + If unsure select "N". + +config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH + tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode" + depends on X86_INTEL_LPSS && I2C + select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_RT5663 + select SND_SOC_MAX98927 + select SND_SOC_DMIC + select SND_SOC_HDAC_HDMI + help + This adds support for ASoC Onboard Codec I2S machine driver. This will + create an alsa sound card for RT5663 + MAX98927. + Say Y if you have such a device. + If unsure select "N". + +config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH + tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode" + depends on X86_INTEL_LPSS && I2C && SPI + select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_RT5663 + select SND_SOC_RT5514 + select SND_SOC_RT5514_SPI + select SND_SOC_MAX98927 + select SND_SOC_HDAC_HDMI + help + This adds support for ASoC Onboard Codec I2S machine driver. This will + create an alsa sound card for RT5663 + RT5514 + MAX98927. + Say Y if you have such a device. + If unsure select "N".
Signature · 1 line
2.9.3
Re: [RFC PATCH 7/8] ASoC: Intel: reorder boards Kconfig by chronological order
Quoted 1 line · Pierre-Louis Bossart
This file is a mess, order by generation with more recent last
Last time we decided to do alphabetical. I am fine this way too!
Quoted 205 lines
Signed-off-by Pierre-Louis Bossart <[email protected]>--- sound/soc/intel/boards/Kconfig | 166 ++++++++++++++++++++--------------------- 1 file changed, 83 insertions(+), 83 deletions(-)sound/soc/intel/boards/Kconfig +83
-83@@ -22,58 +22,6 @@ config SND_SOC_INTEL_HASWELL_MACH Say Y if you have such a device. If unsure select "N". -config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH - tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode" - depends on X86 && ACPI && I2C - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_DA7219 - select SND_SOC_MAX98357A - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - select SND_HDA_DSP_LOADER - help - This adds support for ASoC machine driver for Broxton-P platforms - with DA7219 + MAX98357A I2S audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_BXT_RT298_MACH - tristate "ASoC Audio driver for Broxton with RT298 I2S mode" - depends on X86 && ACPI && I2C - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_RT298 - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - select SND_HDA_DSP_LOADER - help - This adds support for ASoC machine driver for Broxton platforms - with RT286 I2S audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_BYT_RT5640_MACH - tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec" - depends on X86_INTEL_LPSS && I2C - depends on DMADEVICES - depends on SND_SST_IPC_ACPI = n - select SND_SOC_INTEL_BAYTRAIL - select SND_SOC_RT5640 - help - This adds audio driver for Intel Baytrail platform based boards - with the RT5640 audio codec. This driver is deprecated, use - SND_SOC_INTEL_BYTCR_RT5640_MACH instead for better functionality. - -config SND_SOC_INTEL_BYT_MAX98090_MACH - tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec" - depends on X86_INTEL_LPSS && I2C - depends on DMADEVICES - depends on SND_SST_IPC_ACPI = n - select SND_SOC_INTEL_BAYTRAIL - select SND_SOC_MAX98090 - help - This adds audio driver for Intel Baytrail platform based boards - with the MAX98090 audio codec. - config SND_SOC_INTEL_BDW_RT5677_MACH tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec" depends on X86_INTEL_LPSS && GPIOLIB && I2C@@ -96,6 +44,29 @@ config SND_SOC_INTEL_BROADWELL_MACH Say Y if you have such a device. If unsure select "N". +config SND_SOC_INTEL_BYT_MAX98090_MACH + tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec" + depends on X86_INTEL_LPSS && I2C + depends on DMADEVICES + depends on SND_SST_IPC_ACPI = n + select SND_SOC_INTEL_BAYTRAIL + select SND_SOC_MAX98090 + help + This adds audio driver for Intel Baytrail platform based boards + with the MAX98090 audio codec. + +config SND_SOC_INTEL_BYT_RT5640_MACH + tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec" + depends on X86_INTEL_LPSS && I2C + depends on DMADEVICES + depends on SND_SST_IPC_ACPI = n + select SND_SOC_INTEL_BAYTRAIL + select SND_SOC_RT5640 + help + This adds audio driver for Intel Baytrail platform based boards + with the RT5640 audio codec. This driver is deprecated, use + SND_SOC_INTEL_BYTCR_RT5640_MACH instead for better functionality. + config SND_SOC_INTEL_BYTCR_RT5640_MACH tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec" depends on X86 && I2C && ACPI@@ -196,37 +167,6 @@ config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH connector If unsure select "N". -config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH - tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode" - depends on X86_INTEL_LPSS && I2C - select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_RT5663 - select SND_SOC_MAX98927 - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - help - This adds support for ASoC Onboard Codec I2S machine driver. This will - create an alsa sound card for RT5663 + MAX98927. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH - tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode" - depends on X86_INTEL_LPSS && I2C && SPI - select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_RT5663 - select SND_SOC_RT5514 - select SND_SOC_RT5514_SPI - select SND_SOC_MAX98927 - select SND_SOC_HDAC_HDMI - help - This adds support for ASoC Onboard Codec I2S machine driver. This will - create an alsa sound card for RT5663 + RT5514 + MAX98927. - Say Y if you have such a device. - If unsure select "N". - config SND_SOC_INTEL_SKL_RT286_MACH tristate "ASoC Audio driver for SKL with RT286 I2S mode" depends on X86 && ACPI && I2C@@ -267,3 +207,63 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH create an alsa sound card for NAU88L25 + MAX98357A. Say Y if you have such a device. If unsure select "N". + +config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH + tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode" + depends on X86 && ACPI && I2C + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_DA7219 + select SND_SOC_MAX98357A + select SND_SOC_DMIC + select SND_SOC_HDAC_HDMI + select SND_HDA_DSP_LOADER + help + This adds support for ASoC machine driver for Broxton-P platforms + with DA7219 + MAX98357A I2S audio codec. + Say Y if you have such a device. + If unsure select "N". + +config SND_SOC_INTEL_BXT_RT298_MACH + tristate "ASoC Audio driver for Broxton with RT298 I2S mode" + depends on X86 && ACPI && I2C + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_RT298 + select SND_SOC_DMIC + select SND_SOC_HDAC_HDMI + select SND_HDA_DSP_LOADER + help + This adds support for ASoC machine driver for Broxton platforms + with RT286 I2S audio codec. + Say Y if you have such a device. + If unsure select "N". + +config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH + tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode" + depends on X86_INTEL_LPSS && I2C + select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_RT5663 + select SND_SOC_MAX98927 + select SND_SOC_DMIC + select SND_SOC_HDAC_HDMI + help + This adds support for ASoC Onboard Codec I2S machine driver. This will + create an alsa sound card for RT5663 + MAX98927. + Say Y if you have such a device. + If unsure select "N". + +config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH + tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode" + depends on X86_INTEL_LPSS && I2C && SPI + select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_RT5663 + select SND_SOC_RT5514 + select SND_SOC_RT5514_SPI + select SND_SOC_MAX98927 + select SND_SOC_HDAC_HDMI + help + This adds support for ASoC Onboard Codec I2S machine driver. This will + create an alsa sound card for RT5663 + RT5514 + MAX98927. + Say Y if you have such a device. + If unsure select "N".Signature · 1 line
2.9.3
Signature · 1 line
~Vinod
Mark Brown
maintainerApplied "ASoC: Intel: reorder boards Kconfig by chronological order" to the asoc tree
In reply to Pierre-Louis BossartThe patch
ASoC: Intel: reorder boards Kconfig by chronological order
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
d4d86b86e1ffa6be16b287ee34b0090ef79a0fbbMon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Thu, 12 Oct 2017 18:49:44 -0500
Subject: [PATCH] ASoC: Intel: reorder boards Kconfig by chronological order
This file is a mess, order by generation with more recent last
--- sound/soc/intel/boards/Kconfig | 166 ++++++++++++++++++++--------------------- 1 file changed, 83 insertions(+), 83 deletions(-)
sound/soc/intel/boards/Kconfig +83 -83
@@ -22,58 +22,6 @@ config SND_SOC_INTEL_HASWELL_MACH Say Y if you have such a device. If unsure select "N". -config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH - tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode" - depends on X86 && ACPI && I2C - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_DA7219 - select SND_SOC_MAX98357A - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - select SND_HDA_DSP_LOADER - help - This adds support for ASoC machine driver for Broxton-P platforms - with DA7219 + MAX98357A I2S audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_BXT_RT298_MACH - tristate "ASoC Audio driver for Broxton with RT298 I2S mode" - depends on X86 && ACPI && I2C - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_RT298 - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - select SND_HDA_DSP_LOADER - help - This adds support for ASoC machine driver for Broxton platforms - with RT286 I2S audio codec. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_BYT_RT5640_MACH - tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec" - depends on X86_INTEL_LPSS && I2C - depends on DMADEVICES - depends on SND_SST_IPC_ACPI = n - select SND_SOC_INTEL_BAYTRAIL - select SND_SOC_RT5640 - help - This adds audio driver for Intel Baytrail platform based boards - with the RT5640 audio codec. This driver is deprecated, use - SND_SOC_INTEL_BYTCR_RT5640_MACH instead for better functionality. - -config SND_SOC_INTEL_BYT_MAX98090_MACH - tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec" - depends on X86_INTEL_LPSS && I2C - depends on DMADEVICES - depends on SND_SST_IPC_ACPI = n - select SND_SOC_INTEL_BAYTRAIL - select SND_SOC_MAX98090 - help - This adds audio driver for Intel Baytrail platform based boards - with the MAX98090 audio codec. - config SND_SOC_INTEL_BDW_RT5677_MACH tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec" depends on X86_INTEL_LPSS && GPIOLIB && I2C
@@ -96,6 +44,29 @@ config SND_SOC_INTEL_BROADWELL_MACH Say Y if you have such a device. If unsure select "N". +config SND_SOC_INTEL_BYT_MAX98090_MACH + tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec" + depends on X86_INTEL_LPSS && I2C + depends on DMADEVICES + depends on SND_SST_IPC_ACPI = n + select SND_SOC_INTEL_BAYTRAIL + select SND_SOC_MAX98090 + help + This adds audio driver for Intel Baytrail platform based boards + with the MAX98090 audio codec. + +config SND_SOC_INTEL_BYT_RT5640_MACH + tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec" + depends on X86_INTEL_LPSS && I2C + depends on DMADEVICES + depends on SND_SST_IPC_ACPI = n + select SND_SOC_INTEL_BAYTRAIL + select SND_SOC_RT5640 + help + This adds audio driver for Intel Baytrail platform based boards + with the RT5640 audio codec. This driver is deprecated, use + SND_SOC_INTEL_BYTCR_RT5640_MACH instead for better functionality. + config SND_SOC_INTEL_BYTCR_RT5640_MACH tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec" depends on X86 && I2C && ACPI
@@ -196,37 +167,6 @@ config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH connector If unsure select "N". -config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH - tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode" - depends on X86_INTEL_LPSS && I2C - select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_RT5663 - select SND_SOC_MAX98927 - select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI - help - This adds support for ASoC Onboard Codec I2S machine driver. This will - create an alsa sound card for RT5663 + MAX98927. - Say Y if you have such a device. - If unsure select "N". - -config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH - tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode" - depends on X86_INTEL_LPSS && I2C && SPI - select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SKYLAKE - select SND_SOC_RT5663 - select SND_SOC_RT5514 - select SND_SOC_RT5514_SPI - select SND_SOC_MAX98927 - select SND_SOC_HDAC_HDMI - help - This adds support for ASoC Onboard Codec I2S machine driver. This will - create an alsa sound card for RT5663 + RT5514 + MAX98927. - Say Y if you have such a device. - If unsure select "N". - config SND_SOC_INTEL_SKL_RT286_MACH tristate "ASoC Audio driver for SKL with RT286 I2S mode" depends on X86 && ACPI && I2C
@@ -267,3 +207,63 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH create an alsa sound card for NAU88L25 + MAX98357A. Say Y if you have such a device. If unsure select "N". + +config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH + tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode" + depends on X86 && ACPI && I2C + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_DA7219 + select SND_SOC_MAX98357A + select SND_SOC_DMIC + select SND_SOC_HDAC_HDMI + select SND_HDA_DSP_LOADER + help + This adds support for ASoC machine driver for Broxton-P platforms + with DA7219 + MAX98357A I2S audio codec. + Say Y if you have such a device. + If unsure select "N". + +config SND_SOC_INTEL_BXT_RT298_MACH + tristate "ASoC Audio driver for Broxton with RT298 I2S mode" + depends on X86 && ACPI && I2C + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_RT298 + select SND_SOC_DMIC + select SND_SOC_HDAC_HDMI + select SND_HDA_DSP_LOADER + help + This adds support for ASoC machine driver for Broxton platforms + with RT286 I2S audio codec. + Say Y if you have such a device. + If unsure select "N". + +config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH + tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode" + depends on X86_INTEL_LPSS && I2C + select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_RT5663 + select SND_SOC_MAX98927 + select SND_SOC_DMIC + select SND_SOC_HDAC_HDMI + help + This adds support for ASoC Onboard Codec I2S machine driver. This will + create an alsa sound card for RT5663 + MAX98927. + Say Y if you have such a device. + If unsure select "N". + +config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH + tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode" + depends on X86_INTEL_LPSS && I2C && SPI + select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_RT5663 + select SND_SOC_RT5514 + select SND_SOC_RT5514_SPI + select SND_SOC_MAX98927 + select SND_SOC_HDAC_HDMI + help + This adds support for ASoC Onboard Codec I2S machine driver. This will + create an alsa sound card for RT5663 + RT5514 + MAX98927. + Say Y if you have such a device. + If unsure select "N".
Signature · 1 line
2.14.1
RFC PATCH 8/8 ASoC: Intel: clarify Kconfig dependencies
In reply to Pierre-Louis BossartIntroduce more logical dependencies, with the SOC selected first and the relevant machine drivers are exposed.
The same mechanism will be used for SOF support.
Also select SND_SOC_ACPI_INTEL_MATCH for all machine drivers
--- sound/soc/intel/Kconfig | 25 +++++++++----- sound/soc/intel/boards/Kconfig | 77 ++++++++++++++++++++++++++---------------- 2 files changed, 63 insertions(+), 39 deletions(-)
sound/soc/intel/Kconfig +16 -9
@@ -1,7 +1,3 @@ -config SND_SST_ATOM_HIFI2_PLATFORM - tristate - select SND_SOC_COMPRESS - config SND_SST_IPC tristate
@@ -20,9 +16,7 @@ config SND_SOC_INTEL_COMMON config SND_SOC_INTEL_SST tristate - select SND_SOC_INTEL_COMMON select SND_SOC_INTEL_SST_ACPI if ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI config SND_SOC_INTEL_SST_FIRMWARE tristate
@@ -35,18 +29,31 @@ config SND_SOC_ACPI_INTEL_MATCH tristate select SND_SOC_ACPI if ACPI +config SND_SOC_INTEL_SST_TOPLEVEL + tristate "Intel ASoC SST drivers" + select SND_SOC_INTEL_MACH + select SND_SOC_INTEL_COMMON + config SND_SOC_INTEL_HASWELL - tristate + tristate "Intel ASoC SST driver for Haswell/Broadwell" + depends on SND_SOC_INTEL_SST_TOPLEVEL select SND_SOC_INTEL_SST select SND_SOC_INTEL_SST_FIRMWARE config SND_SOC_INTEL_BAYTRAIL - tristate + tristate "Intel ASoC SST driver for Baytrail (legacy)" + depends on SND_SOC_INTEL_SST_TOPLEVEL select SND_SOC_INTEL_SST select SND_SOC_INTEL_SST_FIRMWARE +config SND_SST_ATOM_HIFI2_PLATFORM + tristate "Intel ASoC SST driver for HiFi2 platforms (*field, *trail)" + depends on SND_SOC_INTEL_SST_TOPLEVEL + select SND_SOC_COMPRESS + config SND_SOC_INTEL_SKYLAKE - tristate + tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL" + depends on SND_SOC_INTEL_SST_TOPLEVEL select SND_HDA_EXT_CORE select SND_HDA_DSP_LOADER select SND_SOC_TOPOLOGY
sound/soc/intel/boards/Kconfig +47 -30
248 lines not on this page · raw message
Signature · 1 line
2.9.3
Mark Brown
maintainerApplied "ASoC: Intel: clarify Kconfig dependencies" to the asoc tree
The patch
ASoC: Intel: clarify Kconfig dependencies
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
f6a118a800e35af2c63f90cbcc23093f4b53b3a2Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Thu, 12 Oct 2017 18:49:45 -0500
Subject: [PATCH] ASoC: Intel: clarify Kconfig dependencies
Introduce more logical dependencies, with the SOC selected first and the relevant machine drivers are exposed.
The same mechanism will be used for SOF support.
Also select SND_SOC_ACPI_INTEL_MATCH for all machine drivers
--- sound/soc/intel/Kconfig | 25 +++++++++----- sound/soc/intel/boards/Kconfig | 77 ++++++++++++++++++++++++++---------------- 2 files changed, 63 insertions(+), 39 deletions(-)
sound/soc/intel/Kconfig +16 -9
@@ -1,7 +1,3 @@ -config SND_SST_ATOM_HIFI2_PLATFORM - tristate - select SND_SOC_COMPRESS - config SND_SST_IPC tristate
@@ -20,9 +16,7 @@ config SND_SOC_INTEL_COMMON config SND_SOC_INTEL_SST tristate - select SND_SOC_INTEL_COMMON select SND_SOC_INTEL_SST_ACPI if ACPI - select SND_SOC_ACPI_INTEL_MATCH if ACPI config SND_SOC_INTEL_SST_FIRMWARE tristate
@@ -35,18 +29,31 @@ config SND_SOC_ACPI_INTEL_MATCH tristate select SND_SOC_ACPI if ACPI +config SND_SOC_INTEL_SST_TOPLEVEL + tristate "Intel ASoC SST drivers" + select SND_SOC_INTEL_MACH + select SND_SOC_INTEL_COMMON + config SND_SOC_INTEL_HASWELL - tristate + tristate "Intel ASoC SST driver for Haswell/Broadwell" + depends on SND_SOC_INTEL_SST_TOPLEVEL select SND_SOC_INTEL_SST select SND_SOC_INTEL_SST_FIRMWARE config SND_SOC_INTEL_BAYTRAIL - tristate + tristate "Intel ASoC SST driver for Baytrail (legacy)" + depends on SND_SOC_INTEL_SST_TOPLEVEL select SND_SOC_INTEL_SST select SND_SOC_INTEL_SST_FIRMWARE +config SND_SST_ATOM_HIFI2_PLATFORM + tristate "Intel ASoC SST driver for HiFi2 platforms (*field, *trail)" + depends on SND_SOC_INTEL_SST_TOPLEVEL + select SND_SOC_COMPRESS + config SND_SOC_INTEL_SKYLAKE - tristate + tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL" + depends on SND_SOC_INTEL_SST_TOPLEVEL select SND_HDA_EXT_CORE select SND_HDA_DSP_LOADER select SND_SOC_TOPOLOGY
sound/soc/intel/boards/Kconfig +47 -30
248 lines not on this page · raw message
Signature · 1 line
2.14.1
Mark Brown
maintainerQuoted 5 lines · Pierre-Louis Bossart
The Sound Open Firmware work [1] is progressing quickly and drivers for the 1.0 release will soon be submitted upstream. Before we do so, there is a new to reshuffle the ACPI integration and Intel Kconfig/Makefiles. This RFC is a preview of what's coming, feedback would be greatly appreciated.
No comments from any other Intel people?
Liam Girdwood
maintainerQuoted 8 lines · Mark Brown
Quoted 5 lines · Pierre-Louis Bossart
The Sound Open Firmware work [1] is progressing quickly and drivers for the 1.0 release will soon be submitted upstream. Before we do so, there is a new to reshuffle the ACPI integration and Intel Kconfig/Makefiles. This RFC is a preview of what's coming, feedback would be greatly appreciated.
No comments from any other Intel people?
Its all good for me.
All,