]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: amd: ps: Propagate the PCI subsystem Vendor and
authorMark Brown <broonie@kernel.org>
Tue, 21 Oct 2025 18:05:19 +0000 (19:05 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 21 Oct 2025 18:05:19 +0000 (19:05 +0100)
Merge series from Simon Trimmer <simont@opensource.cirrus.com>:

This series of two patches propagates the PCI subsystem Vendor and Device
IDs so that they can be used by component drivers to differentiate
firmware loads.

1  2 
Documentation/devicetree/bindings/sound/qcom,sm8250.yaml
sound/soc/qcom/sc8280xp.c
sound/soc/sdw_utils/soc_sdw_utils.c

index aea8c1daff3281f6b724ab0d1f306555d8d5d910,187f37ffe3283713a2496e16ee58e91d58800f28..b34e63f29793551694103ce625af0d8abf387a42
@@@ -191,8 -191,8 +191,9 @@@ static int sc8280xp_platform_probe(stru
  }
  
  static const struct of_device_id snd_sc8280xp_dt_match[] = {
 +      {.compatible = "qcom,kaanapali-sndcard", "kaanapali"},
        {.compatible = "qcom,qcm6490-idp-sndcard", "qcm6490"},
+       {.compatible = "qcom,qcs615-sndcard", "qcs615"},
        {.compatible = "qcom,qcs6490-rb3gen2-sndcard", "qcs6490"},
        {.compatible = "qcom,qcs8275-sndcard", "qcs8300"},
        {.compatible = "qcom,qcs9075-sndcard", "sa8775p"},
index b75cb5c535d17a560bbdcaaaf928218fcebc0557,270c66b90228379116712a4596d357bca2abc0e9..92e071f6b0547d548cace21121a63da542bf4515
@@@ -323,9 -311,28 +323,29 @@@ struct asoc_sdw_codec_info codec_info_l
                },
                .dai_num = 1,
        },
+       {
+               .part_id = 0x1321,
+               .dais = {
+                       {
+                               .direction = {true, false},
+                               .dai_name = "rt1320-aif1",
+                               .component_name = "rt1320",
+                               .dai_type = SOC_SDW_DAI_TYPE_AMP,
+                               .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
+                               .init = asoc_sdw_rt_amp_init,
+                               .exit = asoc_sdw_rt_amp_exit,
+                               .rtd_init = asoc_sdw_rt_amp_spk_rtd_init,
+                               .controls = generic_spk_controls,
+                               .num_controls = ARRAY_SIZE(generic_spk_controls),
+                               .widgets = generic_spk_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_spk_widgets),
+                       },
+               },
+               .dai_num = 1,
+       },
        {
                .part_id = 0x714,
 +              .name_prefix = "rt714",
                .version_id = 3,
                .ignore_internal_dmic = true,
                .dais = {