2 files changed, 218 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt
new file mode 100644
index 000000000000..769a346f890c
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/simple-card.txt
@@ -0,0 +1,68 @@
+Simple-Card:
+Simple-Card specifies audio DAI connection of SoC <-> codec.
+Required properties:
+- compatible                            : "simple-audio-card"
+Optional properties:
+- simple-audio-card,format              : CPU/CODEC common audio format.
+                                        "i2s", "right_j", "left_j" , "dsp_a"
+                                        "dsp_b", "ac97", "pdm", "msb", "lsb"
+Required subnodes:
+- simple-audio-card,cpu                 : CPU   sub-node
+- simple-audio-card,codec               : CODEC sub-node
+Required CPU/CODEC subnodes properties:
+- sound-dai                             : phandle and port of CPU/CODEC
+Optional CPU/CODEC subnodes properties:
+- format                                : CPU/CODEC specific audio format if needed.
+                                          see simple-audio-card,format
+- frame-master                          : bool property. add this if subnode is frame master
+- bitclock-master                       : bool property. add this if subnode is bitclock master
+- bitclock-inversion                    : bool property. add this if subnode has clock inversion
+- frame-inversion                       : bool property. add this if subnode has frame inversion
+- clocks / system-clock-frequency       : specify subnode's clock if needed.
+                                          it can be specified via "clocks" if system has
+                                          clock node (= common clock), or "system-clock-frequency"
+                                          (if system doens't support common clock)
+Example:
+sound {
+        compatible = "simple-audio-card";
+        simple-audio-card,format = "left_j";
+        simple-audio-card,cpu {
+                sound-dai = <&sh_fsi2 0>;
+        };
+        simple-audio-card,codec {
+                sound-dai = <&ak4648>;
+                bitclock-master;
+                frame-master;
+                clocks = <&osc>;
+        };
+};
+&i2c0 {
+        ak4648: ak4648@12 {
+                #sound-dai-cells = <0>;
+                compatible = "asahi-kasei,ak4648";
+                reg = <0x12>;
+        };
+};
+sh_fsi2: sh_fsi2@ec230000 {
+        #sound-dai-cells = <1>;
+        compatible = "renesas,sh_fsi2";
+        reg = <0xec230000 0x400>;
+        interrupt-parent = <&gic>;
+        interrupts = <0 146 0x4>;
+};
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index b2fbb7075a6c..7a9b6b4898c0 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -8,7 +8,8 @@
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 */
+#include <linux/clk.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
 #include <sound/simple_card.h>
@@ -57,11 +58,144 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
        return 0;
 }
+static int
+asoc_simple_card_sub_parse_of(struct device_node *np,
+                              struct asoc_simple_dai *dai,
+                              struct device_node **node)
+{
+        struct clk *clk;
+        int ret;
+        /*
+         * get node via "sound-dai = <&phandle port>"
+         * it will be used as xxx_of_node on soc_bind_dai_link()
+         */
+        *node = of_parse_phandle(np, "sound-dai", 0);
+        if (!*node)
+                return -ENODEV;
+        /* get dai->name */
+        ret = snd_soc_of_get_dai_name(np, &dai->name);
+        if (ret < 0)
+                goto parse_error;
+        /*
+         * bitclock-inversion, frame-inversion
+         * bitclock-master,    frame-master
+         * and specific "format" if it has
+         */
+        dai->fmt = snd_soc_of_parse_daifmt(np, NULL);
+        /*
+         * dai->sysclk come from
+         *  "clocks = <&xxx>" (if system has common clock)
+         *  or "system-clock-frequency = <xxx>"
+         */
+        clk = of_clk_get(np, 0);
+        if (IS_ERR(clk))
+                of_property_read_u32(np,
+                                     "system-clock-frequency",
+                                     &dai->sysclk);
+        else
+                dai->sysclk = clk_get_rate(clk);
+        ret = 0;
+parse_error:
+        of_node_put(*node);
+        return ret;
+}
+static int asoc_simple_card_parse_of(struct device_node *node,
+                                     struct asoc_simple_card_info *info,
+                                     struct device *dev,
+                                     struct device_node **of_cpu,
+                                     struct device_node **of_codec,
+                                     struct device_node **of_platform)
+{
+        struct device_node *np;
+        char *name;
+        int ret = 0;
+        /* get CPU/CODEC common format via simple-audio-card,format */
+        info->daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,") &
+                (SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK);
+        /* CPU sub-node */
+        ret = -EINVAL;
+        np = of_get_child_by_name(node, "simple-audio-card,cpu");
+        if (np)
+                ret = asoc_simple_card_sub_parse_of(np,
+                                                  &info->cpu_dai,
+                                                  of_cpu);
+        if (ret < 0)
+                return ret;
+        /* CODEC sub-node */
+        ret = -EINVAL;
+        np = of_get_child_by_name(node, "simple-audio-card,codec");
+        if (np)
+                ret = asoc_simple_card_sub_parse_of(np,
+                                                  &info->codec_dai,
+                                                  of_codec);
+        if (ret < 0)
+                return ret;
+        /* card name is created from CPU/CODEC dai name */
+        name = devm_kzalloc(dev,
+                            strlen(info->cpu_dai.name)   +
+                            strlen(info->codec_dai.name) + 2,
+                            GFP_KERNEL);
+        sprintf(name, "%s-%s", info->cpu_dai.name, info->codec_dai.name);
+        info->name = info->card = name;
+        /* simple-card assumes platform == cpu */
+        *of_platform = *of_cpu;
+        dev_dbg(dev, "card-name : %s\n", info->card);
+        dev_dbg(dev, "platform : %04x\n", info->daifmt);
+        dev_dbg(dev, "cpu : %s / %04x / %d\n",
+                info->cpu_dai.name,
+                info->cpu_dai.fmt,
+                info->cpu_dai.sysclk);
+        dev_dbg(dev, "codec : %s / %04x / %d\n",
+                info->codec_dai.name,
+                info->codec_dai.fmt,
+                info->codec_dai.sysclk);
+        return 0;
+}
 static int asoc_simple_card_probe(struct platform_device *pdev)
 {
-        struct asoc_simple_card_info *cinfo = pdev->dev.platform_data;
+        struct asoc_simple_card_info *cinfo;
+        struct device_node *np = pdev->dev.of_node;
+        struct device_node *of_cpu, *of_codec, *of_platform;
        struct device *dev = &pdev->dev;
+        cinfo           = NULL;
+        of_cpu          = NULL;
+        of_codec        = NULL;
+        of_platform     = NULL;
+        if (np && of_device_is_available(np)) {
+                cinfo = devm_kzalloc(dev, sizeof(*cinfo), GFP_KERNEL);
+                if (cinfo) {
+                        int ret;
+                        ret = asoc_simple_card_parse_of(np, cinfo, dev,
+                                                        &of_cpu,
+                                                        &of_codec,
+                                                        &of_platform);
+                        if (ret < 0) {
+                                if (ret != -EPROBE_DEFER)
+                                        dev_err(dev, "parse error %d\n", ret);
+                                return ret;
+                        }
+                }
+        } else {
+                cinfo = pdev->dev.platform_data;
+        }
        if (!cinfo) {
                dev_err(dev, "no info for asoc-simple-card\n");
                return -EINVAL;
@@ -69,10 +203,10 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
        if (!cinfo->name        ||
            !cinfo->card        ||
-            !cinfo->codec       ||
+            !cinfo->codec_dai.name      ||
-            !cinfo->platform    ||
+            !(cinfo->codec              || of_codec)    ||
-            !cinfo->cpu_dai.name ||
+            !(cinfo->platform           || of_platform) ||
-            !cinfo->codec_dai.name) {
+            !(cinfo->cpu_dai.name       || of_cpu)) {
                dev_err(dev, "insufficient asoc_simple_card_info settings\n");
                return -EINVAL;
        }
@@ -86,6 +220,9 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
        cinfo->snd_link.platform_name   = cinfo->platform;
        cinfo->snd_link.codec_name      = cinfo->codec;
        cinfo->snd_link.codec_dai_name  = cinfo->codec_dai.name;
+        cinfo->snd_link.cpu_of_node     = of_cpu;
+        cinfo->snd_link.codec_of_node   = of_codec;
+        cinfo->snd_link.platform_of_node = of_platform;
        cinfo->snd_link.init            = asoc_simple_card_dai_init;
        /*
@@ -107,10 +244,17 @@ static int asoc_simple_card_remove(struct platform_device *pdev)
        return snd_soc_unregister_card(&cinfo->snd_card);
 }
+static const struct of_device_id asoc_simple_of_match[] = {
+        { .compatible = "simple-audio-card", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, asoc_simple_of_match);
 static struct platform_driver asoc_simple_card = {
        .driver = {
                .name   = "asoc-simple-card",
                .owner = THIS_MODULE,
+                .of_match_table = asoc_simple_of_match,
        },
        .probe          = asoc_simple_card_probe,
        .remove         = asoc_simple_card_remove,

diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt new file mode 100644 index 000000000000..769a346f890c --- /dev/null +++ b/Documentation/devicetree/bindings/sound/simple-card.txt
@@ -0,0 +1,68 @@
		1	Simple-Card:
		2
		3	Simple-Card specifies audio DAI connection of SoC <-> codec.
		4
		5	Required properties:
		6
		7	- compatible : "simple-audio-card"
		8
		9	Optional properties:
		10
		11	- simple-audio-card,format : CPU/CODEC common audio format.
		12	"i2s", "right_j", "left_j" , "dsp_a"
		13	"dsp_b", "ac97", "pdm", "msb", "lsb"
		14	Required subnodes:
		15
		16	- simple-audio-card,cpu : CPU sub-node
		17	- simple-audio-card,codec : CODEC sub-node
		18
		19	Required CPU/CODEC subnodes properties:
		20
		21	- sound-dai : phandle and port of CPU/CODEC
		22
		23	Optional CPU/CODEC subnodes properties:
		24
		25	- format : CPU/CODEC specific audio format if needed.
		26	see simple-audio-card,format
		27	- frame-master : bool property. add this if subnode is frame master
		28	- bitclock-master : bool property. add this if subnode is bitclock master
		29	- bitclock-inversion : bool property. add this if subnode has clock inversion
		30	- frame-inversion : bool property. add this if subnode has frame inversion
		31	- clocks / system-clock-frequency : specify subnode's clock if needed.
		32	it can be specified via "clocks" if system has
		33	clock node (= common clock), or "system-clock-frequency"
		34	(if system doens't support common clock)
		35
		36	Example:
		37
		38	sound {
		39	compatible = "simple-audio-card";
		40	simple-audio-card,format = "left_j";
		41
		42	simple-audio-card,cpu {
		43	sound-dai = <&sh_fsi2 0>;
		44	};
		45
		46	simple-audio-card,codec {
		47	sound-dai = <&ak4648>;
		48	bitclock-master;
		49	frame-master;
		50	clocks = <&osc>;
		51	};
		52	};
		53
		54	&i2c0 {
		55	ak4648: ak4648@12 {
		56	#sound-dai-cells = <0>;
		57	compatible = "asahi-kasei,ak4648";
		58	reg = <0x12>;
		59	};
		60	};
		61
		62	sh_fsi2: sh_fsi2@ec230000 {
		63	#sound-dai-cells = <1>;
		64	compatible = "renesas,sh_fsi2";
		65	reg = <0xec230000 0x400>;
		66	interrupt-parent = <&gic>;
		67	interrupts = <0 146 0x4>;
		68	};


diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index b2fbb7075a6c..7a9b6b4898c0 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c
@@ -8,7 +8,8 @@
8	* it under the terms of the GNU General Public License version 2 as	8	* it under the terms of the GNU General Public License version 2 as
9	* published by the Free Software Foundation.	9	* published by the Free Software Foundation.
10	*/	10	*/
11		11	#include <linux/clk.h>
		12	#include <linux/of.h>
12	#include <linux/platform_device.h>	13	#include <linux/platform_device.h>
13	#include <linux/module.h>	14	#include <linux/module.h>
14	#include <sound/simple_card.h>	15	#include <sound/simple_card.h>
@@ -57,11 +58,144 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
57	return 0;	58	return 0;
58	}	59	}
59		60
		61	static int
		62	asoc_simple_card_sub_parse_of(struct device_node *np,
		63	struct asoc_simple_dai *dai,
		64	struct device_node **node)
		65	{
		66	struct clk *clk;
		67	int ret;
		68
		69	/*
		70	* get node via "sound-dai = <&phandle port>"
		71	* it will be used as xxx_of_node on soc_bind_dai_link()
		72	*/
		73	*node = of_parse_phandle(np, "sound-dai", 0);
		74	if (!*node)
		75	return -ENODEV;
		76
		77	/* get dai->name */
		78	ret = snd_soc_of_get_dai_name(np, &dai->name);
		79	if (ret < 0)
		80	goto parse_error;
		81
		82	/*
		83	* bitclock-inversion, frame-inversion
		84	* bitclock-master, frame-master
		85	* and specific "format" if it has
		86	*/
		87	dai->fmt = snd_soc_of_parse_daifmt(np, NULL);
		88
		89	/*
		90	* dai->sysclk come from
		91	* "clocks = <&xxx>" (if system has common clock)
		92	* or "system-clock-frequency = <xxx>"
		93	*/
		94	clk = of_clk_get(np, 0);
		95	if (IS_ERR(clk))
		96	of_property_read_u32(np,
		97	"system-clock-frequency",
		98	&dai->sysclk);
		99	else
		100	dai->sysclk = clk_get_rate(clk);
		101
		102	ret = 0;
		103
		104	parse_error:
		105	of_node_put(*node);
		106
		107	return ret;
		108	}
		109
		110	static int asoc_simple_card_parse_of(struct device_node *node,
		111	struct asoc_simple_card_info *info,
		112	struct device *dev,
		113	struct device_node **of_cpu,
		114	struct device_node **of_codec,
		115	struct device_node **of_platform)
		116	{
		117	struct device_node *np;
		118	char *name;
		119	int ret = 0;
		120
		121	/* get CPU/CODEC common format via simple-audio-card,format */
		122	info->daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,") &
		123	(SND_SOC_DAIFMT_FORMAT_MASK \| SND_SOC_DAIFMT_INV_MASK);
		124
		125	/* CPU sub-node */
		126	ret = -EINVAL;
		127	np = of_get_child_by_name(node, "simple-audio-card,cpu");
		128	if (np)
		129	ret = asoc_simple_card_sub_parse_of(np,
		130	&info->cpu_dai,
		131	of_cpu);
		132	if (ret < 0)
		133	return ret;
		134
		135	/* CODEC sub-node */
		136	ret = -EINVAL;
		137	np = of_get_child_by_name(node, "simple-audio-card,codec");
		138	if (np)
		139	ret = asoc_simple_card_sub_parse_of(np,
		140	&info->codec_dai,
		141	of_codec);
		142	if (ret < 0)
		143	return ret;
		144
		145	/* card name is created from CPU/CODEC dai name */
		146	name = devm_kzalloc(dev,
		147	strlen(info->cpu_dai.name) +
		148	strlen(info->codec_dai.name) + 2,
		149	GFP_KERNEL);
		150	sprintf(name, "%s-%s", info->cpu_dai.name, info->codec_dai.name);
		151	info->name = info->card = name;
		152
		153	/* simple-card assumes platform == cpu */
		154	of_platform = of_cpu;
		155
		156	dev_dbg(dev, "card-name : %s\n", info->card);
		157	dev_dbg(dev, "platform : %04x\n", info->daifmt);
		158	dev_dbg(dev, "cpu : %s / %04x / %d\n",
		159	info->cpu_dai.name,
		160	info->cpu_dai.fmt,
		161	info->cpu_dai.sysclk);
		162	dev_dbg(dev, "codec : %s / %04x / %d\n",
		163	info->codec_dai.name,
		164	info->codec_dai.fmt,
		165	info->codec_dai.sysclk);
		166
		167	return 0;
		168	}
		169
60	static int asoc_simple_card_probe(struct platform_device *pdev)	170	static int asoc_simple_card_probe(struct platform_device *pdev)
61	{	171	{
62	struct asoc_simple_card_info *cinfo = pdev->dev.platform_data;	172	struct asoc_simple_card_info *cinfo;
		173	struct device_node *np = pdev->dev.of_node;
		174	struct device_node of_cpu, of_codec, *of_platform;
63	struct device *dev = &pdev->dev;	175	struct device *dev = &pdev->dev;
64		176
		177	cinfo = NULL;
		178	of_cpu = NULL;
		179	of_codec = NULL;
		180	of_platform = NULL;
		181	if (np && of_device_is_available(np)) {
		182	cinfo = devm_kzalloc(dev, sizeof(*cinfo), GFP_KERNEL);
		183	if (cinfo) {
		184	int ret;
		185	ret = asoc_simple_card_parse_of(np, cinfo, dev,
		186	&of_cpu,
		187	&of_codec,
		188	&of_platform);
		189	if (ret < 0) {
		190	if (ret != -EPROBE_DEFER)
		191	dev_err(dev, "parse error %d\n", ret);
		192	return ret;
		193	}
		194	}
		195	} else {
		196	cinfo = pdev->dev.platform_data;
		197	}
		198
65	if (!cinfo) {	199	if (!cinfo) {
66	dev_err(dev, "no info for asoc-simple-card\n");	200	dev_err(dev, "no info for asoc-simple-card\n");
67	return -EINVAL;	201	return -EINVAL;
@@ -69,10 +203,10 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
69		203
70	if (!cinfo->name \|\|	204	if (!cinfo->name \|\|
71	!cinfo->card \|\|	205	!cinfo->card \|\|
72	!cinfo->codec \|\|	206	!cinfo->codec_dai.name \|\|
73	!cinfo->platform \|\|	207	!(cinfo->codec \|\| of_codec) \|\|
74	!cinfo->cpu_dai.name \|\|	208	!(cinfo->platform \|\| of_platform) \|\|
75	!cinfo->codec_dai.name) {	209	!(cinfo->cpu_dai.name \|\| of_cpu)) {
76	dev_err(dev, "insufficient asoc_simple_card_info settings\n");	210	dev_err(dev, "insufficient asoc_simple_card_info settings\n");
77	return -EINVAL;	211	return -EINVAL;
78	}	212	}
@@ -86,6 +220,9 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
86	cinfo->snd_link.platform_name = cinfo->platform;	220	cinfo->snd_link.platform_name = cinfo->platform;
87	cinfo->snd_link.codec_name = cinfo->codec;	221	cinfo->snd_link.codec_name = cinfo->codec;
88	cinfo->snd_link.codec_dai_name = cinfo->codec_dai.name;	222	cinfo->snd_link.codec_dai_name = cinfo->codec_dai.name;
		223	cinfo->snd_link.cpu_of_node = of_cpu;
		224	cinfo->snd_link.codec_of_node = of_codec;
		225	cinfo->snd_link.platform_of_node = of_platform;
89	cinfo->snd_link.init = asoc_simple_card_dai_init;	226	cinfo->snd_link.init = asoc_simple_card_dai_init;
90		227
91	/*	228	/*
@@ -107,10 +244,17 @@ static int asoc_simple_card_remove(struct platform_device *pdev)
107	return snd_soc_unregister_card(&cinfo->snd_card);	244	return snd_soc_unregister_card(&cinfo->snd_card);
108	}	245	}
109		246
		247	static const struct of_device_id asoc_simple_of_match[] = {
		248	{ .compatible = "simple-audio-card", },
		249	{},
		250	};
		251	MODULE_DEVICE_TABLE(of, asoc_simple_of_match);
		252
110	static struct platform_driver asoc_simple_card = {	253	static struct platform_driver asoc_simple_card = {
111	.driver = {	254	.driver = {
112	.name = "asoc-simple-card",	255	.name = "asoc-simple-card",
113	.owner = THIS_MODULE,	256	.owner = THIS_MODULE,
		257	.of_match_table = asoc_simple_of_match,
114	},	258	},
115	.probe = asoc_simple_card_probe,	259	.probe = asoc_simple_card_probe,
116	.remove = asoc_simple_card_remove,	260	.remove = asoc_simple_card_remove,