The kirkwood pcm/dma driver is used without DT in the Kirkwood machine. This patch adds a DT compatible definition for use in other Marvell machines as the Armada 88AP510 (Dove).
Signed-off-by: Jean-Francois Moine moinejf@free.fr --- Documentation/devicetree/bindings/sound/kirkwood-dma.txt | 11 +++++++++++ sound/soc/kirkwood/kirkwood-dma.c | 11 +++++++++++ 2 files changed, 22 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/kirkwood-dma.txt b/Documentation/devicetree/bindings/sound/kirkwood-dma.txt new file mode 100644 index 0000000..9dd2989 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/kirkwood-dma.txt @@ -0,0 +1,11 @@ +* mvebu (Kirkwood, Dove, Armada 370) PCM/DMA controller + +Required properties: + +- compatible: "marvell,mvebu-pcm-audio" + +Example: + +pcm: pcm { + compatible = "marvell,mvebu-pcm-audio"; +}; diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c index a9f1453..b91045a 100644 --- a/sound/soc/kirkwood/kirkwood-dma.c +++ b/sound/soc/kirkwood/kirkwood-dma.c @@ -19,6 +19,8 @@ #include <linux/dma-mapping.h> #include <linux/mbus.h> #include <sound/soc.h> +#include <linux/of.h> + #include "kirkwood.h"
#define KIRKWOOD_RATES \ @@ -383,10 +385,19 @@ static int kirkwood_soc_platform_remove(struct platform_device *pdev) return 0; }
+#ifdef CONFIG_OF +static struct of_device_id kirkwood_pcm_of_match[] = { + { .compatible = "marvell,mvebu-pcm-audio" }, + { } +}; +MODULE_DEVICE_TABLE(of, kirkwood_pcm_of_match); +#endif + static struct platform_driver kirkwood_pcm_driver = { .driver = { .name = "kirkwood-pcm-audio", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(kirkwood_pcm_of_match), },
.probe = kirkwood_soc_platform_probe,