On Thu, 24 Oct 2013 14:13:49 +0200, Denis Carikli denis@eukrea.com wrote:
Cc: Rob Herring rob.herring@calxeda.com Cc: Pawel Moll pawel.moll@arm.com Cc: Mark Rutland mark.rutland@arm.com Cc: Stephen Warren swarren@wwwdotorg.org Cc: Ian Campbell ijc+devicetree@hellion.org.uk Cc: devicetree@vger.kernel.org Cc: Liam Girdwood lgirdwood@gmail.com Cc: Mark Brown broonie@kernel.org Cc: alsa-devel@alsa-project.org Cc: Sascha Hauer kernel@pengutronix.de Cc: linux-arm-kernel@lists.infradead.org Cc: Eric Bénard eric@eukrea.com
Signed-off-by: Denis Carikli denis@eukrea.com
ChangeLog v6->v7:
- The cleanups went into another patch.
- The support for fsl_ssi doesn't depend on dt anymore.
- platform_name = "imx-ssi.0" is still set when in non-dt mode.
.../devicetree/bindings/sound/eukrea-tlv320.txt | 23 +++++ sound/soc/fsl/Kconfig | 5 +- sound/soc/fsl/eukrea-tlv320.c | 88 ++++++++++++++++++-- 3 files changed, 107 insertions(+), 9 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/eukrea-tlv320.txt
diff --git a/Documentation/devicetree/bindings/sound/eukrea-tlv320.txt b/Documentation/devicetree/bindings/sound/eukrea-tlv320.txt new file mode 100644 index 0000000..8791037 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/eukrea-tlv320.txt @@ -0,0 +1,23 @@ +Audio complex for Eukrea boards with tlv320aic23 codec.
+Required properties: +- compatible : "eukrea,eukrea-tlv320"
Nit: why the double "eukrea"? I have no problem if yo think that's the best string, it just looks odd.
+- model : The user-visible name of this sound complex. +- ssi-controller : The phandle of the SSI controller. +- audio-codec : The phandle of the tlv320aic23 audio codec. +- mux-int-port : The internal port of the i.MX audio muxer (AUDMUX). +- mux-ext-port : The external port of the i.MX audio muxer.
+Note: The AUDMUX port numbering should start at 1, which is consistent with +hardware manual.
Looks okay to me. I've not been following the sound bindings very closely. Are the described properties a common pattern for sound complex bindings?
+Example:
- sound {
compatible = "eukrea,eukrea-tlv320";model = "imx51-eukrea-tlv320aic23";ssi-controller = <&ssi2>;fsl,audio-codec = <&tlv320aic23>;mux-int-port = <2>;mux-ext-port = <3>;- };
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index b7ab71f..9c3cd64 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -161,12 +161,15 @@ config SND_SOC_EUKREA_TLV320 depends on MACH_EUKREA_MBIMX27_BASEBOARD \ || MACH_EUKREA_MBIMXSD25_BASEBOARD \ || MACH_EUKREA_MBIMXSD35_BASEBOARD \
|| MACH_EUKREA_MBIMXSD51_BASEBOARD
|| MACH_EUKREA_MBIMXSD51_BASEBOARD \|| OF- select SND_SOC_FSL_SSI
- select SND_SOC_IMX_PCM_DMA help Enable I2S based access to the TLV320AIC23B codec attached to the SSI interface
diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c index 5983740..ad1aac6 100644 --- a/sound/soc/fsl/eukrea-tlv320.c +++ b/sound/soc/fsl/eukrea-tlv320.c @@ -15,8 +15,11 @@
*/
+#include <linux/errno.h> #include <linux/module.h> #include <linux/moduleparam.h> +#include <linux/of.h> +#include <linux/of_platform.h> #include <linux/device.h> #include <linux/i2c.h> #include <sound/core.h> @@ -26,6 +29,7 @@
#include "../codecs/tlv320aic23.h" #include "imx-ssi.h" +#include "fsl_ssi.h" #include "imx-audmux.h"
#define CODEC_CLOCK 12000000 @@ -41,7 +45,8 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream, ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
- if (ret) {
- /* fsl_ssi lacks the set_fmt ops. */
- if (ret && ret != -ENOTSUPP) { dev_err(cpu_dai->dev, "Failed to set the cpu dai format.\n"); return ret;
@@ -63,11 +68,13 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream, "Failed to set the codec sysclk.\n"); return ret; }
snd_soc_dai_set_tdm_slot(cpu_dai, 0xffffffc, 0xffffffc, 2, 0);
ret = snd_soc_dai_set_sysclk(cpu_dai, IMX_SSP_SYS_CLK, 0, SND_SOC_CLOCK_IN);
- if (ret) {
- /* fsl_ssi lacks the set_sysclk ops */
- if (ret && ret != -EINVAL) { dev_err(cpu_dai->dev, "Can't set the IMX_SSP_SYS_CLK CPU system clock.\n"); return ret;
@@ -84,7 +91,6 @@ static struct snd_soc_dai_link eukrea_tlv320_dai = { .name = "tlv320aic23", .stream_name = "TLV320AIC23", .codec_dai_name = "tlv320aic23-hifi",
- .platform_name = "imx-ssi.0", .codec_name = "tlv320aic23-codec.0-001a", .cpu_dai_name = "imx-ssi.0", .ops = &eukrea_tlv320_snd_ops,
@@ -101,8 +107,49 @@ static int eukrea_tlv320_probe(struct platform_device *pdev) { int ret; int int_port = 0, ext_port;
- struct platform_device *ssi_pdev;
- struct device_node *np = pdev->dev.of_node;
- struct device_node *ssi_np;
- if (np) {
ssi_np = of_parse_phandle(pdev->dev.of_node,"ssi-controller", 0);ssi_pdev = of_find_device_by_node(ssi_np);if (!ssi_pdev) {dev_err(&pdev->dev,"ssi-controller missing or invalid.\n");ret = -ENODEV;goto err;}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--;eukrea_tlv320_dai.cpu_dai_name = dev_name(&ssi_pdev->dev);eukrea_tlv320_dai.platform_of_node = ssi_np;- } else {
eukrea_tlv320_dai.platform_name = "imx-ssi.0";- }
- if (machine_is_eukrea_cpuimx27()) {
- if (machine_is_eukrea_cpuimx27() ||
of_find_compatible_node(NULL, NULL, "fsl,imx21-audmux")) {@@ -119,8 +166,12 @@ static int eukrea_tlv320_probe(struct platform_device *pdev) ); } else if (machine_is_eukrea_cpuimx25sd() || machine_is_eukrea_cpuimx35sd() ||
machine_is_eukrea_cpuimx51sd()) {ext_port = machine_is_eukrea_cpuimx25sd() ? 4 : 3;
machine_is_eukrea_cpuimx51sd() ||of_find_compatible_node(NULL, NULL, "fsl,imx31-audmux")) {if (!np)ext_port = machine_is_eukrea_cpuimx25sd() ?4 : 3;- imx_audmux_v2_configure_port(int_port, IMX_AUDMUX_V2_PTCR_SYN | IMX_AUDMUX_V2_PTCR_TFSDIR |
@@ -134,14 +185,28 @@ static int eukrea_tlv320_probe(struct platform_device *pdev) IMX_AUDMUX_V2_PDCR_RXDSEL(int_port) ); } else {
/* return happy. We might run on a totally different machine */return 0;
if (np) {/* The eukrea,eukrea-tlv320 driver was explicitely* requested (through the device tree).*/dev_err(&pdev->dev,"Missing audmux DT node.\n");return -ENODEV;} else {/* Return happy.* We might run on a totally different machine.*/return 0;}}
eukrea_tlv320.dev = &pdev->dev; ret = snd_soc_register_card(&eukrea_tlv320);
+err: if (ret) dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
if (np)
of_node_put(ssi_np);return ret;
} @@ -153,10 +218,17 @@ static int eukrea_tlv320_remove(struct platform_device *pdev) return 0; }
+static const struct of_device_id imx_tlv320_dt_ids[] = {
- { .compatible = "eukrea,eukrea-tlv320"},
- { /* sentinel */ }
+}; +MODULE_DEVICE_TABLE(of, imx_tlv320_dt_ids);
static struct platform_driver eukrea_tlv320_driver = { .driver = { .name = "eukrea_tlv320", .owner = THIS_MODULE,
.of_match_table = imx_tlv320_dt_ids,-- 1.7.9.5
linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel