From 115f744544291c3529868e72f101df652b156e56 Mon Sep 17 00:00:00 2001 From: Daniel Matuschek Date: Tue, 3 Feb 2015 07:15:19 +0100 Subject: [PATCH 100/114] HiFiBerry Amp: fix device-tree problems Some code to load the driver based on device-tree-overlays was missing. This is added by this patch. --- sound/soc/bcm/hifiberry_amp.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sound/soc/bcm/hifiberry_amp.c b/sound/soc/bcm/hifiberry_amp.c index 1e87ee0..5903915 100644 --- a/sound/soc/bcm/hifiberry_amp.c +++ b/sound/soc/bcm/hifiberry_amp.c @@ -65,6 +65,12 @@ static struct snd_soc_card snd_rpi_hifiberry_amp = { .num_links = ARRAY_SIZE(snd_rpi_hifiberry_amp_dai), }; +static const struct of_device_id snd_rpi_hifiberry_amp_of_match[] = { + { .compatible = "hifiberry,hifiberry-amp", }, + {}, +}; +MODULE_DEVICE_TABLE(of, snd_rpi_hifiberry_amp_of_match); + static int snd_rpi_hifiberry_amp_probe(struct platform_device *pdev) { @@ -72,6 +78,20 @@ static int snd_rpi_hifiberry_amp_probe(struct platform_device *pdev) snd_rpi_hifiberry_amp.dev = &pdev->dev; + if (pdev->dev.of_node) { + struct device_node *i2s_node; + struct snd_soc_dai_link *dai = &snd_rpi_hifiberry_amp_dai[0]; + i2s_node = of_parse_phandle(pdev->dev.of_node, + "i2s-controller", 0); + + if (i2s_node) { + dai->cpu_dai_name = NULL; + dai->cpu_of_node = i2s_node; + dai->platform_name = NULL; + dai->platform_of_node = i2s_node; + } + } + ret = snd_soc_register_card(&snd_rpi_hifiberry_amp); if (ret != 0) { @@ -92,6 +112,7 @@ static struct platform_driver snd_rpi_hifiberry_amp_driver = { .driver = { .name = "snd-hifiberry-amp", .owner = THIS_MODULE, + .of_match_table = snd_rpi_hifiberry_amp_of_match, }, .probe = snd_rpi_hifiberry_amp_probe, .remove = snd_rpi_hifiberry_amp_remove, -- 1.8.3.2