Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 8413b9e0 authored by Katsuhiro Suzuki's avatar Katsuhiro Suzuki Committed by Mark Brown
Browse files

ASoC: uniphier: add support for UniPhier PXs2 AIO 



This patch adds support for UniPhier AIO sound driver
which is included in UniPhier PXs2 SoCs.

Signed-off-by: default avatarKatsuhiro Suzuki <suzuki.katsuhiro@socionext.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d2b94307

Documentation/devicetree/bindings/sound/uniphier,aio.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
- compatible      : should be one of the following:

		    "socionext,uniphier-ld11-aio"

		    "socionext,uniphier-ld20-aio"

		    "socionext,uniphier-pxs2-aio"

- reg             : offset and length of the register set for the device.

- interrupts      : should contain I2S or S/PDIF interrupt.

- pinctrl-names   : should be "default".

sound/soc/uniphier/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -30,6 +30,17 @@ config SND_SOC_UNIPHIER_LD11 
	  Select Y if you use such device.

	  If unsure select "N".



config SND_SOC_UNIPHIER_PXS2

	tristate "UniPhier PXs2 Device Driver"

	depends on SND_SOC_UNIPHIER

	select SND_SOC_UNIPHIER_AIO

	select SND_SOC_UNIPHIER_AIO_DMA

	help

	  This adds ASoC driver for Socionext UniPhier PXs2

	  input and output that can be used with other codecs.

	  Select Y if you use such device.

	  If unsure select "N".



config SND_SOC_UNIPHIER_EVEA_CODEC

	tristate "UniPhier SoC internal audio codec"

	depends on SND_SOC_UNIPHIER

sound/soc/uniphier/Makefile

+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

snd-soc-uniphier-aio-cpu-objs := aio-core.o aio-dma.o aio-cpu.o aio-compress.o

snd-soc-uniphier-aio-ld11-objs := aio-ld11.o

snd-soc-uniphier-aio-pxs2-objs := aio-pxs2.o



obj-$(CONFIG_SND_SOC_UNIPHIER_AIO) += snd-soc-uniphier-aio-cpu.o

obj-$(CONFIG_SND_SOC_UNIPHIER_LD11) += snd-soc-uniphier-aio-ld11.o

obj-$(CONFIG_SND_SOC_UNIPHIER_PXS2) += snd-soc-uniphier-aio-pxs2.o



snd-soc-uniphier-evea-objs := evea.o

obj-$(CONFIG_SND_SOC_UNIPHIER_EVEA_CODEC) += snd-soc-uniphier-evea.o

sound/soc/uniphier/aio-ld11.c

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ MODULE_DEVICE_TABLE(of, uniphier_aio_of_match); 


static struct platform_driver uniphier_aio_driver = {

	.driver = {

		.name = "snd-uniphier-aio",

		.name = "snd-uniphier-aio-ld11",

		.of_match_table = of_match_ptr(uniphier_aio_of_match),

	},

	.probe    = uniphier_aio_probe,

sound/soc/uniphier/aio-pxs2.c

0 → 100644
+320 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

//

// Socionext UniPhier AIO ALSA driver for PXs2.

//

// Copyright (c) 2018 Socionext Inc.



#include <linux/module.h>



#include "aio.h"



static const struct uniphier_aio_spec uniphier_aio_pxs2[] = {

	/* for Line PCM In, Pin:AI1Dx */

	{

		.name = AUD_NAME_PCMIN1,

		.gname = AUD_GNAME_LINE,

		.swm = {

			.type  = PORT_TYPE_I2S,

			.dir   = PORT_DIR_INPUT,

			.rb    = { 16, 11, },

			.ch    = { 16, 11, },

			.iif   = { 0, 0, },

			.iport = { 0, AUD_HW_PCMIN1, },

		},

	},



	/* for Speaker/Headphone/Mic PCM In, Pin:AI2Dx */

	{

		.name = AUD_NAME_PCMIN2,

		.gname = AUD_GNAME_AUX,

		.swm = {

			.type  = PORT_TYPE_I2S,

			.dir   = PORT_DIR_INPUT,

			.rb    = { 17, 12, },

			.ch    = { 17, 12, },

			.iif   = { 1, 1, },

			.iport = { 1, AUD_HW_PCMIN2, },

		},

	},



	/* for HDMI PCM Out, Pin:AO1Dx (inner) */

	{

		.name = AUD_NAME_HPCMOUT1,

		.gname = AUD_GNAME_HDMI,

		.swm = {

			.type  = PORT_TYPE_I2S,

			.dir   = PORT_DIR_OUTPUT,

			.rb    = { 0, 0, },

			.ch    = { 0, 0, },

			.oif   = { 0, 0, },

			.oport = { 3, AUD_HW_HPCMOUT1, },

		},

	},



	/* for Line PCM Out, Pin:AO2Dx */

	{

		.name = AUD_NAME_PCMOUT1,

		.gname = AUD_GNAME_LINE,

		.swm = {

			.type  = PORT_TYPE_I2S,

			.dir   = PORT_DIR_OUTPUT,

			.rb    = { 1, 1, },

			.ch    = { 1, 1, },

			.oif   = { 1, 1, },

			.oport = { 0, AUD_HW_PCMOUT1, },

		},

	},



	/* for Speaker/Headphone/Mic PCM Out, Pin:AO3Dx */

	{

		.name = AUD_NAME_PCMOUT2,

		.gname = AUD_GNAME_AUX,

		.swm = {

			.type  = PORT_TYPE_I2S,

			.dir   = PORT_DIR_OUTPUT,

			.rb    = { 2, 2, },

			.ch    = { 2, 2, },

			.oif   = { 2, 2, },

			.oport = { 1, AUD_HW_PCMOUT2, },

		},

	},



	/* for HDMI Out, Pin:AO1IEC */

	{

		.name = AUD_NAME_HIECOUT1,

		.swm = {

			.type  = PORT_TYPE_SPDIF,

			.dir   = PORT_DIR_OUTPUT,

			.rb    = { 6, 4, },

			.ch    = { 6, 4, },

			.oif   = { 6, 4, },

			.oport = { 12, AUD_HW_HIECOUT1, },

		},

	},



	/* for HDMI Out, Pin:AO1IEC, Compress */

	{

		.name = AUD_NAME_HIECCOMPOUT1,

		.swm = {

			.type  = PORT_TYPE_SPDIF,

			.dir   = PORT_DIR_OUTPUT,

			.rb    = { 6, 4, },

			.ch    = { 6, 4, },

			.oif   = { 6, 4, },

			.oport = { 12, AUD_HW_HIECOUT1, },

		},

	},



	/* for S/PDIF Out, Pin:AO2IEC */

	{

		.name = AUD_NAME_IECOUT1,

		.swm = {

			.type  = PORT_TYPE_SPDIF,

			.dir   = PORT_DIR_OUTPUT,

			.rb    = { 7, 5, },

			.ch    = { 7, 5, },

			.oif   = { 7, 5, },

			.oport = { 13, AUD_HW_IECOUT1, },

		},

	},



	/* for S/PDIF Out, Pin:AO2IEC */

	{

		.name = AUD_NAME_IECCOMPOUT1,

		.swm = {

			.type  = PORT_TYPE_SPDIF,

			.dir   = PORT_DIR_OUTPUT,

			.rb    = { 7, 5, },

			.ch    = { 7, 5, },

			.oif   = { 7, 5, },

			.oport = { 13, AUD_HW_IECOUT1, },

		},

	},

};



static const struct uniphier_aio_pll uniphier_aio_pll_pxs2[] = {

	[AUD_PLL_A1]   = { .enable = true, },

	[AUD_PLL_F1]   = { .enable = true, },

	[AUD_PLL_A2]   = { .enable = true, },

	[AUD_PLL_F2]   = { .enable = true, },

	[AUD_PLL_APLL] = { .enable = true, },

	[AUD_PLL_HSC0] = { .enable = true, },

};



static int uniphier_aio_pxs2_probe(struct snd_soc_dai *dai)

{

	int ret;



	ret = uniphier_aio_dai_probe(dai);

	if (ret < 0)

		return ret;



	ret = snd_soc_dai_set_pll(dai, AUD_PLL_A1, 0, 0, 36864000);

	if (ret < 0)

		return ret;

	ret = snd_soc_dai_set_pll(dai, AUD_PLL_F1, 0, 0, 36864000);

	if (ret < 0)

		return ret;



	ret = snd_soc_dai_set_pll(dai, AUD_PLL_A2, 0, 0, 33868800);

	if (ret < 0)

		return ret;

	ret = snd_soc_dai_set_pll(dai, AUD_PLL_F2, 0, 0, 33868800);

	if (ret < 0)

		return ret;



	return 0;

}



static struct snd_soc_dai_driver uniphier_aio_dai_pxs2[] = {

	{

		.name    = AUD_GNAME_HDMI,

		.probe   = uniphier_aio_pxs2_probe,

		.remove  = uniphier_aio_dai_remove,

		.suspend = uniphier_aio_dai_suspend,

		.resume  = uniphier_aio_dai_resume,

		.playback = {

			.stream_name = AUD_NAME_HPCMOUT1,

			.formats     = SNDRV_PCM_FMTBIT_S32_LE,

			.rates       = SNDRV_PCM_RATE_48000,

			.channels_min = 2,

			.channels_max = 2,

		},

		.ops = &uniphier_aio_i2s_ops,

	},

	{

		.name    = AUD_GNAME_LINE,

		.probe   = uniphier_aio_pxs2_probe,

		.remove  = uniphier_aio_dai_remove,

		.suspend = uniphier_aio_dai_suspend,

		.resume  = uniphier_aio_dai_resume,

		.playback = {

			.stream_name = AUD_NAME_PCMOUT1,

			.formats     = SNDRV_PCM_FMTBIT_S32_LE,

			.rates       = SNDRV_PCM_RATE_48000,

			.channels_min = 2,

			.channels_max = 2,

		},

		.capture = {

			.stream_name = AUD_NAME_PCMIN1,

			.formats     = SNDRV_PCM_FMTBIT_S32_LE,

			.rates       = SNDRV_PCM_RATE_48000,

			.channels_min = 2,

			.channels_max = 2,

		},

		.ops = &uniphier_aio_i2s_ops,

	},

	{

		.name    = AUD_GNAME_AUX,

		.probe   = uniphier_aio_pxs2_probe,

		.remove  = uniphier_aio_dai_remove,

		.suspend = uniphier_aio_dai_suspend,

		.resume  = uniphier_aio_dai_resume,

		.playback = {

			.stream_name = AUD_NAME_PCMOUT2,

			.formats     = SNDRV_PCM_FMTBIT_S32_LE,

			.rates       = SNDRV_PCM_RATE_48000,

			.channels_min = 2,

			.channels_max = 2,

		},

		.capture = {

			.stream_name = AUD_NAME_PCMIN2,

			.formats     = SNDRV_PCM_FMTBIT_S32_LE,

			.rates       = SNDRV_PCM_RATE_48000,

			.channels_min = 2,

			.channels_max = 2,

		},

		.ops = &uniphier_aio_i2s_ops,

	},

	{

		.name    = AUD_NAME_HIECOUT1,

		.probe   = uniphier_aio_pxs2_probe,

		.remove  = uniphier_aio_dai_remove,

		.suspend = uniphier_aio_dai_suspend,

		.resume  = uniphier_aio_dai_resume,

		.playback = {

			.stream_name = AUD_NAME_HIECOUT1,

			.formats     = SNDRV_PCM_FMTBIT_S32_LE,

			.rates       = SNDRV_PCM_RATE_48000,

			.channels_min = 2,

			.channels_max = 2,

		},

		.ops = &uniphier_aio_spdif_ops,

	},

	{

		.name    = AUD_NAME_IECOUT1,

		.probe   = uniphier_aio_pxs2_probe,

		.remove  = uniphier_aio_dai_remove,

		.suspend = uniphier_aio_dai_suspend,

		.resume  = uniphier_aio_dai_resume,

		.playback = {

			.stream_name = AUD_NAME_IECOUT1,

			.formats     = SNDRV_PCM_FMTBIT_S32_LE,

			.rates       = SNDRV_PCM_RATE_48000,

			.channels_min = 2,

			.channels_max = 2,

		},

		.ops = &uniphier_aio_spdif_ops,

	},

	{

		.name    = AUD_NAME_HIECCOMPOUT1,

		.probe   = uniphier_aio_pxs2_probe,

		.remove  = uniphier_aio_dai_remove,

		.suspend = uniphier_aio_dai_suspend,

		.resume  = uniphier_aio_dai_resume,

		.compress_new = snd_soc_new_compress,

		.playback = {

			.stream_name = AUD_NAME_HIECCOMPOUT1,

			.channels_min = 1,

			.channels_max = 1,

		},

		.ops = &uniphier_aio_spdif_ops,

	},

	{

		.name    = AUD_NAME_IECCOMPOUT1,

		.probe   = uniphier_aio_pxs2_probe,

		.remove  = uniphier_aio_dai_remove,

		.suspend = uniphier_aio_dai_suspend,

		.resume  = uniphier_aio_dai_resume,

		.compress_new = snd_soc_new_compress,

		.playback = {

			.stream_name = AUD_NAME_IECCOMPOUT1,

			.channels_min = 1,

			.channels_max = 1,

		},

		.ops = &uniphier_aio_spdif_ops,

	},

};



static const struct uniphier_aio_chip_spec uniphier_aio_pxs2_spec = {

	.specs     = uniphier_aio_pxs2,

	.num_specs = ARRAY_SIZE(uniphier_aio_pxs2),

	.dais      = uniphier_aio_dai_pxs2,

	.num_dais  = ARRAY_SIZE(uniphier_aio_dai_pxs2),

	.plls      = uniphier_aio_pll_pxs2,

	.num_plls  = ARRAY_SIZE(uniphier_aio_pll_pxs2),

	.addr_ext  = 0,

};



static const struct of_device_id uniphier_aio_of_match[] = {

	{

		.compatible = "socionext,uniphier-pxs2-aio",

		.data = &uniphier_aio_pxs2_spec,

	},

	{},

};

MODULE_DEVICE_TABLE(of, uniphier_aio_of_match);



static struct platform_driver uniphier_aio_driver = {

	.driver = {

		.name = "snd-uniphier-aio-pxs2",

		.of_match_table = of_match_ptr(uniphier_aio_of_match),

	},

	.probe    = uniphier_aio_probe,

	.remove   = uniphier_aio_remove,

};

module_platform_driver(uniphier_aio_driver);



MODULE_AUTHOR("Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>");

MODULE_DESCRIPTION("UniPhier PXs2 AIO driver.");

MODULE_LICENSE("GPL v2");