Loading include/sound/soc-acpi-intel-match.h 0 → 100644 +32 −0 Original line number Diff line number Diff line /* * 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/common/sst-acpi.h→include/sound/soc-acpi.h +111 −0 Original line number Diff line number Diff line Loading @@ -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; Loading @@ -25,58 +28,84 @@ 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]); /** * snd_soc_acpi_mach: ACPI-based machine descriptor. Most of the fields are * related to the hardware, except for the firmware and topology file names. * A platform supported by legacy and Sound Open Firmware (SOF) would expose * all firmware/topology related fields. * * @id: ACPI ID (usually the codec's) used to find a matching machine driver. * @drv_name: machine driver name * @fw_filename: firmware file name. Used when SOF is not enabled. * @board: board name * @machine_quirk: pointer to quirk, usually based on DMI information when * ACPI ID alone is not sufficient, wrong or misleading * @quirk_data: data used to uniquely identify a machine, usually a list of * audio codecs whose presence if checked with ACPI * @pdata: intended for platform data or machine specific-ops. This structure * is not constant since this field may be updated at run-time * @sof_fw_filename: Sound Open Firmware file name, if enabled * @sof_tplg_filename: Sound Open Firmware topology file name, if enabled * @asoc_plat_name: ASoC platform name, used for binding machine drivers * if non NULL * @new_mach_data: machine driver private data fixup */ /* Descriptor for SST ASoC machine driver */ struct sst_acpi_mach { /* ACPI ID for the matching machine driver. Audio codec for instance */ struct snd_soc_acpi_mach { const u8 id[ACPI_ID_LEN]; /* machine driver name */ const char *drv_name; /* firmware file name */ const char *fw_filename; /* 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; const char *sof_fw_filename; const char *sof_tplg_filename; const char *asoc_plat_name; struct platform_device * (*new_mach_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 include/sound/soc.h +14 −0 Original line number Diff line number Diff line Loading @@ -1821,6 +1821,20 @@ struct snd_soc_dai *snd_soc_find_dai( #include <sound/soc-dai.h> static inline struct snd_soc_dai *snd_soc_card_get_codec_dai(struct snd_soc_card *card, const char *dai_name) { struct snd_soc_pcm_runtime *rtd; list_for_each_entry(rtd, &card->rtd_list, list) { if (!strcmp(rtd->codec_dai->name, dai_name)) return rtd->codec_dai; } return NULL; } #ifdef CONFIG_DEBUG_FS extern struct dentry *snd_soc_debugfs_root; #endif Loading sound/soc/Kconfig +3 −0 Original line number Diff line number Diff line Loading @@ -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" Loading sound/soc/Makefile +6 −0 Original line number Diff line number Diff line Loading @@ -15,6 +15,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/ Loading Loading
include/sound/soc-acpi-intel-match.h 0 → 100644 +32 −0 Original line number Diff line number Diff line /* * 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/common/sst-acpi.h→include/sound/soc-acpi.h +111 −0 Original line number Diff line number Diff line Loading @@ -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; Loading @@ -25,58 +28,84 @@ 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]); /** * snd_soc_acpi_mach: ACPI-based machine descriptor. Most of the fields are * related to the hardware, except for the firmware and topology file names. * A platform supported by legacy and Sound Open Firmware (SOF) would expose * all firmware/topology related fields. * * @id: ACPI ID (usually the codec's) used to find a matching machine driver. * @drv_name: machine driver name * @fw_filename: firmware file name. Used when SOF is not enabled. * @board: board name * @machine_quirk: pointer to quirk, usually based on DMI information when * ACPI ID alone is not sufficient, wrong or misleading * @quirk_data: data used to uniquely identify a machine, usually a list of * audio codecs whose presence if checked with ACPI * @pdata: intended for platform data or machine specific-ops. This structure * is not constant since this field may be updated at run-time * @sof_fw_filename: Sound Open Firmware file name, if enabled * @sof_tplg_filename: Sound Open Firmware topology file name, if enabled * @asoc_plat_name: ASoC platform name, used for binding machine drivers * if non NULL * @new_mach_data: machine driver private data fixup */ /* Descriptor for SST ASoC machine driver */ struct sst_acpi_mach { /* ACPI ID for the matching machine driver. Audio codec for instance */ struct snd_soc_acpi_mach { const u8 id[ACPI_ID_LEN]; /* machine driver name */ const char *drv_name; /* firmware file name */ const char *fw_filename; /* 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; const char *sof_fw_filename; const char *sof_tplg_filename; const char *asoc_plat_name; struct platform_device * (*new_mach_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
include/sound/soc.h +14 −0 Original line number Diff line number Diff line Loading @@ -1821,6 +1821,20 @@ struct snd_soc_dai *snd_soc_find_dai( #include <sound/soc-dai.h> static inline struct snd_soc_dai *snd_soc_card_get_codec_dai(struct snd_soc_card *card, const char *dai_name) { struct snd_soc_pcm_runtime *rtd; list_for_each_entry(rtd, &card->rtd_list, list) { if (!strcmp(rtd->codec_dai->name, dai_name)) return rtd->codec_dai; } return NULL; } #ifdef CONFIG_DEBUG_FS extern struct dentry *snd_soc_debugfs_root; #endif Loading
sound/soc/Kconfig +3 −0 Original line number Diff line number Diff line Loading @@ -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" Loading
sound/soc/Makefile +6 −0 Original line number Diff line number Diff line Loading @@ -15,6 +15,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/ Loading
