Re: [alsa-devel] [PATCH v3] ASoC: simple-card: add Device Tree support

On Thu, Oct 03, 2013 at 05:04:41PM -0700, Kuninori Morimoto wrote:

Support for loading the simple-card module via DeviceTree. It requests CPU/CODEC information, and .of_xlate_dai_name support on each component driver.

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

CCing in the DT maintainers directly.

---

v1 -> v2

• add common clock support, system-clock-frequency can over-write it
• add some comment on code

v2 -> v3

• add devicetree ML address

.../devicetree/bindings/sound/simple-card.txt | 85 ++++++++++++ sound/soc/generic/simple-card.c | 146 +++++++++++++++++++- 2 files changed, 226 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/simple-card.txt

diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt new file mode 100644 index 0000000..75bbc5a --- /dev/null +++ b/Documentation/devicetree/bindings/sound/simple-card.txt @@ -0,0 +1,85 @@ +Simple-Card:

+Required properties:

+- compatible : "simple-audio" +- simple-audio,card-name : simple-audio card name +- simple-audio,cpu : CPU sub-node, see below +- simple-audio,codec : CODEC sub-node, see below

+Optional properties:

+- simple-audio,format : CPU/CODEC common format, see below

+Required cpu/codec subnode properties:

+- sound-dai : phandle and port for CPU/CODEC +- #sound-dai-cells : sound-dai phandle's node

+Optional subnode properties:

+- format : specific format if needed, see below +- frame-master : frame master +- bitclock-master : bitclock master +- bitclock-inversion : clock inversion +- frame-inversion : frame inversion +- clocks : phandle for system clock rate +- system-clock-frequency : system clock rate

• 			  it will overwrite clocks's rate
  

+simple-audio,format

• "i2s"
• "right_j"
• "left_j"
• "dsp_a"
• "dsp_b"
• "ac97"
• "pdm"
• "msb"
• "lsb"

+Example:

+clock {

• osc: oscillator {

• #clock-cells = <0>;
  

• compatible = "fixed-clock";
  

• clock-frequency = <11289600>;
  

• };

+};

+sound {

• compatible = "simple-audio";
• simple-audio,card-name = "FSI2A-AK4648";
• simple-audio,format = "left_j";
• simple-audio,cpu {

• sound-dai = <&sh_fsi2 0>;
  

• };
• simple-audio,codec {

• sound-dai = <&ak4648>;
  

• bitclock-master;
  

• frame-master;
  

• clocks = <&osc>;
  

• /* it can use this instead of clocks
  

•  * system-clock-frequency = <11289600>; */
  

• };

+};

+&i2c0 {

• ak4648: ak4648@0x12 {

• #sound-dai-cells = <0>;
  

• compatible = "asahi-kasei,ak4648";
  

• reg = <0x12>;
  

• };

+};

+sh_fsi2: sh_fsi2@0xec230000 {

• #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 8c49147..62befbd 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -9,6 +9,8 @@

• 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> @@ -52,11 +54,135 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd) return 0; }

+static int +__asoc_simple_card_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;
  

• of_node_put(*node);
• /* get dai->name */
• ret = snd_soc_of_get_dai_name(np, &dai->name);
• if (ret < 0)

• return ret;
  

• /*

• * 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 via "clolks = <xxx>" */
• clk = of_clk_get(np, 0);
• if (IS_ERR(clk))

• dai->sysclk = 0;
  

• else

• dai->sysclk = clk_get_rate(clk);
  

• /*

• * overwrite dai->sysclk if it has
  

• * "system-clock-frequency = <xxx>"
  

• */
  

• of_property_read_u32(np,

• 	     "system-clock-frequency",
  

• 	     &dai->sysclk);
  

• return 0;

+}

+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;
• int ret = 0;
• /* get card name */
• of_property_read_string(node, "simple-audio,card-name", &info->card);
• info->name = info->card;
• /* get CPU/CODEC common format via simple-audio,format */
• info->daifmt = snd_soc_of_parse_daifmt(node, "simple-audio,") &

• (SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK);
  

• /* CPU/CODEC sub-node */
• for_each_child_of_node(node, np) {

• if (0 == strcmp("simple-audio,cpu", np->name))
  

• 	ret = __asoc_simple_card_parse_of(np,
  

• 					  &info->cpu_dai,
  

• 					  of_cpu);
  

• if (0 == strcmp("simple-audio,codec", np->name))
  

• 	ret = __asoc_simple_card_parse_of(np,
  

• 					  &info->codec_dai,
  

• 					  of_codec);
  

• if (ret < 0)
  

• 	return ret;
  

• }
• /* simple-card assumes platform == cpu */
• *of_platform = *of_cpu;
• dev_dbg(dev, "card-name : %s\n", info->card);
• dev_dbg(dev, "platform : %04x / %p\n",

• info->daifmt,
  

• *of_platform);
  

• dev_dbg(dev, "cpu : %s / %04x / %d / %p\n",

• info->cpu_dai.name,
  

• info->cpu_dai.fmt,
  

• info->cpu_dai.sysclk,
  

• *of_cpu);
  

• dev_dbg(dev, "codec : %s / %04x / %d / %p\n",

• info->codec_dai.name,
  

• info->codec_dai.fmt,
  

• info->codec_dai.sysclk,
  

• *of_codec);
  

• 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) {
  

• 		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;

@@ -64,10 +190,10 @@ static int asoc_simple_card_probe(struct platform_device *pdev)

if (!cinfo->name || !cinfo->card ||

•    !cinfo->codec	||
  

•    !cinfo->platform	||
  

•    !cinfo->cpu_dai.name ||
  

•    !cinfo->codec_dai.name) {
  

•    !cinfo->codec_dai.name	||
  

•    !(cinfo->codec		|| of_codec)	||
  

•    !(cinfo->platform		|| of_platform)	||
  

•    !(cinfo->cpu_dai.name	|| of_cpu)) {
  

  dev_err(dev, "insufficient asoc_simple_card_info settings\n"); return -EINVAL; }

@@ -81,6 +207,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;

  /*

@@ -102,10 +231,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", },
• {},

+}; +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,

-- 1.7.9.5