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

Unverified Commit ee6047b8 authored by Daniel Baluta's avatar Daniel Baluta Committed by Mark Brown
Browse files

ASoC: ak4458: Add support for AK4497 

AK4497 is a 32-bit 2ch DAC and has the same register
map as AK4458 with few exceptions:

* AK4497 has one more register at the end of register space
  DFS_READ which is a read only register that allows users
  to read FS Auto Detection mode. We currently do not use
  this register so we use the same regmap structure as for ak4458.

* Because AK4458 is an 8ch DAC there are some fields that are
  only used by AK4458 and marked as reserved for AK4497, so for
  this reason we need to have a distinct set of controls, widgets
  and routes.

Datasheet for AK4497 is at:
https://www.akm.com/akm/en/file/ev-board-manual/AK4497EQ.pdf

Datasheet for AK4458 is at:
https://www.akm.com/akm/en/file/datasheet/AK4458VN.pdf



Signed-off-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent aa07e38b

sound/soc/codecs/ak4458.c

+76 −3
Original line number Diff line number Diff line
@@ -21,6 +21,11 @@ 


#include "ak4458.h"



struct ak4458_drvdata {

	struct snd_soc_dai_driver *dai_drv;

	const struct snd_soc_component_driver *comp_drv;

};



/* AK4458 Codec Private Data */

struct ak4458_priv {

	struct device *dev;
@@ -258,6 +263,33 @@ static const struct snd_soc_dapm_route ak4458_intercon[] = { 
	{"AK4458 AOUTD",	NULL,	"AK4458 DAC4"},

};



/* ak4497 controls */

static const struct snd_kcontrol_new ak4497_snd_controls[] = {

	SOC_DOUBLE_R_TLV("DAC Playback Volume", AK4458_03_LCHATT,

			 AK4458_04_RCHATT, 0, 0xFF, 0, dac_tlv),

	SOC_ENUM("AK4497 De-emphasis Response DAC", ak4458_dac1_dem_enum),

	SOC_ENUM_EXT("AK4497 Digital Filter Setting", ak4458_digfil_enum,

		     get_digfil, set_digfil),

	SOC_ENUM("AK4497 Inverting Enable of DZFB", ak4458_dzfb_enum),

	SOC_ENUM("AK4497 Sound Mode", ak4458_sm_enum),

	SOC_ENUM("AK4497 Attenuation transition Time Setting",

		 ak4458_ats_enum),

};



/* ak4497 dapm widgets */

static const struct snd_soc_dapm_widget ak4497_dapm_widgets[] = {

	SND_SOC_DAPM_DAC("AK4497 DAC", NULL, AK4458_0A_CONTROL6, 2, 0),

	SND_SOC_DAPM_AIF_IN("AK4497 SDTI", "Playback", 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_OUTPUT("AK4497 AOUT"),

};



/* ak4497 dapm routes */

static const struct snd_soc_dapm_route ak4497_intercon[] = {

	{"AK4497 DAC",		NULL,	"AK4497 SDTI"},

	{"AK4497 AOUT",		NULL,	"AK4497 DAC"},



};



static int ak4458_rstn_control(struct snd_soc_component *component, int bit)

{

	int ret;
@@ -476,6 +508,18 @@ static struct snd_soc_dai_driver ak4458_dai = { 
	.ops = &ak4458_dai_ops,

};



static struct snd_soc_dai_driver ak4497_dai = {

	.name = "ak4497-aif",

	.playback = {

		.stream_name = "Playback",

		.channels_min = 1,

		.channels_max = 2,

		.rates = SNDRV_PCM_RATE_KNOT,

		.formats = AK4458_FORMATS,

	},

	.ops = &ak4458_dai_ops,

};



static void ak4458_power_off(struct ak4458_priv *ak4458)

{

	if (ak4458->reset_gpiod) {
@@ -573,6 +617,21 @@ static const struct snd_soc_component_driver soc_codec_dev_ak4458 = { 
	.non_legacy_dai_naming	= 1,

};



static const struct snd_soc_component_driver soc_codec_dev_ak4497 = {

	.probe			= ak4458_probe,

	.remove			= ak4458_remove,

	.controls		= ak4497_snd_controls,

	.num_controls		= ARRAY_SIZE(ak4497_snd_controls),

	.dapm_widgets		= ak4497_dapm_widgets,

	.num_dapm_widgets	= ARRAY_SIZE(ak4497_dapm_widgets),

	.dapm_routes		= ak4497_intercon,

	.num_dapm_routes	= ARRAY_SIZE(ak4497_intercon),

	.idle_bias_on		= 1,

	.use_pmdown_time	= 1,

	.endianness		= 1,

	.non_legacy_dai_naming	= 1,

};



static const struct regmap_config ak4458_regmap = {

	.reg_bits = 8,

	.val_bits = 8,
@@ -583,6 +642,16 @@ static const struct regmap_config ak4458_regmap = { 
	.cache_type = REGCACHE_RBTREE,

};



static const struct ak4458_drvdata ak4458_drvdata = {

	.dai_drv = &ak4458_dai,

	.comp_drv = &soc_codec_dev_ak4458,

};



static const struct ak4458_drvdata ak4497_drvdata = {

	.dai_drv = &ak4497_dai,

	.comp_drv = &soc_codec_dev_ak4497,

};



static const struct dev_pm_ops ak4458_pm = {

	SET_RUNTIME_PM_OPS(ak4458_runtime_suspend, ak4458_runtime_resume, NULL)

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
@@ -592,6 +661,7 @@ static const struct dev_pm_ops ak4458_pm = { 
static int ak4458_i2c_probe(struct i2c_client *i2c)

{

	struct ak4458_priv *ak4458;

	const struct ak4458_drvdata *drvdata;

	int ret;



	ak4458 = devm_kzalloc(&i2c->dev, sizeof(*ak4458), GFP_KERNEL);
@@ -605,6 +675,8 @@ static int ak4458_i2c_probe(struct i2c_client *i2c) 
	i2c_set_clientdata(i2c, ak4458);

	ak4458->dev = &i2c->dev;



	drvdata = of_device_get_match_data(&i2c->dev);



	ak4458->reset_gpiod = devm_gpiod_get_optional(ak4458->dev, "reset",

						      GPIOD_OUT_LOW);

	if (IS_ERR(ak4458->reset_gpiod))
@@ -615,8 +687,8 @@ static int ak4458_i2c_probe(struct i2c_client *i2c) 
	if (IS_ERR(ak4458->mute_gpiod))

		return PTR_ERR(ak4458->mute_gpiod);



	ret = devm_snd_soc_register_component(ak4458->dev, &soc_codec_dev_ak4458,

				     &ak4458_dai, 1);

	ret = devm_snd_soc_register_component(ak4458->dev, drvdata->comp_drv,

					      drvdata->dai_drv, 1);

	if (ret < 0) {

		dev_err(ak4458->dev, "Failed to register CODEC: %d\n", ret);

		return ret;
@@ -635,7 +707,8 @@ static int ak4458_i2c_remove(struct i2c_client *i2c) 
}



static const struct of_device_id ak4458_of_match[] = {

	{ .compatible = "asahi-kasei,ak4458", },

	{ .compatible = "asahi-kasei,ak4458", .data = &ak4458_drvdata},

	{ .compatible = "asahi-kasei,ak4497", .data = &ak4497_drvdata},

	{ },

};