Unverified Commit 138b5c27 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: rsnd: add multi Component support 

Merge series from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:

These are part of "ASoC: add multi Component support" patch-set.
The patch-set supports below case as "2 Cards".

	+-- basic board --------+
	|+--------+             |
	|| CPU ch0| <--> CodecA |
	||     ch1| <-+         |
	|+--------+   |         |
	+-------------|---------+
	+-- expansion board ----+
	|             |         |
	|             +-> CodecB|
	+-----------------------+

Renesas sound driver and its Doc part were held for observation.
Rob mentioned that "definitions" vs "$defs". But I got error on "$defs",
no error on "definitions". I believe this change is not mandatory.

He also mentioned that "reg" is missing, but I also believe that "reg"
is automatically handled somehow/somewhere (I'm not sure detail, but other
reviewer indicated it before).

He also mentioned that "ports" and "port", but added new "ports" needs
special handling. Using "ports" vs "port" are different, not
compatible on this driver. This means we need both on Doc.

Thus, there is no update for these.
parents cd8ee8ab 16382904

Documentation/devicetree/bindings/sound/renesas,rsnd.yaml

+31 −29
Original line number Diff line number Diff line
@@ -9,6 +9,20 @@ title: Renesas R-Car Sound Driver 
maintainers:

  - Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>



definitions:

  port-def:

    $ref: audio-graph-port.yaml#/definitions/port-base

    unevaluatedProperties: false

    patternProperties:

      "^endpoint(@[0-9a-f]+)?":

        $ref: audio-graph-port.yaml#/definitions/endpoint-base

        properties:

          playback:

            $ref: /schemas/types.yaml#/definitions/phandle-array

          capture:

            $ref: /schemas/types.yaml#/definitions/phandle-array

        unevaluatedProperties: false



properties:



  compatible:
@@ -77,6 +91,12 @@ properties: 
      it must be 1 if your system has audio_clkout0/1/2/3

    enum: [0, 1]



  "#address-cells":

    const: 1



  "#size-cells":

    const: 0



  clock-frequency:

    description: for audio_clkout0/1/2/3
@@ -103,35 +123,9 @@ properties: 
    description: List of necessary clock names.

    # details are defined below



  ports:

    $ref: audio-graph-port.yaml#/definitions/port-base

    unevaluatedProperties: false

    patternProperties:

      '^port(@[0-9a-f]+)?$':

        $ref: audio-graph-port.yaml#/definitions/port-base

        unevaluatedProperties: false

        patternProperties:

          "^endpoint(@[0-9a-f]+)?":

            $ref: audio-graph-port.yaml#/definitions/endpoint-base

            properties:

              playback:

                $ref: /schemas/types.yaml#/definitions/phandle-array

              capture:

                $ref: /schemas/types.yaml#/definitions/phandle-array

            unevaluatedProperties: false



  # ports is below

  port:

    $ref: audio-graph-port.yaml#/definitions/port-base

    unevaluatedProperties: false

    patternProperties:

      "^endpoint(@[0-9a-f]+)?":

        $ref: audio-graph-port.yaml#/definitions/endpoint-base

        properties:

          playback:

            $ref: /schemas/types.yaml#/definitions/phandle-array

          capture:

            $ref: /schemas/types.yaml#/definitions/phandle-array

        unevaluatedProperties: false

    $ref: "#/definitions/port-def"



  rcar_sound,dvc:

    description: DVC subnode.
@@ -248,8 +242,9 @@ properties: 
          - interrupts

    additionalProperties: false



patternProperties:

  # For DAI base

  rcar_sound,dai:

  'rcar_sound,dai(@[0-9a-f]+)?$':

    description: DAI subnode.

    type: object

    patternProperties:
@@ -269,6 +264,13 @@ properties: 
              - capture

    additionalProperties: false



  'ports(@[0-9a-f]+)?$':

    $ref: audio-graph-port.yaml#/definitions/port-base

    unevaluatedProperties: false

    patternProperties:

      '^port(@[0-9a-f]+)?$':

        $ref: "#/definitions/port-def"



required:

  - compatible

  - reg

sound/soc/sh/rcar/core.c

+99 −47
Original line number Diff line number Diff line
@@ -1260,13 +1260,13 @@ int rsnd_node_count(struct rsnd_priv *priv, struct device_node *node, char *name 
	return i;

}



static struct device_node *rsnd_dai_of_node(struct rsnd_priv *priv,

					    int *is_graph)

static int rsnd_dai_of_node(struct rsnd_priv *priv, int *is_graph)

{

	struct device *dev = rsnd_priv_to_dev(priv);

	struct device_node *np = dev->of_node;

	struct device_node *dai_node;

	struct device_node *ret;

	struct device_node *ports, *node;

	int nr = 0;

	int i = 0;



	*is_graph = 0;
@@ -1274,26 +1274,51 @@ static struct device_node *rsnd_dai_of_node(struct rsnd_priv *priv, 
	 * parse both previous dai (= rcar_sound,dai), and

	 * graph dai (= ports/port)

	 */

	dai_node = of_get_child_by_name(np, RSND_NODE_DAI);

	if (dai_node) {

		ret = dai_node;

		goto of_node_compatible;

	}



	ret = np;

	/*

	 * Simple-Card

	 */

	node = of_get_child_by_name(np, RSND_NODE_DAI);

	if (!node)

		goto audio_graph;



	of_node_put(node);



	dai_node = of_graph_get_next_endpoint(np, NULL);

	if (dai_node)

		goto of_node_graph;

	for_each_child_of_node(np, node) {

		if (!of_node_name_eq(node, RSND_NODE_DAI))

			continue;



	return NULL;

		priv->component_dais[i] = of_get_child_count(node);

		nr += priv->component_dais[i];

		i++;

		if (i >= RSND_MAX_COMPONENT) {

			dev_info(dev, "reach to max component\n");

			break;

		}

	}



	return nr;



audio_graph:

	/*

	 * Audio-Graph-Card

	 */

	for_each_child_of_node(np, ports) {

		if (!of_node_name_eq(ports, "ports") &&

		    !of_node_name_eq(ports, "port"))

			continue;

		priv->component_dais[i] = of_graph_get_endpoint_count(ports);

		nr += priv->component_dais[i];

		i++;

		if (i >= RSND_MAX_COMPONENT) {

			dev_info(dev, "reach to max component\n");

			break;

		}

	}



of_node_graph:

	*is_graph = 1;

of_node_compatible:

	of_node_put(dai_node);



	return ret;

	return nr;

}
@@ -1357,6 +1382,8 @@ static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd, 


static void __rsnd_dai_probe(struct rsnd_priv *priv,

			     struct device_node *dai_np,

			     struct device_node *node_np,

			     uint32_t node_arg,

			     int dai_i)

{

	struct rsnd_dai_stream *io_playback;
@@ -1374,10 +1401,17 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv, 


	snprintf(rdai->name, RSND_DAI_NAME_SIZE, "rsnd-dai.%d", dai_i);



	/* for multi Component */

	rdai->dai_args.np		= node_np;

	rdai->dai_args.args_count	= 1;

	rdai->dai_args.args[0]		= node_arg;



	rdai->priv	= priv;

	drv->name	= rdai->name;

	drv->ops	= &rsnd_soc_dai_ops;

	drv->pcm_new	= rsnd_pcm_new;

	drv->id		= dai_i;

	drv->dai_args	= &rdai->dai_args;



	io_playback->rdai		= rdai;

	io_capture->rdai		= rdai;
@@ -1441,21 +1475,15 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv, 


static int rsnd_dai_probe(struct rsnd_priv *priv)

{

	struct device_node *dai_node;

	struct device_node *dai_np;

	struct snd_soc_dai_driver *rdrv;

	struct device *dev = rsnd_priv_to_dev(priv);

	struct device_node *np = dev->of_node;

	struct rsnd_dai *rdai;

	int nr;

	int nr = 0;

	int is_graph;

	int dai_i;



	dai_node = rsnd_dai_of_node(priv, &is_graph);

	if (is_graph)

		nr = of_graph_get_endpoint_count(dai_node);

	else

		nr = of_get_child_count(dai_node);



	nr = rsnd_dai_of_node(priv, &is_graph);

	if (!nr)

		return -EINVAL;
@@ -1473,8 +1501,15 @@ static int rsnd_dai_probe(struct rsnd_priv *priv) 
	 */

	dai_i = 0;

	if (is_graph) {

		for_each_endpoint_of_node(dai_node, dai_np) {

			__rsnd_dai_probe(priv, dai_np, dai_i);

		struct device_node *ports;

		struct device_node *dai_np;



		for_each_child_of_node(np, ports) {

			if (!of_node_name_eq(ports, "ports") &&

			    !of_node_name_eq(ports, "port"))

				continue;

			for_each_endpoint_of_node(ports, dai_np) {

				__rsnd_dai_probe(priv, dai_np, dai_np, 0, dai_i);

				if (rsnd_is_gen3(priv) || rsnd_is_gen4(priv)) {

					rdai = rsnd_rdai_get(priv, dai_i);
@@ -1483,9 +1518,17 @@ static int rsnd_dai_probe(struct rsnd_priv *priv) 
				}

				dai_i++;

			}

		}

	} else {

		for_each_child_of_node(dai_node, dai_np) {

			__rsnd_dai_probe(priv, dai_np, dai_i);

		struct device_node *node;

		struct device_node *dai_np;



		for_each_child_of_node(np, node) {

			if (!of_node_name_eq(node, RSND_NODE_DAI))

				continue;



			for_each_child_of_node(node, dai_np) {

				__rsnd_dai_probe(priv, dai_np, np, dai_i, dai_i);

				if (rsnd_is_gen3(priv) || rsnd_is_gen4(priv)) {

					rdai = rsnd_rdai_get(priv, dai_i);
@@ -1495,6 +1538,7 @@ static int rsnd_dai_probe(struct rsnd_priv *priv) 
				dai_i++;

			}

		}

	}



	return 0;

}
@@ -1922,6 +1966,7 @@ static int rsnd_probe(struct platform_device *pdev) 
		rsnd_dai_probe,

	};

	int ret, i;

	int ci;



	/*

	 *	init priv data
@@ -1958,13 +2003,20 @@ static int rsnd_probe(struct platform_device *pdev) 
	/*

	 *	asoc register

	 */

	ci = 0;

	for (i = 0; priv->component_dais[i] > 0; i++) {

		int nr = priv->component_dais[i];



		ret = devm_snd_soc_register_component(dev, &rsnd_soc_component,

					 priv->daidrv, rsnd_rdai_nr(priv));

						      priv->daidrv + ci, nr);

		if (ret < 0) {

		dev_err(dev, "cannot snd dai register\n");

			dev_err(dev, "cannot snd component register\n");

			goto exit_snd_probe;

		}



		ci += nr;

	}



	pm_runtime_enable(dev);



	dev_info(dev, "probed\n");

sound/soc/sh/rcar/rsnd.h

+4 −0
Original line number Diff line number Diff line
@@ -545,6 +545,7 @@ struct rsnd_dai { 
	struct rsnd_dai_stream capture;

	struct rsnd_priv *priv;

	struct snd_pcm_hw_constraint_list constraint;

	struct of_phandle_args dai_args;



	int max_channels;	/* 2ch - 16ch */

	int ssi_lane;		/* 1lane - 4lane */
@@ -702,6 +703,9 @@ struct rsnd_priv { 
	struct snd_soc_dai_driver *daidrv;

	struct rsnd_dai *rdai;

	int rdai_nr;



#define RSND_MAX_COMPONENT 3

	int component_dais[RSND_MAX_COMPONENT];

};



#define rsnd_priv_to_pdev(priv)	((priv)->pdev)