~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

TOMOYO Linux Cross Reference
Linux/sound/soc/sof/intel/pci-cnl.c

Version: ~ [ linux-6.12-rc7 ] ~ [ linux-6.11.7 ] ~ [ linux-6.10.14 ] ~ [ linux-6.9.12 ] ~ [ linux-6.8.12 ] ~ [ linux-6.7.12 ] ~ [ linux-6.6.60 ] ~ [ linux-6.5.13 ] ~ [ linux-6.4.16 ] ~ [ linux-6.3.13 ] ~ [ linux-6.2.16 ] ~ [ linux-6.1.116 ] ~ [ linux-6.0.19 ] ~ [ linux-5.19.17 ] ~ [ linux-5.18.19 ] ~ [ linux-5.17.15 ] ~ [ linux-5.16.20 ] ~ [ linux-5.15.171 ] ~ [ linux-5.14.21 ] ~ [ linux-5.13.19 ] ~ [ linux-5.12.19 ] ~ [ linux-5.11.22 ] ~ [ linux-5.10.229 ] ~ [ linux-5.9.16 ] ~ [ linux-5.8.18 ] ~ [ linux-5.7.19 ] ~ [ linux-5.6.19 ] ~ [ linux-5.5.19 ] ~ [ linux-5.4.285 ] ~ [ linux-5.3.18 ] ~ [ linux-5.2.21 ] ~ [ linux-5.1.21 ] ~ [ linux-5.0.21 ] ~ [ linux-4.20.17 ] ~ [ linux-4.19.323 ] ~ [ linux-4.18.20 ] ~ [ linux-4.17.19 ] ~ [ linux-4.16.18 ] ~ [ linux-4.15.18 ] ~ [ linux-4.14.336 ] ~ [ linux-4.13.16 ] ~ [ linux-4.12.14 ] ~ [ linux-4.11.12 ] ~ [ linux-4.10.17 ] ~ [ linux-4.9.337 ] ~ [ linux-4.4.302 ] ~ [ linux-3.10.108 ] ~ [ linux-2.6.32.71 ] ~ [ linux-2.6.0 ] ~ [ linux-2.4.37.11 ] ~ [ unix-v6-master ] ~ [ ccs-tools-1.8.12 ] ~ [ policy-sample ] ~
Architecture: ~ [ i386 ] ~ [ alpha ] ~ [ m68k ] ~ [ mips ] ~ [ ppc ] ~ [ sparc ] ~ [ sparc64 ] ~

Diff markup

Differences between /sound/soc/sof/intel/pci-cnl.c (Version linux-6.12-rc7) and /sound/soc/sof/intel/pci-cnl.c (Version linux-6.3.13)


  1 // SPDX-License-Identifier: (GPL-2.0-only OR B      1 // SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
  2 //                                                  2 //
  3 // This file is provided under a dual BSD/GPLv      3 // This file is provided under a dual BSD/GPLv2 license.  When using or
  4 // redistributing this file, you may do so und      4 // redistributing this file, you may do so under either license.
  5 //                                                  5 //
  6 // Copyright(c) 2018 Intel Corporation         !!   6 // Copyright(c) 2018 Intel Corporation. All rights reserved.
  7 //                                                  7 //
  8 // Author: Liam Girdwood <liam.r.girdwood@linu      8 // Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  9 //                                                  9 //
 10                                                    10 
 11 #include <linux/module.h>                          11 #include <linux/module.h>
 12 #include <linux/pci.h>                             12 #include <linux/pci.h>
 13 #include <sound/soc-acpi.h>                        13 #include <sound/soc-acpi.h>
 14 #include <sound/soc-acpi-intel-match.h>            14 #include <sound/soc-acpi-intel-match.h>
 15 #include <sound/sof.h>                             15 #include <sound/sof.h>
 16 #include "../ops.h"                                16 #include "../ops.h"
 17 #include "../sof-pci-dev.h"                        17 #include "../sof-pci-dev.h"
 18                                                    18 
 19 /* platform specific devices */                    19 /* platform specific devices */
 20 #include "hda.h"                                   20 #include "hda.h"
 21                                                    21 
 22 static const struct sof_dev_desc cnl_desc = {      22 static const struct sof_dev_desc cnl_desc = {
 23         .machines               = snd_soc_acpi     23         .machines               = snd_soc_acpi_intel_cnl_machines,
 24         .alt_machines           = snd_soc_acpi     24         .alt_machines           = snd_soc_acpi_intel_cnl_sdw_machines,
 25         .use_acpi_target_states = true,            25         .use_acpi_target_states = true,
 26         .resindex_lpe_base      = 0,               26         .resindex_lpe_base      = 0,
 27         .resindex_pcicfg_base   = -1,              27         .resindex_pcicfg_base   = -1,
 28         .resindex_imr_base      = -1,              28         .resindex_imr_base      = -1,
 29         .irqindex_host_ipc      = -1,              29         .irqindex_host_ipc      = -1,
 30         .chip_info = &cnl_chip_info,               30         .chip_info = &cnl_chip_info,
 31         .ipc_supported_mask     = BIT(SOF_IPC_ !!  31         .ipc_supported_mask     = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
 32         .ipc_default            = SOF_IPC_TYPE !!  32         .ipc_default            = SOF_IPC,
 33         .dspless_mode_supported = true,        << 
 34         .default_fw_path = {                       33         .default_fw_path = {
 35                 [SOF_IPC_TYPE_3] = "intel/sof" !!  34                 [SOF_IPC] = "intel/sof",
 36                 [SOF_IPC_TYPE_4] = "intel/avs/ !!  35                 [SOF_INTEL_IPC4] = "intel/avs/cnl",
 37         },                                         36         },
 38         .default_lib_path = {                      37         .default_lib_path = {
 39                 [SOF_IPC_TYPE_4] = "intel/avs- !!  38                 [SOF_INTEL_IPC4] = "intel/avs-lib/cnl",
 40         },                                         39         },
 41         .default_tplg_path = {                     40         .default_tplg_path = {
 42                 [SOF_IPC_TYPE_3] = "intel/sof- !!  41                 [SOF_IPC] = "intel/sof-tplg",
 43                 [SOF_IPC_TYPE_4] = "intel/avs- !!  42                 [SOF_INTEL_IPC4] = "intel/avs-tplg",
 44         },                                         43         },
 45         .default_fw_filename = {                   44         .default_fw_filename = {
 46                 [SOF_IPC_TYPE_3] = "sof-cnl.ri !!  45                 [SOF_IPC] = "sof-cnl.ri",
 47                 [SOF_IPC_TYPE_4] = "dsp_basefw !!  46                 [SOF_INTEL_IPC4] = "dsp_basefw.bin",
 48         },                                         47         },
 49         .nocodec_tplg_filename = "sof-cnl-noco     48         .nocodec_tplg_filename = "sof-cnl-nocodec.tplg",
 50         .ops = &sof_cnl_ops,                       49         .ops = &sof_cnl_ops,
 51         .ops_init = sof_cnl_ops_init,              50         .ops_init = sof_cnl_ops_init,
 52         .ops_free = hda_ops_free,                  51         .ops_free = hda_ops_free,
 53 };                                                 52 };
 54                                                    53 
 55 static const struct sof_dev_desc cfl_desc = {      54 static const struct sof_dev_desc cfl_desc = {
 56         .machines               = snd_soc_acpi     55         .machines               = snd_soc_acpi_intel_cfl_machines,
 57         .alt_machines           = snd_soc_acpi     56         .alt_machines           = snd_soc_acpi_intel_cfl_sdw_machines,
 58         .use_acpi_target_states = true,            57         .use_acpi_target_states = true,
 59         .resindex_lpe_base      = 0,               58         .resindex_lpe_base      = 0,
 60         .resindex_pcicfg_base   = -1,              59         .resindex_pcicfg_base   = -1,
 61         .resindex_imr_base      = -1,              60         .resindex_imr_base      = -1,
 62         .irqindex_host_ipc      = -1,              61         .irqindex_host_ipc      = -1,
 63         .chip_info = &cnl_chip_info,               62         .chip_info = &cnl_chip_info,
 64         .ipc_supported_mask     = BIT(SOF_IPC_ !!  63         .ipc_supported_mask     = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
 65         .ipc_default            = SOF_IPC_TYPE !!  64         .ipc_default            = SOF_IPC,
 66         .dspless_mode_supported = true,        << 
 67         .default_fw_path = {                       65         .default_fw_path = {
 68                 [SOF_IPC_TYPE_3] = "intel/sof" !!  66                 [SOF_IPC] = "intel/sof",
 69                 [SOF_IPC_TYPE_4] = "intel/avs/ !!  67                 [SOF_INTEL_IPC4] = "intel/avs/cnl",
 70         },                                         68         },
 71         .default_lib_path = {                      69         .default_lib_path = {
 72                 [SOF_IPC_TYPE_4] = "intel/avs- !!  70                 [SOF_INTEL_IPC4] = "intel/avs-lib/cnl",
 73         },                                         71         },
 74         .default_tplg_path = {                     72         .default_tplg_path = {
 75                 [SOF_IPC_TYPE_3] = "intel/sof- !!  73                 [SOF_IPC] = "intel/sof-tplg",
 76                 [SOF_IPC_TYPE_4] = "intel/avs- !!  74                 [SOF_INTEL_IPC4] = "intel/avs-tplg",
 77         },                                         75         },
 78         .default_fw_filename = {                   76         .default_fw_filename = {
 79                 [SOF_IPC_TYPE_3] = "sof-cfl.ri !!  77                 [SOF_IPC] = "sof-cfl.ri",
 80                 [SOF_IPC_TYPE_4] = "dsp_basefw !!  78                 [SOF_INTEL_IPC4] = "dsp_basefw.bin",
 81         },                                         79         },
 82         .nocodec_tplg_filename = "sof-cnl-noco     80         .nocodec_tplg_filename = "sof-cnl-nocodec.tplg",
 83         .ops = &sof_cnl_ops,                       81         .ops = &sof_cnl_ops,
 84         .ops_init = sof_cnl_ops_init,              82         .ops_init = sof_cnl_ops_init,
 85         .ops_free = hda_ops_free,                  83         .ops_free = hda_ops_free,
 86 };                                                 84 };
 87                                                    85 
 88 static const struct sof_dev_desc cml_desc = {      86 static const struct sof_dev_desc cml_desc = {
 89         .machines               = snd_soc_acpi     87         .machines               = snd_soc_acpi_intel_cml_machines,
 90         .alt_machines           = snd_soc_acpi     88         .alt_machines           = snd_soc_acpi_intel_cml_sdw_machines,
 91         .use_acpi_target_states = true,            89         .use_acpi_target_states = true,
 92         .resindex_lpe_base      = 0,               90         .resindex_lpe_base      = 0,
 93         .resindex_pcicfg_base   = -1,              91         .resindex_pcicfg_base   = -1,
 94         .resindex_imr_base      = -1,              92         .resindex_imr_base      = -1,
 95         .irqindex_host_ipc      = -1,              93         .irqindex_host_ipc      = -1,
 96         .chip_info = &cnl_chip_info,               94         .chip_info = &cnl_chip_info,
 97         .ipc_supported_mask     = BIT(SOF_IPC_ !!  95         .ipc_supported_mask     = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
 98         .ipc_default            = SOF_IPC_TYPE !!  96         .ipc_default            = SOF_IPC,
 99         .dspless_mode_supported = true,        << 
100         .default_fw_path = {                       97         .default_fw_path = {
101                 [SOF_IPC_TYPE_3] = "intel/sof" !!  98                 [SOF_IPC] = "intel/sof",
102                 [SOF_IPC_TYPE_4] = "intel/avs/ !!  99                 [SOF_INTEL_IPC4] = "intel/avs/cnl",
103         },                                        100         },
104         .default_lib_path = {                     101         .default_lib_path = {
105                 [SOF_IPC_TYPE_4] = "intel/avs- !! 102                 [SOF_INTEL_IPC4] = "intel/avs-lib/cnl",
106         },                                        103         },
107         .default_tplg_path = {                    104         .default_tplg_path = {
108                 [SOF_IPC_TYPE_3] = "intel/sof- !! 105                 [SOF_IPC] = "intel/sof-tplg",
109                 [SOF_IPC_TYPE_4] = "intel/avs- !! 106                 [SOF_INTEL_IPC4] = "intel/avs-tplg",
110         },                                        107         },
111         .default_fw_filename = {                  108         .default_fw_filename = {
112                 [SOF_IPC_TYPE_3] = "sof-cml.ri !! 109                 [SOF_IPC] = "sof-cml.ri",
113                 [SOF_IPC_TYPE_4] = "dsp_basefw !! 110                 [SOF_INTEL_IPC4] = "dsp_basefw.bin",
114         },                                        111         },
115         .nocodec_tplg_filename = "sof-cnl-noco    112         .nocodec_tplg_filename = "sof-cnl-nocodec.tplg",
116         .ops = &sof_cnl_ops,                      113         .ops = &sof_cnl_ops,
117         .ops_init = sof_cnl_ops_init,             114         .ops_init = sof_cnl_ops_init,
118         .ops_free = hda_ops_free,                 115         .ops_free = hda_ops_free,
119 };                                                116 };
120                                                   117 
121 /* PCI IDs */                                     118 /* PCI IDs */
122 static const struct pci_device_id sof_pci_ids[    119 static const struct pci_device_id sof_pci_ids[] = {
123         { PCI_DEVICE_DATA(INTEL, HDA_CNL_LP, & !! 120         { PCI_DEVICE(0x8086, 0x9dc8), /* CNL-LP */
124         { PCI_DEVICE_DATA(INTEL, HDA_CNL_H, &c !! 121                 .driver_data = (unsigned long)&cnl_desc},
125         { PCI_DEVICE_DATA(INTEL, HDA_CML_LP, & !! 122         { PCI_DEVICE(0x8086, 0xa348), /* CNL-H */
126         { PCI_DEVICE_DATA(INTEL, HDA_CML_H, &c !! 123                 .driver_data = (unsigned long)&cfl_desc},
127         { PCI_DEVICE_DATA(INTEL, HDA_CML_S, &c !! 124         { PCI_DEVICE(0x8086, 0x02c8), /* CML-LP */
                                                   >> 125                 .driver_data = (unsigned long)&cml_desc},
                                                   >> 126         { PCI_DEVICE(0x8086, 0x06c8), /* CML-H */
                                                   >> 127                 .driver_data = (unsigned long)&cml_desc},
                                                   >> 128         { PCI_DEVICE(0x8086, 0xa3f0), /* CML-S */
                                                   >> 129                 .driver_data = (unsigned long)&cml_desc},
128         { 0, }                                    130         { 0, }
129 };                                                131 };
130 MODULE_DEVICE_TABLE(pci, sof_pci_ids);            132 MODULE_DEVICE_TABLE(pci, sof_pci_ids);
131                                                   133 
132 /* pci_driver definition */                       134 /* pci_driver definition */
133 static struct pci_driver snd_sof_pci_intel_cnl    135 static struct pci_driver snd_sof_pci_intel_cnl_driver = {
134         .name = "sof-audio-pci-intel-cnl",        136         .name = "sof-audio-pci-intel-cnl",
135         .id_table = sof_pci_ids,                  137         .id_table = sof_pci_ids,
136         .probe = hda_pci_intel_probe,             138         .probe = hda_pci_intel_probe,
137         .remove = sof_pci_remove,                 139         .remove = sof_pci_remove,
138         .shutdown = sof_pci_shutdown,             140         .shutdown = sof_pci_shutdown,
139         .driver = {                               141         .driver = {
140                 .pm = &sof_pci_pm,                142                 .pm = &sof_pci_pm,
141         },                                        143         },
142 };                                                144 };
143 module_pci_driver(snd_sof_pci_intel_cnl_driver    145 module_pci_driver(snd_sof_pci_intel_cnl_driver);
144                                                   146 
145 MODULE_LICENSE("Dual BSD/GPL");                   147 MODULE_LICENSE("Dual BSD/GPL");
146 MODULE_DESCRIPTION("SOF support for CannonLake << 
147 MODULE_IMPORT_NS(SND_SOC_SOF_INTEL_HDA_GENERIC << 
148 MODULE_IMPORT_NS(SND_SOC_SOF_INTEL_HDA_COMMON)    148 MODULE_IMPORT_NS(SND_SOC_SOF_INTEL_HDA_COMMON);
149 MODULE_IMPORT_NS(SND_SOC_SOF_PCI_DEV);            149 MODULE_IMPORT_NS(SND_SOC_SOF_PCI_DEV);
150                                                   150 

~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

kernel.org | git.kernel.org | LWN.net | Project Home | SVN repository | Mail admin

Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.

sflogo.php