[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-5-g7b4fcb56f
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-5-g7b4fcb56f
|
From: Julien B a. A. <ar...@us...> - 2018-09-05 13:55:33
|
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 7b4fcb56fe7e7c6000c027fad86fec1705e8ceaa (commit)
from 79ca444418da944bb61128a0a4590f24fa6dda4d (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 7b4fcb56fe7e7c6000c027fad86fec1705e8ceaa
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Sep 5 15:54:45 2018 +0200
[LINUX] 4.1.mx6_legacy: add support for Dialog DA7213/2 CODEC on APF6
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf6/apf6legacy-linux-4.1.config | 1 +
...0520-armadeus-asoc-add-da7213-mx6-support.patch | 321 +++++++++++++++++++++
2 files changed, 322 insertions(+)
create mode 100644 patches/linux/4.1.mx6_legacy/0520-armadeus-asoc-add-da7213-mx6-support.patch
diff --git a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-4.1.config b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-4.1.config
index 0c4544f61..e09e0fee0 100644
--- a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-4.1.config
+++ b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-4.1.config
@@ -323,6 +323,7 @@ CONFIG_SND_SOC_IMX_SPDIF=y
CONFIG_SND_SOC_IMX_MC13783=y
CONFIG_SND_SOC_IMX_SI476X=y
CONFIG_SND_SOC_IMX_HDMI=y
+CONFIG_SND_SOC_IMX_DA7213=y
CONFIG_USB=y
CONFIG_USB_OTG_WHITELIST=y
CONFIG_USB_OTG_FSM=y
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
new file mode 100644
index 000000000..2eb119e56
--- /dev/null
+++ b/patches/linux/4.1.mx6_legacy/0520-armadeus-asoc-add-da7213-mx6-support.patch
@@ -0,0 +1,321 @@
+Work in progress...
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-imx_4.1.15_2.0.0_ga/sound/soc/codecs/Kconfig
+===================================================================
+--- linux-imx_4.1.15_2.0.0_ga.orig/sound/soc/codecs/Kconfig
++++ linux-imx_4.1.15_2.0.0_ga/sound/soc/codecs/Kconfig
+@@ -416,7 +416,9 @@ config SND_SOC_DA7210
+ tristate
+
+ config SND_SOC_DA7213
+- tristate
++ tristate "Dialog DA7212/DA7213 CODEC (I2C)"
++ depends on I2C
++ select REGMAP_I2C
+
+ config SND_SOC_DA732X
+ tristate
+Index: linux-imx_4.1.15_2.0.0_ga/sound/soc/codecs/da7213.c
+===================================================================
+--- linux-imx_4.1.15_2.0.0_ga.orig/sound/soc/codecs/da7213.c
++++ linux-imx_4.1.15_2.0.0_ga/sound/soc/codecs/da7213.c
+@@ -1582,11 +1582,18 @@ static const struct i2c_device_id da7213
+ };
+ MODULE_DEVICE_TABLE(i2c, da7213_i2c_id);
+
++static const struct of_device_id da7213_dt_ids[] = {
++ { .compatible = "dlg,da7213", },
++ { /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(of, da7213_dt_ids);
++
+ /* I2C codec control layer */
+ static struct i2c_driver da7213_i2c_driver = {
+ .driver = {
+ .name = "da7213",
+ .owner = THIS_MODULE,
++ .of_match_table = da7213_dt_ids,
+ },
+ .probe = da7213_i2c_probe,
+ .remove = da7213_remove,
+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 @@
++/*
++ * Based on code which is:
++ * Copyright 2012 Freescale Semiconductor, Inc.
++ * Copyright 2012 Linaro Ltd.
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++#include <linux/module.h>
++#include <linux/of.h>
++#include <linux/of_platform.h>
++#include <linux/i2c.h>
++#include <linux/clk.h>
++#include <sound/soc.h>
++
++#include "../codecs/da7213.h"
++#include "imx-audmux.h"
++
++#define DAI_NAME_SIZE 32
++
++struct imx_da7213_data {
++ struct snd_soc_dai_link dai;
++ struct snd_soc_card card;
++ char codec_dai_name[DAI_NAME_SIZE];
++ char platform_name[DAI_NAME_SIZE];
++ struct clk *codec_clk;
++ unsigned int clk_frequency;
++};
++
++static int imx_da7213_dai_init(struct snd_soc_pcm_runtime *rtd)
++{
++ struct imx_da7213_data *data = snd_soc_card_get_drvdata(rtd->card);
++ struct device *dev = rtd->card->dev;
++ int ret = 0;
++
++ ret = snd_soc_dai_set_sysclk(rtd->codec_dai, /*SGTL5000_SYSCLK*/ 0,
++ data->clk_frequency, SND_SOC_CLOCK_IN);
++ if (ret) {
++ dev_err(dev, "could not set codec driver clock params\n");
++ return ret;
++ }
++
++ ret = snd_soc_dai_set_pll(rtd->codec_dai, 0 /* id */,
++ DA7213_SYSCLK_PLL /* source */, 0 /* fref */,
++ DA7213_PLL_FREQ_OUT_90316800);
++
++ if (ret) {
++ dev_err(dev, "could not set codec PLL params\n");
++ return ret;
++ }
++
++ return 0;
++}
++
++static const struct snd_soc_dapm_widget imx_da7213_dapm_widgets[] = {
++ SND_SOC_DAPM_MIC("Mic Jack", NULL),
++ SND_SOC_DAPM_LINE("Line In Jack", NULL),
++ SND_SOC_DAPM_HP("Headphone Jack", NULL),
++ SND_SOC_DAPM_SPK("Line Out Jack", NULL),
++ SND_SOC_DAPM_SPK("Ext Spk", NULL),
++};
++
++static int imx_da7213_probe(struct platform_device *pdev)
++{
++ struct device_node *np = pdev->dev.of_node;
++ struct device_node *ssi_np, *codec_np;
++ struct platform_device *ssi_pdev;
++ struct i2c_client *codec_dev;
++ struct imx_da7213_data *data = NULL;
++ 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");
++ return ret;
++ }
++ ret = of_property_read_u32(np, "mux-ext-port", &ext_port);
++ if (ret) {
++ dev_err(&pdev->dev, "mux-ext-port missing or invalid\n");
++ return ret;
++ }
++
++ /*
++ * The port numbering in the hardware manual starts at 1, while
++ * the audmux API expects it starts at 0.
++ */
++ int_port--;
++ ext_port--;
++ ret = imx_audmux_v2_configure_port(int_port,
++ IMX_AUDMUX_V2_PTCR_SYN |
++ IMX_AUDMUX_V2_PTCR_TFSEL(ext_port) |
++ IMX_AUDMUX_V2_PTCR_TCSEL(ext_port) |
++ IMX_AUDMUX_V2_PTCR_TFSDIR |
++ IMX_AUDMUX_V2_PTCR_TCLKDIR,
++ IMX_AUDMUX_V2_PDCR_RXDSEL(ext_port));
++ if (ret) {
++ dev_err(&pdev->dev, "audmux internal port setup failed\n");
++ return ret;
++ }
++ ret = imx_audmux_v2_configure_port(ext_port,
++ IMX_AUDMUX_V2_PTCR_SYN,
++ IMX_AUDMUX_V2_PDCR_RXDSEL(int_port));
++ if (ret) {
++ dev_err(&pdev->dev, "audmux external port setup failed\n");
++ 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) {
++ dev_err(&pdev->dev, "phandle missing or invalid\n");
++ ret = -EINVAL;
++ goto fail;
++ }
++
++ ssi_pdev = of_find_device_by_node(ssi_np);
++ if (!ssi_pdev) {
++ dev_err(&pdev->dev, "failed to find SSI platform device\n");
++ ret = -EPROBE_DEFER;
++ goto fail;
++ }
++ codec_dev = of_find_i2c_device_by_node(codec_np);
++ if (!codec_dev) {
++ dev_err(&pdev->dev, "failed to find codec platform device\n");
++ return -EPROBE_DEFER;
++ }
++
++ data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
++ if (!data) {
++ ret = -ENOMEM;
++ 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->dai.name = "HiFi";
++ data->dai.stream_name = "HiFi";
++ data->dai.codec_dai_name = "da7213-hifi";
++ data->dai.codec_of_node = codec_np;
++ data->dai.cpu_of_node = ssi_np;
++ data->dai.platform_of_node = ssi_np;
++ data->dai.init = &imx_da7213_dai_init;
++ data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
++ 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;
++ data->card.dapm_widgets = imx_da7213_dapm_widgets;
++ data->card.num_dapm_widgets = ARRAY_SIZE(imx_da7213_dapm_widgets);
++
++ platform_set_drvdata(pdev, &data->card);
++ snd_soc_card_set_drvdata(&data->card, data);
++
++ ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
++ if (ret) {
++ 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);
++
++ return 0;
++
++fail:
++ if (data && !IS_ERR(data->codec_clk))
++ clk_put(data->codec_clk);
++ of_node_put(ssi_np);
++ of_node_put(codec_np);
++
++ return ret;
++}
++
++static int imx_da7213_remove(struct platform_device *pdev)
++{
++ struct snd_soc_card *card = platform_get_drvdata(pdev);
++ struct imx_da7213_data *data = snd_soc_card_get_drvdata(card);
++
++ clk_put(data->codec_clk);
++
++ return 0;
++}
++
++static const struct of_device_id imx_da7213_dt_ids[] = {
++ { .compatible = "fsl,imx-audio-da7213", },
++ { /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(of, imx_da7213_dt_ids);
++
++static struct platform_driver imx_da7213_driver = {
++ .driver = {
++ .name = "imx-da7213",
++ .pm = &snd_soc_pm_ops,
++ .of_match_table = imx_da7213_dt_ids,
++ },
++ .probe = imx_da7213_probe,
++ .remove = imx_da7213_remove,
++};
++module_platform_driver(imx_da7213_driver);
++
++MODULE_AUTHOR("Julien Boibessot <jul...@ar...>");
++MODULE_DESCRIPTION("Freescale i.MX DA7212/3 ASoC machine driver");
++MODULE_LICENSE("GPL v2");
++MODULE_ALIAS("platform:imx-da7213");
+Index: linux-imx_4.1.15_2.0.0_ga/sound/soc/fsl/Kconfig
+===================================================================
+--- linux-imx_4.1.15_2.0.0_ga.orig/sound/soc/fsl/Kconfig
++++ linux-imx_4.1.15_2.0.0_ga/sound/soc/fsl/Kconfig
+@@ -392,6 +392,17 @@ config SND_SOC_IMX_HDMI
+ Say Y if you want to add support for SoC audio on an i.MX board with
+ IMX HDMI.
+
++config SND_SOC_IMX_DA7213
++ tristate "SoC Audio support for i.MX boards with da7213/2"
++ depends on OF && I2C
++ select SND_SOC_DA7213
++ select SND_SOC_IMX_PCM_DMA
++ select SND_SOC_IMX_AUDMUX
++ select SND_SOC_FSL_SSI
++ help
++ Say Y if you want to add support for SoC audio on an i.MX board with
++ a da7213/2 codec.
++
+ endif # SND_IMX_SOC
+
+ endmenu
+Index: linux-imx_4.1.15_2.0.0_ga/sound/soc/fsl/Makefile
+===================================================================
+--- linux-imx_4.1.15_2.0.0_ga.orig/sound/soc/fsl/Makefile
++++ linux-imx_4.1.15_2.0.0_ga/sound/soc/fsl/Makefile
+@@ -67,6 +67,7 @@ snd-soc-imx-mc13783-objs := imx-mc13783.
+ snd-soc-imx-mqs-objs := imx-mqs.o
+ snd-soc-imx-si476x-objs := imx-si476x.o
+ snd-soc-imx-hdmi-objs := imx-hdmi.o
++snd-soc-imx-da7213-objs := imx-da7213.o
+
+ obj-$(CONFIG_SND_SOC_EUKREA_TLV320) += snd-soc-eukrea-tlv320.o
+ obj-$(CONFIG_SND_SOC_PHYCORE_AC97) += snd-soc-phycore-ac97.o
+@@ -84,5 +85,6 @@ obj-$(CONFIG_SND_SOC_IMX_MC13783) += snd
+ obj-$(CONFIG_SND_SOC_IMX_MQS) += snd-soc-imx-mqs.o
+ obj-$(CONFIG_SND_SOC_IMX_SI476X) += snd-soc-imx-si476x.o
+ obj-$(CONFIG_SND_SOC_IMX_HDMI) += snd-soc-imx-hdmi.o
++obj-$(CONFIG_SND_SOC_IMX_DA7213) += snd-soc-imx-da7213.o
+
+ AFLAGS_hdmi_pcm.o := -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp
hooks/post-receive
--
armadeus
|