diff options
| author | andy.hu <andy.hu@starfivetech.com> | 2022-09-07 06:39:58 +0300 |
|---|---|---|
| committer | andy.hu <andy.hu@starfivetech.com> | 2022-09-07 06:39:58 +0300 |
| commit | f3ae3915ef49545bb831ca7471822a8ce306ed39 (patch) | |
| tree | 9868aa3b83543f2bdffae112580e816ffa749429 /sound | |
| parent | 48e4af86a9c9baed1f711b81a158e8c788b8de2f (diff) | |
| parent | abd5f99857c5a2d2b0effd5263396fa466952846 (diff) | |
| download | linux-f3ae3915ef49545bb831ca7471822a8ce306ed39.tar.xz | |
Merge branch 'CR_2071_compatible_standard_515_walker.chen' into 'jh7110-5.15.y-devel'
CR_2071_audio_compatible_standard_515
See merge request sdk/linux!450
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/starfive/i2srx-master.c | 6 | ||||
| -rw-r--r-- | sound/soc/starfive/starfive_pdm.c | 7 | ||||
| -rw-r--r--[-rwxr-xr-x] | sound/soc/starfive/starfive_tdm.c | 7 |
3 files changed, 9 insertions, 11 deletions
diff --git a/sound/soc/starfive/i2srx-master.c b/sound/soc/starfive/i2srx-master.c index d6e96bd0365f..b13b41411d6b 100644 --- a/sound/soc/starfive/i2srx-master.c +++ b/sound/soc/starfive/i2srx-master.c @@ -774,7 +774,7 @@ static int dw_i2s_probe(struct platform_device *pdev) } } - if (of_device_is_compatible(np, "snps,i2srx-master")) { + if (of_device_is_compatible(np, "starfive,jh7110-i2srx-master")) { /* config i2s data source: PDM */ regmap_update_bits(dev->syscon_base, dev->syscon_offset_34, AUDIO_SDIN_MUX_MASK, I2SRX_DATA_SRC_PDM); @@ -849,7 +849,7 @@ static int dw_i2s_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id dw_i2s_of_match[] = { - { .compatible = "snps,i2srx-master", }, + { .compatible = "starfive,jh7110-i2srx-master", }, {}, }; @@ -864,7 +864,7 @@ static struct platform_driver dw_i2s_driver = { .probe = dw_i2s_probe, .remove = dw_i2s_remove, .driver = { - .name = "designware-i2srx-master", + .name = "i2srx-master", .of_match_table = of_match_ptr(dw_i2s_of_match), .pm = &dwc_pm_ops, }, diff --git a/sound/soc/starfive/starfive_pdm.c b/sound/soc/starfive/starfive_pdm.c index 64d98b96f094..5f8e910a8b4f 100644 --- a/sound/soc/starfive/starfive_pdm.c +++ b/sound/soc/starfive/starfive_pdm.c @@ -249,7 +249,7 @@ static int pdm_probe(struct snd_soc_component *component) } static const struct snd_soc_component_driver sf_pdm_component_drv = { - .name = "sf-pdm", + .name = "jh7110-pdm", .probe = pdm_probe, }; @@ -415,15 +415,14 @@ static int sf_pdm_dev_remove(struct platform_device *pdev) } static const struct of_device_id sf_pdm_of_match[] = { - {.compatible = "starfive,sf-pdm",}, + {.compatible = "starfive,jh7110-pdm",}, {} }; MODULE_DEVICE_TABLE(of, sf_pdm_of_match); static struct platform_driver sf_pdm_driver = { - .driver = { - .name = "sf-pdm", + .name = "jh7110-pdm", .of_match_table = sf_pdm_of_match, }, .probe = sf_pdm_probe, diff --git a/sound/soc/starfive/starfive_tdm.c b/sound/soc/starfive/starfive_tdm.c index 6a154b6a6bf0..9d5a8eccd963 100755..100644 --- a/sound/soc/starfive/starfive_tdm.c +++ b/sound/soc/starfive/starfive_tdm.c @@ -147,7 +147,7 @@ static int sf_pcm_trigger(struct snd_soc_component *component, } static const struct snd_soc_component_driver sf_tdm_component = { - .name = "sf-tdm", + .name = "jh7110-tdm", .suspend = sf_tdm_suspend, .resume = sf_tdm_resume, .trigger = sf_pcm_trigger, @@ -600,15 +600,14 @@ static int sf_tdm_dev_remove(struct platform_device *pdev) return 0; } static const struct of_device_id sf_tdm_of_match[] = { - {.compatible = "starfive,sf-tdm",}, + {.compatible = "starfive,jh7110-tdm",}, {} }; MODULE_DEVICE_TABLE(of, sf_tdm_of_match); static struct platform_driver sf_tdm_driver = { - .driver = { - .name = "sf-tdm", + .name = "jh7110-tdm", .of_match_table = sf_tdm_of_match, }, .probe = sf_tdm_probe, |