Acked-by: Niklas Cassel niklas.cassel@linaro.org

On Mon, Jun 25, 2018 at 03:31:05PM +0100, Srinivas Kandagatla wrote:

Add compatible string to routing so that it can support DT based module autoloading.

Signed-off-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org

Documentation/devicetree/bindings/sound/qcom,q6adm.txt | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/qcom,q6adm.txt b/Documentation/devicetree/bindings/sound/qcom,q6adm.txt index cb709e5dbc44..bbae426cdfb1 100644 --- a/Documentation/devicetree/bindings/sound/qcom,q6adm.txt +++ b/Documentation/devicetree/bindings/sound/qcom,q6adm.txt @@ -18,6 +18,11 @@ used by the apr service device. = ADM routing "routing" subnode of the ADM node represents adm routing specific configuration

+- compatible:

• Usage: required
• Value type: <stringlist>
• Definition: must be "qcom,q6adm-routing".

• #sound-dai-cells Usage: required Value type: <u32>

@@ -28,6 +33,7 @@ q6adm@8 { compatible = "qcom,q6adm"; reg = <APR_SVC_ADM>; q6routing: routing {

• compatible = "qcom,q6adm-routing";
  

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

};

2.16.2

The patch

ASoC: q6asm: dt-bindings: add compatible string to dais

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks, Mark

From 9618b706672db1b595c7076389a833078335417c Mon Sep 17 00:00:00 2001

From: Srinivas Kandagatla srinivas.kandagatla@linaro.org Date: Tue, 26 Jun 2018 10:20:06 +0100 Subject: [PATCH] ASoC: q6asm: dt-bindings: add compatible string to dais

Add compatible string to dais so that it can support DT based module autoloading.

Signed-off-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org Acked-by: Niklas Cassel niklas.cassel@linaro.org Signed-off-by: Mark Brown broonie@kernel.org --- Documentation/devicetree/bindings/sound/qcom,q6asm.txt | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/qcom,q6asm.txt b/Documentation/devicetree/bindings/sound/qcom,q6asm.txt index 2178eb91146f..f9c7bd8c1bc0 100644 --- a/Documentation/devicetree/bindings/sound/qcom,q6asm.txt +++ b/Documentation/devicetree/bindings/sound/qcom,q6asm.txt @@ -17,6 +17,11 @@ used by the apr service device. = ASM DAIs (Digial Audio Interface) "dais" subnode of the ASM node represents dai specific configuration

+- compatible: + Usage: required + Value type: <stringlist> + Definition: must be "qcom,q6asm-dais". + - #sound-dai-cells Usage: required Value type: <u32> @@ -28,6 +33,7 @@ q6asm@7 { compatible = "qcom,q6asm"; reg = <APR_SVC_ASM>; q6asmdai: dais { + compatible = "qcom,q6asm-dais"; #sound-dai-cells = <1>; }; };

On Mon, Jun 25, 2018 at 03:31:07PM +0100, Srinivas Kandagatla wrote:

Add compatible string to dais so that it can support DT based module autoloading.

Signed-off-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org

Documentation/devicetree/bindings/sound/qcom,q6afe.txt | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/qcom,q6afe.txt b/Documentation/devicetree/bindings/sound/qcom,q6afe.txt index bdbf87df8c0b..f7ea77ba7947 100644 --- a/Documentation/devicetree/bindings/sound/qcom,q6afe.txt +++ b/Documentation/devicetree/bindings/sound/qcom,q6afe.txt @@ -17,6 +17,11 @@ used by all apr services. Must contain the following properties. subnode of "dais" representing board specific dai setup. "dais" node should have following properties followed by dai children.

+- compatible:

• Usage: required
• Value type: <stringlist>
• Definition: must be "qcom,q6afe-dais"

• #sound-dai-cells Usage: required Value type: <u32>

@@ -103,6 +108,7 @@ q6afe@4 { #sound-dai-cells = <1>; #address-cells = <1>; #size-cells = <0>;

• compatible = "qcom,q6afe-dais";
  

Perhaps have the compatible before #sound-dai-cells (and #size-cells, #address-cells) like in two previous patches.

hdmi@1 {
	reg = <1>;

-- 2.16.2

On Mon, Jun 25, 2018 at 03:31:09PM +0100, Srinivas Kandagatla wrote:

Now that the child nodes have there own compatible strings, Use of_platform_populate/depopulate() instead of less common of_platform_device_create()/destroy().

Signed-off-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org

sound/soc/qcom/qdsp6/q6asm.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/sound/soc/qcom/qdsp6/q6asm.c b/sound/soc/qcom/qdsp6/q6asm.c index 530852385cad..2b2c7233bb5f 100644 --- a/sound/soc/qcom/qdsp6/q6asm.c +++ b/sound/soc/qcom/qdsp6/q6asm.c @@ -174,10 +174,8 @@ struct q6asm { struct device *dev; struct q6core_svc_api_info ainfo; wait_queue_head_t mem_wait;

• struct platform_device *pcmdev;

Why is this removed? If it's a cleanup, perhaps it should be in a separate patch.

spinlock_t slock; struct audio_client *session[MAX_SESSIONS + 1];

• struct platform_device *pdev_dais;

};

struct audio_client { @@ -1344,7 +1342,6 @@ EXPORT_SYMBOL_GPL(q6asm_cmd_nowait); static int q6asm_probe(struct apr_device *adev) { struct device *dev = &adev->dev;

• struct device_node *dais_np; struct q6asm *q6asm;

  q6asm = devm_kzalloc(dev, sizeof(*q6asm), GFP_KERNEL);

@@ -1359,22 +1356,12 @@ static int q6asm_probe(struct apr_device *adev) spin_lock_init(&q6asm->slock); dev_set_drvdata(dev, q6asm);

• dais_np = of_get_child_by_name(dev->of_node, "dais");
• if (dais_np) {

• q6asm->pdev_dais = of_platform_device_create(dais_np,
  

• 					   "q6asm-dai", dev);
  

• of_node_put(dais_np);
  

• }
• return 0;

• return of_platform_populate(dev->of_node, NULL, NULL, dev);

}

static int q6asm_remove(struct apr_device *adev) {

• struct q6asm *q6asm = dev_get_drvdata(&adev->dev);
• if (q6asm->pdev_dais)

• of_platform_device_destroy(&q6asm->pdev_dais->dev, NULL);
  

• of_platform_depopulate(&adev->dev);

  return 0;

}

2.16.2

The patch

ASoC: qdsp6: q6afe: use of_platform_populate/depopulate()

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks, Mark

From 01afbd45f78cb0557db18c3ba768eea3e9576cfd Mon Sep 17 00:00:00 2001

From: Srinivas Kandagatla srinivas.kandagatla@linaro.org Date: Tue, 26 Jun 2018 10:20:10 +0100 Subject: [PATCH] ASoC: qdsp6: q6afe: use of_platform_populate/depopulate()

Now that the child nodes have there own compatible strings, Use of_platform_populate/depopulate() instead of less common of_platform_device_create()/destroy().

Signed-off-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org Acked-by: Niklas Cassel niklas.cassel@linaro.org Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/qcom/qdsp6/q6afe.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c index 01f43218984b..621b67b34db9 100644 --- a/sound/soc/qcom/qdsp6/q6afe.c +++ b/sound/soc/qcom/qdsp6/q6afe.c @@ -316,7 +316,6 @@ struct q6afe { struct mutex lock; struct list_head port_list; spinlock_t port_list_lock; - struct platform_device *pdev_dais; };

struct afe_port_cmd_device_start { @@ -1438,7 +1437,6 @@ static int q6afe_probe(struct apr_device *adev) { struct q6afe *afe; struct device *dev = &adev->dev; - struct device_node *dais_np;

afe = devm_kzalloc(dev, sizeof(*afe), GFP_KERNEL); if (!afe) @@ -1453,22 +1451,12 @@ static int q6afe_probe(struct apr_device *adev)

dev_set_drvdata(dev, afe);

- dais_np = of_get_child_by_name(dev->of_node, "dais"); - if (dais_np) { - afe->pdev_dais = of_platform_device_create(dais_np, - "q6afe-dai", dev); - of_node_put(dais_np); - } - - return 0; + return of_platform_populate(dev->of_node, NULL, NULL, dev); }

static int q6afe_remove(struct apr_device *adev) { - struct q6afe *afe = dev_get_drvdata(&adev->dev); - - if (afe->pdev_dais) - of_platform_device_destroy(&afe->pdev_dais->dev, NULL); + of_platform_depopulate(&adev->dev);

return 0; }

On Mon, Jun 25, 2018 at 03:31:11PM +0100, Srinivas Kandagatla wrote:

This patch uses new compatible string to make DT based module loading work.

Signed-off-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org

sound/soc/qcom/qdsp6/q6afe-dai.c | 8 ++++++++ 1 file changed, 8 insertions(+)

diff --git a/sound/soc/qcom/qdsp6/q6afe-dai.c b/sound/soc/qcom/qdsp6/q6afe-dai.c index 5002dd05bf27..7fbf762a45ac 100644 --- a/sound/soc/qcom/qdsp6/q6afe-dai.c +++ b/sound/soc/qcom/qdsp6/q6afe-dai.c @@ -1290,9 +1290,17 @@ static int q6afe_dai_dev_remove(struct platform_device *pdev) return 0; }

+static const struct of_device_id q6afe_dai_device_id[] = {

Double space here.

• { .compatible = "qcom,q6afe-dais" },
• {},

+};

Usually there is no empty line between the table and MODULE_DEVICE_TABLE.

+MODULE_DEVICE_TABLE(of, q6afe_dai_device_id);

static struct platform_driver q6afe_dai_platform_driver = { .driver = { .name = "q6afe-dai",

• .of_match_table = of_match_ptr(q6afe_dai_device_id),
  

  }, .probe = q6afe_dai_dev_probe, .remove = q6afe_dai_dev_remove,

-- 2.16.2

I'm not sure if Rob agrees with me or not, but since this patch is less than 10 lines, I think that it would be simpler to review if it was squashed together with the patch adding the compatible to the DT binding.

The patch

ASoC: qcom: apq8096: remove redundant owner assignment

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks, Mark

From 2d12c20b98ad610892151da37367f2d018181455 Mon Sep 17 00:00:00 2001

From: Srinivas Kandagatla srinivas.kandagatla@linaro.org Date: Tue, 26 Jun 2018 10:20:14 +0100 Subject: [PATCH] ASoC: qcom: apq8096: remove redundant owner assignment

module owner is already set in platform_driver_register(), so remove this redundant assignment.

Signed-off-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org Acked-by: Niklas Cassel niklas.cassel@linaro.org Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/qcom/apq8096.c | 1 - 1 file changed, 1 deletion(-)

diff --git a/sound/soc/qcom/apq8096.c b/sound/soc/qcom/apq8096.c index 239b8cb77bdb..cab8c4ff7c00 100644 --- a/sound/soc/qcom/apq8096.c +++ b/sound/soc/qcom/apq8096.c @@ -246,7 +246,6 @@ static struct platform_driver msm_snd_apq8096_driver = { .remove = apq8096_platform_remove, .driver = { .name = "msm-snd-apq8096", - .owner = THIS_MODULE, .of_match_table = msm_snd_apq8096_dt_match, }, };

On Mon, Jun 25, 2018 at 03:31:15PM +0100, Srinivas Kandagatla wrote:

q6adm_open can return error pointer or a null in error cases. Fix this check this.

Instead of "Fix this check this.", how about "Fix the return handling."

Signed-off-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org

sound/soc/qcom/qdsp6/q6routing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c index caf2f847a886..c18f808c7730 100644 --- a/sound/soc/qcom/qdsp6/q6routing.c +++ b/sound/soc/qcom/qdsp6/q6routing.c @@ -310,7 +310,7 @@ int q6routing_stream_open(int fedai_id, int perf_mode, session->channels, topology, perf_mode, session->bits_per_sample, 0, 0);

• if (!copp) {

• if (IS_ERR_OR_NULL(copp)) { mutex_unlock(&routing_data->lock); return -EINVAL; }

-- 2.16.2

The patch

ASoC: qdsp6: q6routing: add proper error check

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks, Mark

From 972562f7aaaa261ec6e1ac14fed0c5bdd0dfb1cb Mon Sep 17 00:00:00 2001

From: Srinivas Kandagatla srinivas.kandagatla@linaro.org Date: Tue, 26 Jun 2018 10:20:15 +0100 Subject: [PATCH] ASoC: qdsp6: q6routing: add proper error check

q6adm_open can return error pointer or a null in error cases. Fix the return handling.

Signed-off-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org Acked-by: Niklas Cassel niklas.cassel@linaro.org Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/qcom/qdsp6/q6routing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c index ab696bf8d1d3..c80fdbc2442e 100644 --- a/sound/soc/qcom/qdsp6/q6routing.c +++ b/sound/soc/qcom/qdsp6/q6routing.c @@ -310,7 +310,7 @@ int q6routing_stream_open(int fedai_id, int perf_mode, session->channels, topology, perf_mode, session->bits_per_sample, 0, 0);

- if (!copp) { + if (IS_ERR_OR_NULL(copp)) { mutex_unlock(&routing_data->lock); return -EINVAL; }