[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-18-g28e5542b7

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  28e5542b79b901657ad9e29076fd0eed2c0f5a9a (commit)
      from  5f038473f1b2312c266b9ab6138ca089484d15fc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 28e5542b79b901657ad9e29076fd0eed2c0f5a9a
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Mon Oct 22 16:29:48 2018 +0200

    [LINUX] 4.1: asoc: fixes da7213 clock setting when used on APF6 (allow configuration from device tree instead of fixed value in driver)

-----------------------------------------------------------------------

Summary of changes:
 .../0520-armadeus-asoc-add-da7213-mx6-support.patch       | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/patches/linux/4.1.mx6_legacy/0520-armadeus-asoc-add-da7213-mx6-support.patch b/patches/linux/4.1.mx6_legacy/0520-armadeus-asoc-add-da7213-mx6-support.patch
index 2eb119e56..9548f42c0 100644
--- a/patches/linux/4.1.mx6_legacy/0520-armadeus-asoc-add-da7213-mx6-support.patch
+++ b/patches/linux/4.1.mx6_legacy/0520-armadeus-asoc-add-da7213-mx6-support.patch
@@ -44,7 +44,7 @@ Index: linux-imx_4.1.15_2.0.0_ga/sound/soc/fsl/imx-da7213.c
 ===================================================================
 --- /dev/null
 +++ linux-imx_4.1.15_2.0.0_ga/sound/soc/fsl/imx-da7213.c
-@@ -0,0 +1,233 @@
+@@ -0,0 +1,228 @@
 +/*
 + * Based on code which is:
 + * Copyright 2012 Freescale Semiconductor, Inc.
@@ -122,8 +122,6 @@ Index: linux-imx_4.1.15_2.0.0_ga/sound/soc/fsl/imx-da7213.c
 +	int int_port, ext_port;
 +	int ret;
 +
-+	printk("--- %s %d\n", __func__, __LINE__);
-+
 +	ret = of_property_read_u32(np, "mux-int-port", &int_port);
 +	if (ret) {
 +		dev_err(&pdev->dev, "mux-int-port missing or invalid\n");
@@ -160,7 +158,6 @@ Index: linux-imx_4.1.15_2.0.0_ga/sound/soc/fsl/imx-da7213.c
 +		return ret;
 +	}
 +
-+	printk("--- %s %d\n", __func__, __LINE__);
 +	ssi_np = of_parse_phandle(pdev->dev.of_node, "ssi-controller", 0);
 +	codec_np = of_parse_phandle(pdev->dev.of_node, "audio-codec", 0);
 +	if (!ssi_np || !codec_np) {
@@ -187,14 +184,14 @@ Index: linux-imx_4.1.15_2.0.0_ga/sound/soc/fsl/imx-da7213.c
 +		goto fail;
 +	}
 +
-+	printk("--- %s %d\n", __func__, __LINE__);
 +	data->codec_clk = clk_get(&codec_dev->dev, NULL);
 +	if (IS_ERR(data->codec_clk)) {
 +		ret = PTR_ERR(data->codec_clk);
 +		goto fail;
 +	}
 +
-+	data->clk_frequency = 24576000; //clk_get_rate(data->codec_clk);
++	data->clk_frequency = clk_get_rate(data->codec_clk);
++	printk("--- %s %d (%d Hz)\n", __func__, __LINE__, data->clk_frequency);
 +
 +	data->dai.name = "HiFi";
 +	data->dai.stream_name = "HiFi";
@@ -207,16 +204,15 @@ Index: linux-imx_4.1.15_2.0.0_ga/sound/soc/fsl/imx-da7213.c
 +			   SND_SOC_DAIFMT_CBS_CFS;
 +			   /* SND_SOC_DAIFMT_CBM_CFM; */
 +
-+	printk("--- %s %d\n", __func__, __LINE__);
 +	data->card.dev = &pdev->dev;
 +	ret = snd_soc_of_parse_card_name(&data->card, "model");
 +	if (ret)
 +		goto fail;
-+	printk("--- %s %d\n", __func__, __LINE__);
++
 +	ret = snd_soc_of_parse_audio_routing(&data->card, "audio-routing");
 +	if (ret)
 +		goto fail;
-+	printk("--- %s %d\n", __func__, __LINE__);
++
 +	data->card.num_links = 1;
 +	data->card.owner = THIS_MODULE;
 +	data->card.dai_link = &data->dai;
@@ -231,7 +227,6 @@ Index: linux-imx_4.1.15_2.0.0_ga/sound/soc/fsl/imx-da7213.c
 +		dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
 +		goto fail;
 +	}
-+	printk("--- %s %d\n", __func__, __LINE__);
 +
 +	of_node_put(ssi_np);
 +	of_node_put(codec_np);


hooks/post-receive
-- 
armadeus