sound:starfive:spdif:Modify compatible name

1.Modify compatible name to 'starfive,jh7110-spdif'.
2.Remove spdif-receiver node.

Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com>

diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
old mode 100644 (file)
new mode 100755 (executable)
index 8de5586..52cc542
--- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
@@ -473,14 +473,6 @@
 };
 
 &spdif_transmitter {
-       compatible = "linux,spdif-dit";
-       #sound-dai-cells = <0>;
-       status = "disabled";
-};
-
-&spdif_receiver {
-       compatible = "linux,spdif-dir";
-       #sound-dai-cells = <0>;
        status = "disabled";
 };
 

diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts
old mode 100644 (file)
new mode 100755 (executable)
index 285d125..3ea9c0e
--- a/arch/riscv/boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts
@@ -70,6 +70,3 @@
        status = "okay";
 };
 
-&spdif_receiver {
-       status = "okay";
-};

diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi
index cccd577..08b0435 100755 (executable)
--- a/arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi
@@ -1177,7 +1177,7 @@
                };
 
                spdif0: spdif0@100a0000 {
-                       compatible = "starfive,sf-spdif";
+                       compatible = "starfive,jh7110-spdif";
                        reg = <0x0 0x100a0000 0x0 0x1000>;
                        clocks = <&clkgen JH7110_SPDIF_CLK_APB>,
                                 <&clkgen JH7110_SPDIF_CLK_CORE>,
@@ -1356,12 +1356,6 @@
                        status = "disabled";
                };
 
-               spdif_receiver: spdif_receiver {
-                       compatible = "linux,spdif-dir";
-                       #sound-dai-cells = <0>;
-                       status = "disabled";
-               };
-
                pwmdac_codec: pwmdac-transmitter {
                        compatible = "starfive,jh7110-pwmdac-dit";
                        #sound-dai-cells = <0>;

diff --git a/sound/soc/starfive/starfive_spdif.c b/sound/soc/starfive/starfive_spdif.c
index cbc5c42..aff3de1 100755 (executable)
--- a/sound/soc/starfive/starfive_spdif.c
+++ b/sound/soc/starfive/starfive_spdif.c
@@ -387,7 +387,7 @@ static struct snd_soc_dai_driver sf_spdif_dai = {
 };
 
 static const struct snd_soc_component_driver sf_spdif_component = {
-       .name = "sf-spdif",
+       .name = "starfive-spdif",
 };
 
 static const struct regmap_config sf_spdif_regmap_config = {
@@ -477,14 +477,14 @@ err_clk_disable:
 }
 
 static const struct of_device_id sf_spdif_of_match[] = {
-       { .compatible = "starfive,sf-spdif", },
+       { .compatible = "starfive,jh7110-spdif", },
        {},
 };
 MODULE_DEVICE_TABLE(of, sf_spdif_of_match);
 
 static struct platform_driver sf_spdif_driver = {
        .driver = {
-               .name = "sf-spdif",
+               .name = "starfive-spdif",
                .of_match_table = sf_spdif_of_match,
        },
        .probe = sf_spdif_probe,