Support for loading the simple-card module via devicetree. It requests cpu/codec information for probing.
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- v3 -> v4
- dai-name -> port-name and option - removed sub-node
.../devicetree/bindings/sound/simple-card.txt | 62 +++++++++++ sound/soc/generic/simple-card.c | 110 +++++++++++++++++++- 2 files changed, 167 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..7988c09 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/simple-card.txt @@ -0,0 +1,62 @@ +Simple-Card: + +Required properties: + + [prefix] means cpu/codec here + +- compatible : "simple-audio" +- simple-audio,card-name : simple-audio card name +- simple-audio,format : see below +- simple-audio,[prefix],dai : phandle for CPU/CODEC +- simple-audio,[prefix],frame-master : frame master +- simple-audio,[prefix],bitclock-master : bitclock master + +Optional properties: + +- simple-audio,system-clock-frequency : system clock rate if it is connected to both CPU/CODEC +- simple-audio,bitclock-inversion : bit clock inversion for both CPU/CODEC +- simple-audio,frame-inversion : frame inversion for both CPU/CODEC + +- simple-audio,[prefix],port-name : connected port name +- simple-audio,[prefix],bitclock-inversion : if CPU/CODEC needs clock inversion +- simple-audio,[prefix],frame-inversion : if CPU/CODEC needs frame inversion +- simple-audio,[prefix],system-clock-frequency : system clock rate for each CPU/CODEC + +simple-audio,format + "i2s" + "right_j" + "left_j" + "dsp_a" + "dsp_b" + "ac97" + "pdm" + "msb" + "lsb" + +Example: + +sound { + compatible = "simple-audio"; + + simple-audio,card-name = "FSI2A-AK4648"; + simple-audio,format = "left_j"; + simple-audio,cpu,dai = <&sh_fsi2>; + simple-audio,codec,dai = <&ak4648>; + simple-audio,codec,bitclock-master; + simple-audio,codec,frame-master; + simple-audio,codec,system-clock-frequency = <11289600>; +}; + +&i2c0 { + ak4648: ak4648@0x12 { + compatible = "asahi-kasei,ak4648"; + reg = <0x12>; + }; +}; + +sh_fsi2: sh_fsi2@0xec230000 { + 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 6cf8355..505c117 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -9,6 +9,7 @@ * published by the Free Software Foundation. */
+#include <linux/of.h> #include <linux/platform_device.h> #include <linux/module.h> #include <sound/simple_card.h> @@ -52,11 +53,101 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd) return 0; }
+static struct device_node* +__asoc_simple_card_parse_of(struct device_node *np, + struct asoc_simple_dai *dai, + const char *prefix) +{ + struct device_node *node; + char prop[128]; + + /* get "[prefix],dai = <xxx>" */ + snprintf(prop, sizeof(prop), "%s,dai", prefix); + node = of_parse_phandle(np, prop, 0); + if (node) + of_node_put(node); + + /* get "[prefix],port-name = xxx" */ + snprintf(prop, sizeof(prop), "%s,port-name", prefix); + of_property_read_string(np, prop, &dai->name); + + /* get dai specific format */ + dai->fmt = snd_soc_of_parse_daifmt(np, prefix); + + /* get "[prefix],system-clock-frequency = <xxx>" */ + snprintf(prop, sizeof(prop), "%s,system-clock-frequency", prefix); + of_property_read_u32(np, prop, &dai->sysclk); + + return node; +} + +static void asoc_simple_card_parse_of(struct device_node *np, + struct asoc_simple_card_info *info, + struct device *dev, + struct device_node **of_cpu, + struct device_node **of_codec, + struct device_node **of_platform) +{ + u32 sysclk = 0; + + of_property_read_string(np, "simple-audio,card-name", &info->card); + info->name = info->card; + + info->daifmt = snd_soc_of_parse_daifmt(np, "simple-audio,") & + (SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK); + + of_property_read_u32(np, + "simple-audio,system-clock-frequency", &sysclk); + + info->cpu_dai.sysclk = sysclk; + info->codec_dai.sysclk = sysclk; + + *of_cpu = __asoc_simple_card_parse_of(np, &info->cpu_dai, + "simple-audio,cpu"); + *of_codec = __asoc_simple_card_parse_of(np, &info->codec_dai, + "simple-audio,codec"); + + /* 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); +} + 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) + asoc_simple_card_parse_of(np, cinfo, dev, + &of_cpu, + &of_codec, + &of_platform); + } else { + cinfo = pdev->dev.platform_data; + } + if (!cinfo) { dev_err(dev, "no info for asoc-simple-card\n"); return -EINVAL; @@ -64,10 +155,9 @@ 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 || 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 +171,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,9 +195,16 @@ 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", + .of_match_table = asoc_simple_of_match, }, .probe = asoc_simple_card_probe, .remove = asoc_simple_card_remove,