|
15 | 15 | #include <linux/soundwire/sdw_intel.h> |
16 | 16 | #include <sound/core.h> |
17 | 17 | #include <sound/soc-acpi.h> |
18 | | - |
19 | 18 | #include "sof_sdw_common.h" |
20 | 19 | #include "../../codecs/rt711.h" |
21 | | -#include "../../sof/intel/hda.h" |
22 | 20 |
|
23 | 21 | static unsigned long sof_sdw_quirk = RT711_JD1; |
24 | 22 | static int quirk_override = -1; |
@@ -1145,28 +1143,8 @@ static int create_bt_dailinks(struct snd_soc_card *card, |
1145 | 1143 | struct snd_soc_dai_link **dai_links, int *be_id) |
1146 | 1144 | { |
1147 | 1145 | struct device *dev = card->dev; |
1148 | | - struct snd_soc_acpi_mach *mach = dev_get_platdata(dev); |
1149 | | - const struct sof_intel_dsp_desc *chip = get_chip_info(snd_soc_card_get_drvdata(card)); |
1150 | | - int port; |
1151 | | - |
1152 | | - if (!mach || !chip) |
1153 | | - return -EINVAL; |
1154 | | - |
1155 | | - port = (sof_sdw_quirk & SOF_BT_OFFLOAD_SSP_MASK) >> |
| 1146 | + int port = (sof_sdw_quirk & SOF_BT_OFFLOAD_SSP_MASK) >> |
1156 | 1147 | SOF_BT_OFFLOAD_SSP_SHIFT; |
1157 | | - |
1158 | | - /* Use the bt_link_mask from module parameters if provided |
1159 | | - * and if the SoC hardware IP version is ACE4 or newer. |
1160 | | - * This allows platform data to override which SSP is used |
1161 | | - * for Bluetooth offload. |
1162 | | - */ |
1163 | | - if (mach->mach_params.bt_link_mask && |
1164 | | - chip->hw_ip_version >= SOF_INTEL_ACE_4_0) { |
1165 | | - port = __ffs(mach->mach_params.bt_link_mask); |
1166 | | - dev_info(dev, "BT: using bt_link_mask override, SSP%d selected (ACE4+)\n", |
1167 | | - port); |
1168 | | - } |
1169 | | - |
1170 | 1148 | char *name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", port); |
1171 | 1149 | char *cpu_dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", port); |
1172 | 1150 | if (!name || !cpu_dai_name) |
|
0 commit comments