Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d238ffab authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/spdif' into asoc-next

parents 0c5f4506 f9c8ba89

Documentation/devicetree/bindings/sound/spdif-receiver.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
Device-Tree bindings for dummy spdif receiver



Required properties:

	- compatible: should be "linux,spdif-dir".



Example node:



	codec: spdif-receiver {

		compatible = "linux,spdif-dir";

	};

Documentation/devicetree/bindings/sound/spdif-transmitter.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
Device-Tree bindings for dummy spdif transmitter



Required properties:

	- compatible: should be "linux,spdif-dit".



Example node:



	codec: spdif-transmitter {

		compatible = "linux,spdif-dit";

	};

sound/soc/codecs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ snd-soc-alc5632-objs := alc5632.o 
snd-soc-sigmadsp-objs := sigmadsp.o

snd-soc-si476x-objs := si476x.o

snd-soc-sn95031-objs := sn95031.o

snd-soc-spdif-tx-objs := spdif_transciever.o

snd-soc-spdif-tx-objs := spdif_transmitter.o

snd-soc-spdif-rx-objs := spdif_receiver.o

snd-soc-ssm2602-objs := ssm2602.o

snd-soc-sta32x-objs := sta32x.o

sound/soc/codecs/spdif_receiver.c

+10 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <sound/soc.h>

#include <sound/pcm.h>

#include <sound/initval.h>

#include <linux/of.h>



#define STUB_RATES	SNDRV_PCM_RATE_8000_192000

#define STUB_FORMATS	(SNDRV_PCM_FMTBIT_S16_LE | \
@@ -51,12 +52,21 @@ static int spdif_dir_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_OF

static const struct of_device_id spdif_dir_dt_ids[] = {

	{ .compatible = "linux,spdif-dir", },

	{ }

};

MODULE_DEVICE_TABLE(of, spdif_dir_dt_ids);

#endif



static struct platform_driver spdif_dir_driver = {

	.probe		= spdif_dir_probe,

	.remove		= spdif_dir_remove,

	.driver		= {

		.name	= "spdif-dir",

		.owner	= THIS_MODULE,

		.of_match_table = of_match_ptr(spdif_dir_dt_ids),

	},

};

sound/soc/codecs/spdif_transciever.c→sound/soc/codecs/spdif_transmitter.c

+10 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <sound/soc.h>

#include <sound/pcm.h>

#include <sound/initval.h>

#include <linux/of.h>



#define DRV_NAME "spdif-dit"
@@ -52,12 +53,21 @@ static int spdif_dit_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_OF

static const struct of_device_id spdif_dit_dt_ids[] = {

	{ .compatible = "linux,spdif-dit", },

	{ }

};

MODULE_DEVICE_TABLE(of, spdif_dit_dt_ids);

#endif



static struct platform_driver spdif_dit_driver = {

	.probe		= spdif_dit_probe,

	.remove		= spdif_dit_remove,

	.driver		= {

		.name	= DRV_NAME,

		.owner	= THIS_MODULE,

		.of_match_table = of_match_ptr(spdif_dit_dt_ids),

	},

};