CR_2071_audio_compatible_standard_515

Standardization naming of compatible for device id and dts

Signed-off-by: Walker Chen <walker.chen@starfivetech.com>

diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi
index 6ed66a1..579e484 100755 (executable)
--- a/arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi
@@ -1151,7 +1151,7 @@
                };
 
                tdm: tdm@10090000 {
-                       compatible = "starfive,sf-tdm";
+                       compatible = "starfive,jh7110-tdm";
                        reg = <0x0 0x10090000 0x0 0x1000>;
                        reg-names = "tdm";
                        clocks = <&clkgen JH7110_AHB0>,
@@ -1219,7 +1219,7 @@
                };
 
                pdm: pdm@100d0000 {
-                       compatible = "starfive,sf-pdm";
+                       compatible = "starfive,jh7110-pdm";
                        reg = <0x0 0x100d0000 0x0 0x1000>;
                        reg-names = "pdm";
                        clocks = <&clkgen JH7110_PDM_CLK_DMIC>,
@@ -1238,7 +1238,7 @@
                };
 
                i2srx_mst: i2srx_mst@100e0000 {
-                       compatible = "snps,i2srx-master";
+                       compatible = "starfive,jh7110-i2srx-master";
                        reg = <0x0 0x100e0000 0x0 0x1000>;
                        clocks = <&clkgen JH7110_APB0>,
                                 <&clkgen JH7110_I2SRX0_3CH_CLK_APB>,

diff --git a/sound/soc/starfive/i2srx-master.c b/sound/soc/starfive/i2srx-master.c
index d6e96bd..b13b414 100644 (file)
--- 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 64d98b9..5f8e910 100644 (file)
--- 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
old mode 100755 (executable)
new mode 100644 (file)
index 6a154b6..9d5a8ec
--- 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,