1 From 53a42fe2c62f1a21329c737321f59e0ab97ac655 Mon Sep 17 00:00:00 2001
2 From: Clive Messer <clive.m.messer@gmail.com>
3 Date: Thu, 2 Apr 2015 12:22:55 +0100
4 Subject: [PATCH 062/222] Add Device Tree support for RPi-DAC.
7 sound/soc/bcm/rpi-dac.c | 21 +++++++++++++++++++++
8 sound/soc/codecs/pcm1794a.c | 7 +++++++
9 2 files changed, 28 insertions(+)
11 --- a/sound/soc/bcm/rpi-dac.c
12 +++ b/sound/soc/bcm/rpi-dac.c
13 @@ -69,6 +69,20 @@ static int snd_rpi_rpi_dac_probe(struct
16 snd_rpi_rpi_dac.dev = &pdev->dev;
18 + if (pdev->dev.of_node) {
19 + struct device_node *i2s_node;
20 + struct snd_soc_dai_link *dai = &snd_rpi_rpi_dac_dai[0];
21 + i2s_node = of_parse_phandle(pdev->dev.of_node, "i2s-controller", 0);
24 + dai->cpu_dai_name = NULL;
25 + dai->cpu_of_node = i2s_node;
26 + dai->platform_name = NULL;
27 + dai->platform_of_node = i2s_node;
31 ret = snd_soc_register_card(&snd_rpi_rpi_dac);
33 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
34 @@ -81,10 +95,17 @@ static int snd_rpi_rpi_dac_remove(struct
35 return snd_soc_unregister_card(&snd_rpi_rpi_dac);
38 +static const struct of_device_id snd_rpi_rpi_dac_of_match[] = {
39 + { .compatible = "rpi,rpi-dac", },
42 +MODULE_DEVICE_TABLE(of, snd_rpi_rpi_dac_of_match);
44 static struct platform_driver snd_rpi_rpi_dac_driver = {
46 .name = "snd-rpi-dac",
48 + .of_match_table = snd_rpi_rpi_dac_of_match,
50 .probe = snd_rpi_rpi_dac_probe,
51 .remove = snd_rpi_rpi_dac_remove,
52 --- a/sound/soc/codecs/pcm1794a.c
53 +++ b/sound/soc/codecs/pcm1794a.c
54 @@ -46,12 +46,19 @@ static int pcm1794a_remove(struct platfo
58 +static const struct of_device_id pcm1794a_of_match[] = {
59 + { .compatible = "ti,pcm1794a", },
62 +MODULE_DEVICE_TABLE(of, pcm1794a_of_match);
64 static struct platform_driver pcm1794a_codec_driver = {
65 .probe = pcm1794a_probe,
66 .remove = pcm1794a_remove,
68 .name = "pcm1794a-codec",
70 + .of_match_table = of_match_ptr(pcm1794a_of_match),