Revert "ODROID-C4:arm64/dts:Support I2S sound card.(HiFi-shield series)"

This reverts commit be8dae9c1a45e7a20e6217957971b8c5b0946bb1.

diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
index 3ceefeb..aa18223 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
@@ -616,16 +616,11 @@
        };
 
        /* Audio Related start */
-       spdif_dit:spdif_dit{
-               compatible = "linux,spdif-dit";
+       dummy_codec:dummy{
                #sound-dai-cells = <0>;
+               compatible = "amlogic, aml_dummy_codec";
                status = "okay";
        };
-       pcm5102a: pcm5102a {
-               compatible = "ti,pcm5102a";
-               #sound-dai-cells = <0>;
-               status = "disabled";
-       };
        amlogic_codec:t9015{
                #sound-dai-cells = <0>;
                compatible = "amlogic, aml_codec_T9015";
@@ -633,7 +628,7 @@
                is_auge_used = <1>; /* meson or auge chipset used */
                tocodec_inout = <0>;
                tdmout_index = <2>;
-               status = "disabled";
+               status = "okay";
        };
        audio_effect:eqdrc{
                /*eq_enable = <1>;*/
@@ -651,10 +646,9 @@
                /* max 0xff, each bit for one channel */
                channel_mask = <0x3>;
        };
-       odroid_hdmi:odroid_hdmi {
+       auge_sound {
                compatible = "amlogic, g12a-sound-card";
-               aml-audio-card,name = "ODROID-HDMI";
-               status = "okay";
+               aml-audio-card,name = "AML-AUGESOUND";
 
                /* ODROID-C4: spdif_out GPIOAO_10(J7.2), HDMI out*/
                aml-audio-card,dai-link@0 {
@@ -665,17 +659,12 @@
                                system-clock-frequency = <6144000>;
                        };
                        codec {
-                               sound-dai = <&spdif_dit>;
+                               sound-dai = <&dummy_codec>;
                        };
                };
-       };
-       odroid_hifi:odroid_hifi {
-               compatible = "amlogic, g12a-sound-card";
-               aml-audio-card,name = "ODROID-HIFI";
-               status = "disabled";
 
                /* ODROID-C4: I2S out(J7)*/
-               aml-audio-card,dai-link@0 {
+               aml-audio-card,dai-link@1 {
                        format = "i2s";
                        mclk-fs = <256>;
                        bitclock-master = <&tdmb>;
@@ -689,31 +678,7 @@
                                system-clock-frequency = <12288000>;
                        };
                        codec {
-                               sound-dai = <&pcm5102a>;
-                       };
-               };
-       };
-       odroid_hifi2:odroid_hifi2 {
-               compatible = "amlogic, g12a-sound-card";
-               aml-audio-card,name = "ODROID-HIFI2";
-               status = "disabled";
-
-               /* ODROID-C4: I2S out(J7)*/
-               aml-audio-card,dai-link@0 {
-                       format = "i2s";
-                       mclk-fs = <256>;
-                       bitclock-master = <&tdmb>;
-                       frame-master = <&tdmb>;
-                       continuous-clock;
-                       cpu {
-                               sound-dai = <&tdmb>;
-                               dai-tdm-slot-tx-mask = <1 1>;
-                               dai-tdm-slot-num = <2>;
-                               dai-tdm-slot-width = <32>;
-                               system-clock-frequency = <12288000>;
-                       };
-                       codec {
-                               sound-dai = <&pcm5242>;
+                               sound-dai = <&dummy_codec>;
                        };
                };
        };
@@ -814,8 +779,8 @@
                compatible = "amlogic, sm1-snd-tdmb";
                #sound-dai-cells = <0>;
                dai-tdm-lane-slot-mask-out = <1 0 0 0>;
-               dai-tdm-clk-sel = <1>;
-               clocks = <&clkaudio CLKID_AUDIO_MCLK_B
+               dai-tdm-clk-sel = <0>;
+               clocks = <&clkaudio CLKID_AUDIO_MCLK_A
                                &clkc CLKID_MPLL0>;
                clock-names = "mclk", "clk_srcpll";
                pinctrl-names = "tdm_pins";
@@ -1089,19 +1054,6 @@
                compatible = "nxp,pcf8563";
                reg = <0x51>;
        };
-
-       pcm5242: pcm5242@4c {
-               compatible = "ti,pcm5242";
-               reg = <0x4c>;
-               #sound-dai-cells = <0>;
-               status = "disabled";
-
-               /*
-               AVDD-supply = <&reg_3v3_analog>;
-               DVDD-supply = <&reg_1v8>;
-               CPVDD-supply = <&reg_3v3>;
-               */
-       };
 };
 
 &i2c3 {

diff --git a/arch/arm64/configs/odroidg12_defconfig b/arch/arm64/configs/odroidg12_defconfig
index cc9b8bd..956b942 100644 (file)
--- a/arch/arm64/configs/odroidg12_defconfig
+++ b/arch/arm64/configs/odroidg12_defconfig
@@ -4523,9 +4523,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_PCM179X_SPI is not set
 # CONFIG_SND_SOC_PCM3168A_I2C is not set
 # CONFIG_SND_SOC_PCM3168A_SPI is not set
-CONFIG_SND_SOC_PCM5102A=y
-CONFIG_SND_SOC_PCM512x=y
-CONFIG_SND_SOC_PCM512x_I2C=y
+# CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set

diff --git a/sound/soc/amlogic/auge/Kconfig b/sound/soc/amlogic/auge/Kconfig
index 99a320c..eafeb0d 100644 (file)
--- a/sound/soc/amlogic/auge/Kconfig
+++ b/sound/soc/amlogic/auge/Kconfig
@@ -1,6 +1,5 @@
 menuconfig AMLOGIC_SND_SOC_AUGE
        bool "Amlogic Auge ASoC"
-       select SND_SOC_PCM5102A
        default n
        help
                Say Y or M if you want to add support for codecs attached to