Unverified Commit 563c2632 authored by Jerome Brunet's avatar Jerome Brunet Committed by Mark Brown
Browse files

ASoC: es7134: add support for the es7154 



Add support for the es7154 which is basically an es7134 with an
embedded power amplifier and lower maximum sample rate

Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 30ddfffd

sound/soc/codecs/es7134.c

+59 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ struct es7134_clock_mode { 
};



struct es7134_chip {

	struct snd_soc_dai_driver *dai_drv;

	const struct es7134_clock_mode *modes;

	unsigned int mode_num;

	const struct snd_soc_dapm_widget *extra_widgets;
@@ -196,6 +197,7 @@ static const struct snd_soc_dapm_route es7134_extra_routes[] = { 
};



static const struct es7134_chip es7134_chip = {

	.dai_drv = &es7134_dai,

	.modes = es7134_modes,

	.mode_num = ARRAY_SIZE(es7134_modes),

	.extra_routes = es7134_extra_routes,
@@ -227,6 +229,61 @@ static const struct snd_soc_component_driver es7134_component_driver = { 
	.non_legacy_dai_naming	= 1,

};



static struct snd_soc_dai_driver es7154_dai = {

	.name = "es7154-hifi",

	.playback = {

		.stream_name = "Playback",

		.channels_min = 2,

		.channels_max = 2,

		.rates = (SNDRV_PCM_RATE_8000_48000 |

			  SNDRV_PCM_RATE_88200      |

			  SNDRV_PCM_RATE_96000),

		.formats = (SNDRV_PCM_FMTBIT_S16_LE  |

			    SNDRV_PCM_FMTBIT_S18_3LE |

			    SNDRV_PCM_FMTBIT_S20_3LE |

			    SNDRV_PCM_FMTBIT_S24_3LE |

			    SNDRV_PCM_FMTBIT_S24_LE),

	},

	.ops = &es7134_dai_ops,

};



static const struct es7134_clock_mode es7154_modes[] = {

	{

		/* Single speed mode */

		.rate_min = 8000,

		.rate_max = 50000,

		.mclk_fs = (unsigned int[]) { 32, 64, 128, 192, 256,

					      384, 512, 768, 1024 },

		.mclk_fs_num = 9,

	}, {

		/* Double speed mode */

		.rate_min = 84000,

		.rate_max = 100000,

		.mclk_fs = (unsigned int[]) { 128, 192, 256, 384, 512,

					      768, 1024},

		.mclk_fs_num = 7,

	}

};



/* Es7154 has a separate supply for digital I/O  */

static const struct snd_soc_dapm_widget es7154_extra_widgets[] = {

	SND_SOC_DAPM_REGULATOR_SUPPLY("PVDD", 0, 0),

};



static const struct snd_soc_dapm_route es7154_extra_routes[] = {

	{ "Playback", NULL, "PVDD", }

};



static const struct es7134_chip es7154_chip = {

	.dai_drv = &es7154_dai,

	.modes = es7154_modes,

	.mode_num = ARRAY_SIZE(es7154_modes),

	.extra_routes = es7154_extra_routes,

	.extra_route_num = ARRAY_SIZE(es7154_extra_routes),

	.extra_widgets = es7154_extra_widgets,

	.extra_widget_num = ARRAY_SIZE(es7154_extra_widgets),

};



static int es7134_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -245,13 +302,14 @@ static int es7134_probe(struct platform_device *pdev) 


	return devm_snd_soc_register_component(&pdev->dev,

				      &es7134_component_driver,

				      &es7134_dai, 1);

				      priv->chip->dai_drv, 1);

}



#ifdef CONFIG_OF

static const struct of_device_id es7134_ids[] = {

	{ .compatible = "everest,es7134", .data = &es7134_chip },

	{ .compatible = "everest,es7144", .data = &es7134_chip },

	{ .compatible = "everest,es7154", .data = &es7154_chip },

	{ }

};

MODULE_DEVICE_TABLE(of, es7134_ids);