Skip to content

L
linux-imx
Commit 552621b6 by Jose Miquel Sanabria
Options

Added driver IMX-TLV Audio support

dts: I2C3 mux without pull-up dts: I2C3 add new pinctrl for i2c driver bus recovery when bus lock dts: Add eeprom support dts: Add imx-tlv codec audio Signed-off-by: Jose Miquel Sanabria's avatarJose Miguel Sanchez Sanabria <jsanabria@iseebcn.com>
parent 700d5893
Showing with 272 additions and 8 deletions
arch/arm/boot/dts/imx6qdl-igep-igep0046rc.dtsi
......@@ -8,6 +8,7 @@
* published by the Free Software Foundation.
*/
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h>
......@@ -352,15 +353,18 @@
&i2c3 {
clock-frequency = <100000>;
pinctrl-names = "default";
pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c3>;
pinctrl-1 = <&pinctrl_i2c3_gpio>;
scl-gpios = <&gpio3 17 GPIO_ACTIVE_HIGH>;
sda-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>;
status = "okay";
eeprom@50 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "at,24c256";
eeprom: eeprom@50 {
compatible = "at24,24c256";
reg = <0x50>;
pagesize = <32>;
};
};
......@@ -466,8 +470,15 @@
pinctrl_i2c3: i2c3grp {
fsl,pins = <
MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001B8B1
MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001B8B1
MX6QDL_PAD_EIM_D17__I2C3_SCL 0x400188B1
MX6QDL_PAD_EIM_D18__I2C3_SDA 0x400188B1
>;
};
pinctrl_i2c3_gpio: i2c3_gpio_grp {
fsl,pins = <
MX6QDL_PAD_EIM_D17__GPIO3_IO17 0x1b0b0
MX6QDL_PAD_EIM_D18__GPIO3_IO18 0x1b0b0
>;
};
......
arch/arm/configs/imx6_igep0046_defconfig
......@@ -2882,7 +2882,8 @@ CONFIG_SND_SOC_IMX_HDMI_DMA=y
#
# SoC Audio support for Freescale i.MX boards:
#
CONFIG_SND_SOC_EUKREA_TLV320=y
# CONFIG_SND_SOC_EUKREA_TLV320 is not set
CONFIG_SND_SOC_TLV320AIC3X=y
# CONFIG_SND_SOC_IMX_WM8960 is not set
# CONFIG_SND_SOC_IMX_SII902X is not set
# CONFIG_SND_SOC_IMX_WM8958 is not set
......
sound/soc/fsl/Kconfig
......@@ -322,6 +322,19 @@ config SND_SOC_IMX_WM8962_ANDROID
Say Y if you want to add support for SoC audio on an i.MX board with
a wm8962 codec in android.
config SND_SOC_IMX_TLV320AIC3X
tristate "SoC Audio support for i.MX boards with tlv320aic3x"
depends on OF && I2C
select SND_SOC_WM8962
select SND_SOC_TLV320AIC3X
select SND_SOC_IMX_PCM_DMA
select SND_SOC_IMX_AUDMUX
select SND_SOC_FSL_SSI
select SND_SOC_FSL_UTILS
help
Say Y if you want to add support for SoC audio on an i.MX board with
a tlv320aic3x codec.
config SND_SOC_IMX_RPMSG
tristate "SoC Audio support for i.MX boards with rpmsg"
depends on OF && I2C && INPUT
......
sound/soc/fsl/Makefile
......@@ -64,6 +64,7 @@ snd-soc-imx-sgtl5000-objs := imx-sgtl5000.o
snd-soc-imx-wm8958-objs := imx-wm8958.o
snd-soc-imx-wm8960-objs := imx-wm8960.o
snd-soc-imx-wm8962-objs := imx-wm8962.o
snd-soc-imx-tlv320aic3x-objs := imx-tlv320aic3x.o
snd-soc-imx-xtor-objs := imx-xtor.o
snd-soc-imx-sii902x-objs := imx-sii902x.o
snd-soc-imx-spdif-objs := imx-spdif.o
......@@ -83,6 +84,7 @@ obj-$(CONFIG_SND_SOC_IMX_SGTL5000) += snd-soc-imx-sgtl5000.o
obj-${CONFIG_SND_SOC_IMX_WM8958} += snd-soc-imx-wm8958.o
obj-$(CONFIG_SND_SOC_IMX_WM8960) += snd-soc-imx-wm8960.o
obj-$(CONFIG_SND_SOC_IMX_WM8962) += snd-soc-imx-wm8962.o
obj-$(CONFIG_SND_SOC_IMX_TLV320AIC3X) += snd-soc-imx-tlv320aic3x.o
obj-$(CONFIG_SND_SOC_IMX_XTOR) += snd-soc-imx-xtor.o
obj-$(CONFIG_SND_SOC_IMX_RPMSG) += snd-soc-imx-rpmsg.o
obj-$(CONFIG_SND_SOC_IMX_SII902X) += snd-soc-imx-sii902x.o
......
sound/soc/fsl/imx-tlv320aic3x.c 0 → 100644
/*
* 2014 Variscite, Ltd. All Rights Reserved.
*
* Copyright (C) 2014 Freescale Semiconductor, Inc.
*
* 2012 Variscite, Ltd. All Rights Reserved.
* Based on imx-wm8962.c
* Copyright (C) 2012 Freescale Semiconductor, Inc.
* Copyright (C) 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/tlv320aic3x.h"
#include "imx-audmux.h"
#define DAI_NAME_SIZE 32
struct imx_tlv320aic3x_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_tlv320aic3x_dai_init(struct snd_soc_pcm_runtime *rtd)
{
struct imx_tlv320aic3x_data *data = container_of(rtd->card,
struct imx_tlv320aic3x_data, card);
struct device *dev = rtd->card->dev;
int ret;
ret = snd_soc_dai_set_sysclk(rtd->codec_dai, 0,
data->clk_frequency, SND_SOC_CLOCK_IN);
if (ret) {
dev_err(dev, "could not set codec driver clock params\n");
return ret;
}
return 0;
}
static const struct snd_soc_dapm_widget imx_tlv320aic3x_dapm_widgets[] = {
SND_SOC_DAPM_MIC("Mic Jack", NULL),
SND_SOC_DAPM_LINE("Line In Jack", NULL),
SND_SOC_DAPM_HP("Headphone Jack", NULL),
};
static int imx_tlv320aic3x_audmux_config(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
int int_port, ext_port;
int ret;
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;
}
return 0;
}
static int imx_tlv320aic3x_probe(struct platform_device *pdev)
{
struct device_node *cpu_np, *codec_np;
struct platform_device *cpu_pdev;
struct i2c_client *codec_dev;
struct imx_tlv320aic3x_data *data;
int ret;
cpu_np = of_parse_phandle(pdev->dev.of_node, "cpu-dai", 0);
codec_np = of_parse_phandle(pdev->dev.of_node, "audio-codec", 0);
if (!cpu_np || !codec_np) {
dev_err(&pdev->dev, "phandle missing or invalid\n");
ret = -EINVAL;
goto fail;
}
if (strstr(cpu_np->name, "ssi")) {
ret = imx_tlv320aic3x_audmux_config(pdev);
if (ret)
goto fail;
}
cpu_pdev = of_find_device_by_node(cpu_np);
if (!cpu_pdev) {
dev_err(&pdev->dev, "failed to find SSI platform device\n");
ret = -EINVAL;
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 -EINVAL;
}
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
if (!data) {
ret = -ENOMEM;
goto fail;
}
data->codec_clk = clk_get(&codec_dev->dev, NULL);
if (IS_ERR(data->codec_clk)) {
/* assuming clock enabled by default */
data->codec_clk = NULL;
ret = of_property_read_u32(codec_np, "clock-frequency",
&data->clk_frequency);
if (ret) {
dev_err(&codec_dev->dev,
"clock-frequency missing or invalid\n");
goto fail;
}
} else {
data->clk_frequency = clk_get_rate(data->codec_clk);
clk_prepare_enable(data->codec_clk);
}
data->dai.name = "HiFi";
data->dai.stream_name = "HiFi";
data->dai.codec_dai_name = "tlv320aic3x-hifi";
data->dai.codec_of_node = codec_np;
data->dai.cpu_of_node = cpu_np;
data->dai.platform_of_node = cpu_np;
data->dai.init = &imx_tlv320aic3x_dai_init;
data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBM_CFM;
data->card.dev = &pdev->dev;
ret = snd_soc_of_parse_card_name(&data->card, "model");
if (ret)
goto clk_fail;
ret = snd_soc_of_parse_audio_routing(&data->card, "audio-routing");
if (ret)
goto clk_fail;
data->card.num_links = 1;
data->card.owner = THIS_MODULE;
data->card.dai_link = &data->dai;
data->card.dapm_widgets = imx_tlv320aic3x_dapm_widgets;
data->card.num_dapm_widgets = ARRAY_SIZE(imx_tlv320aic3x_dapm_widgets);
ret = snd_soc_register_card(&data->card);
if (ret) {
dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
goto clk_fail;
}
platform_set_drvdata(pdev, data);
clk_fail:
clk_put(data->codec_clk);
fail:
if (cpu_np)
of_node_put(cpu_np);
if (codec_np)
of_node_put(codec_np);
return ret;
}
static int imx_tlv320aic3x_remove(struct platform_device *pdev)
{
struct imx_tlv320aic3x_data *data = platform_get_drvdata(pdev);
if (data->codec_clk) {
clk_disable_unprepare(data->codec_clk);
clk_put(data->codec_clk);
}
snd_soc_unregister_card(&data->card);
return 0;
}
static const struct of_device_id imx_tlv320aic3x_dt_ids[] = {
{ .compatible = "fsl,imx-audio-tlv320aic3x", },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, imx_tlv320aic3x_dt_ids);
static struct platform_driver imx_tlv320aic3x_driver = {
.driver = {
.name = "imx-tlv320aic3x",
.owner = THIS_MODULE,
.of_match_table = imx_tlv320aic3x_dt_ids,
},
.probe = imx_tlv320aic3x_probe,
.remove = imx_tlv320aic3x_remove,
};
module_platform_driver(imx_tlv320aic3x_driver);
MODULE_AUTHOR("ron.d@variscite.com. Variscite Ltd.");
MODULE_DESCRIPTION("Variscite i.MX TLV320aic3x ASoC machine driver");
MODULE_LICENSE("GPL v2");
MODULE_ALIAS("platform:imx-tlv320aic3x");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment