Skip to content

Commit 60b1732

Browse files
committed
Revert "ASoC: snd_soc_of_parse_daifmt(): Handle SND_SOC_DAIFMT_SPDIF"
This reverts commit 7e44b46. On top of that it also removes the SND_SOC_DAIFMT_SPDIF defines. The spdif interface was not really being handled in any codec driver. In our DT's the SPDIF interface should be handled through the adv7511_audio code. This registers a platform device that is handled by the hdmi-codec sound codec that in turn handles SPDIF by setting a different macro named HDMI_SPDIF. That is what is used in the adv7511 code. Signed-off-by: Nuno Sá <[email protected]>
1 parent 1e9ebe8 commit 60b1732

File tree

3 files changed

+0
-3
lines changed

3 files changed

+0
-3
lines changed

include/sound/soc-dai.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ struct snd_compr_stream;
3131
#define SND_SOC_DAIFMT_DSP_B SND_SOC_DAI_FORMAT_DSP_B
3232
#define SND_SOC_DAIFMT_AC97 SND_SOC_DAI_FORMAT_AC97
3333
#define SND_SOC_DAIFMT_PDM SND_SOC_DAI_FORMAT_PDM
34-
#define SND_SOC_DAIFMT_SPDIF SND_SOC_DAI_FORMAT_SPDIF
3534

3635
/* left and right justified also known as MSB and LSB respectively */
3736
#define SND_SOC_DAIFMT_MSB SND_SOC_DAIFMT_LEFT_J

include/uapi/sound/asoc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@
154154
#define SND_SOC_DAI_FORMAT_DSP_B 5 /* L data MSB during FRM LRC */
155155
#define SND_SOC_DAI_FORMAT_AC97 6 /* AC97 */
156156
#define SND_SOC_DAI_FORMAT_PDM 7 /* Pulse density modulation */
157-
#define SND_SOC_DAI_FORMAT_SPDIF 8 /* SPDIF */
158157

159158
/* left and right justified also known as MSB and LSB respectively */
160159
#define SND_SOC_DAI_FORMAT_MSB SND_SOC_DAI_FORMAT_LEFT_J

sound/soc/soc-core.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3329,7 +3329,6 @@ unsigned int snd_soc_daifmt_parse_format(struct device_node *np,
33293329
{ "pdm", SND_SOC_DAIFMT_PDM},
33303330
{ "msb", SND_SOC_DAIFMT_MSB },
33313331
{ "lsb", SND_SOC_DAIFMT_LSB },
3332-
{ "spdif", SND_SOC_DAIFMT_SPDIF },
33333332
};
33343333

33353334
if (!prefix)

0 commit comments

Comments
 (0)