From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Baluta Subject: [PATCH 1/2] ASoC: ak4458: Add support for AK4497 Date: Fri, 4 Jan 2019 16:27:03 +0000 Message-ID: <20190104162649.13103-2-daniel.baluta@nxp.com> References: <20190104162649.13103-1-daniel.baluta@nxp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <20190104162649.13103-1-daniel.baluta@nxp.com> Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org To: "broonie@kernel.org" , "alsa-devel@alsa-project.org" Cc: Cosmin Samoila , Daniel Baluta , Viorel Suman , "linux-kernel@vger.kernel.org" , "robh+dt@kernel.org" , "devicetree@vger.kernel.org" , "S.j. Wang" , dl-linux-imx , "daniel.baluta@gmail.com" List-Id: devicetree@vger.kernel.org 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: Daniel Baluta --- sound/soc/codecs/ak4458.c | 79 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/ak4458.c b/sound/soc/codecs/ak4458.c index 70d4c89bd6fc..eab7c76cfcd9 100644 --- a/sound/soc/codecs/ak4458.c +++ b/sound/soc/codecs/ak4458.c @@ -21,6 +21,11 @@ =20 #include "ak4458.h" =20 +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= [] =3D { {"AK4458 AOUTD", NULL, "AK4458 DAC4"}, }; =20 +/* ak4497 controls */ +static const struct snd_kcontrol_new ak4497_snd_controls[] =3D { + 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[] =3D { + 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[] =3D { + {"AK4497 DAC", NULL, "AK4497 SDTI"}, + {"AK4497 AOUT", NULL, "AK4497 DAC"}, + +}; + static int ak4458_rstn_control(struct snd_soc_component *component, int bi= t) { int ret; @@ -476,6 +508,18 @@ static struct snd_soc_dai_driver ak4458_dai =3D { .ops =3D &ak4458_dai_ops, }; =20 +static struct snd_soc_dai_driver ak4497_dai =3D { + .name =3D "ak4497-aif", + .playback =3D { + .stream_name =3D "Playback", + .channels_min =3D 1, + .channels_max =3D 2, + .rates =3D SNDRV_PCM_RATE_KNOT, + .formats =3D AK4458_FORMATS, + }, + .ops =3D &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 =3D { .non_legacy_dai_naming =3D 1, }; =20 +static const struct snd_soc_component_driver soc_codec_dev_ak4497 =3D { + .probe =3D ak4458_probe, + .remove =3D ak4458_remove, + .controls =3D ak4497_snd_controls, + .num_controls =3D ARRAY_SIZE(ak4497_snd_controls), + .dapm_widgets =3D ak4497_dapm_widgets, + .num_dapm_widgets =3D ARRAY_SIZE(ak4497_dapm_widgets), + .dapm_routes =3D ak4497_intercon, + .num_dapm_routes =3D ARRAY_SIZE(ak4497_intercon), + .idle_bias_on =3D 1, + .use_pmdown_time =3D 1, + .endianness =3D 1, + .non_legacy_dai_naming =3D 1, +}; + static const struct regmap_config ak4458_regmap =3D { .reg_bits =3D 8, .val_bits =3D 8, @@ -583,6 +642,16 @@ static const struct regmap_config ak4458_regmap =3D { .cache_type =3D REGCACHE_RBTREE, }; =20 +static const struct ak4458_drvdata ak4458_drvdata =3D { + .dai_drv =3D &ak4458_dai, + .comp_drv =3D &soc_codec_dev_ak4458, +}; + +static const struct ak4458_drvdata ak4497_drvdata =3D { + .dai_drv =3D &ak4497_dai, + .comp_drv =3D &soc_codec_dev_ak4497, +}; + static const struct dev_pm_ops ak4458_pm =3D { 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 =3D { static int ak4458_i2c_probe(struct i2c_client *i2c) { struct ak4458_priv *ak4458; + const struct ak4458_drvdata *drvdata; int ret; =20 ak4458 =3D 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 =3D &i2c->dev; =20 + drvdata =3D of_device_get_match_data(&i2c->dev); + ak4458->reset_gpiod =3D 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); =20 - ret =3D devm_snd_soc_register_component(ak4458->dev, &soc_codec_dev_ak445= 8, - &ak4458_dai, 1); + ret =3D 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) } =20 static const struct of_device_id ak4458_of_match[] =3D { - { .compatible =3D "asahi-kasei,ak4458", }, + { .compatible =3D "asahi-kasei,ak4458", .data =3D &ak4458_drvdata}, + { .compatible =3D "asahi-kasei,ak4497", .data =3D &ak4497_drvdata}, { }, }; =20 --=20 2.17.1