Commit 5b66dde4 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown

ASoC: Intel: hsw_rt5640: Update code indentation

Make use of 100 character limit and modify indentation so code is easier
to read. While at it, sort includes in alphabetical order.
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Tested-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220620101402.2684366-5-cezary.rojewski@intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent a69615e8
...@@ -9,10 +9,9 @@ ...@@ -9,10 +9,9 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/soc-acpi.h> #include <sound/soc-acpi.h>
#include <sound/pcm_params.h>
#include "../../codecs/rt5640.h" #include "../../codecs/rt5640.h"
/* Haswell ULT platforms have a Headphone and Mic jack */ /* Haswell ULT platforms have a Headphone and Mic jack */
...@@ -22,7 +21,6 @@ static const struct snd_soc_dapm_widget card_widgets[] = { ...@@ -22,7 +21,6 @@ static const struct snd_soc_dapm_widget card_widgets[] = {
}; };
static const struct snd_soc_dapm_route card_routes[] = { static const struct snd_soc_dapm_route card_routes[] = {
{"Headphones", NULL, "HPOR"}, {"Headphones", NULL, "HPOR"},
{"Headphones", NULL, "HPOL"}, {"Headphones", NULL, "HPOL"},
{"IN2P", NULL, "Mic"}, {"IN2P", NULL, "Mic"},
...@@ -33,32 +31,28 @@ static const struct snd_soc_dapm_route card_routes[] = { ...@@ -33,32 +31,28 @@ static const struct snd_soc_dapm_route card_routes[] = {
}; };
static int codec_link_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, static int codec_link_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct snd_interval *rate = hw_param_interval(params, struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
SNDRV_PCM_HW_PARAM_RATE); struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
struct snd_interval *channels = hw_param_interval(params,
SNDRV_PCM_HW_PARAM_CHANNELS);
/* The ADSP will covert the FE rate to 48k, stereo */ /* The ADSP will covert the FE rate to 48k, stereo */
rate->min = rate->max = 48000; rate->min = rate->max = 48000;
channels->min = channels->max = 2; channels->min = channels->max = 2;
/* set SSP0 to 16 bit */ /* set SSP0 to 16 bit */
params_set_format(params, SNDRV_PCM_FORMAT_S16_LE); params_set_format(params, SNDRV_PCM_FORMAT_S16_LE);
return 0; return 0;
} }
static int codec_link_hw_params(struct snd_pcm_substream *substream, static int codec_link_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
int ret; int ret;
ret = snd_soc_dai_set_sysclk(codec_dai, RT5640_SCLK_S_MCLK, 12288000, ret = snd_soc_dai_set_sysclk(codec_dai, RT5640_SCLK_S_MCLK, 12288000, SND_SOC_CLOCK_IN);
SND_SOC_CLOCK_IN);
if (ret < 0) { if (ret < 0) {
dev_err(rtd->dev, "can't set codec sysclk configuration\n"); dev_err(rtd->dev, "can't set codec sysclk configuration\n");
return ret; return ret;
...@@ -74,29 +68,15 @@ static const struct snd_soc_ops codec_link_ops = { ...@@ -74,29 +68,15 @@ static const struct snd_soc_ops codec_link_ops = {
.hw_params = codec_link_hw_params, .hw_params = codec_link_hw_params,
}; };
SND_SOC_DAILINK_DEF(dummy, SND_SOC_DAILINK_DEF(system, DAILINK_COMP_ARRAY(COMP_CPU("System Pin")));
DAILINK_COMP_ARRAY(COMP_DUMMY())); SND_SOC_DAILINK_DEF(offload0, DAILINK_COMP_ARRAY(COMP_CPU("Offload0 Pin")));
SND_SOC_DAILINK_DEF(offload1, DAILINK_COMP_ARRAY(COMP_CPU("Offload1 Pin")));
SND_SOC_DAILINK_DEF(system, SND_SOC_DAILINK_DEF(loopback, DAILINK_COMP_ARRAY(COMP_CPU("Loopback Pin")));
DAILINK_COMP_ARRAY(COMP_CPU("System Pin")));
SND_SOC_DAILINK_DEF(offload0, SND_SOC_DAILINK_DEF(dummy, DAILINK_COMP_ARRAY(COMP_DUMMY()));
DAILINK_COMP_ARRAY(COMP_CPU("Offload0 Pin"))); SND_SOC_DAILINK_DEF(codec, DAILINK_COMP_ARRAY(COMP_CODEC("i2c-INT33CA:00", "rt5640-aif1")));
SND_SOC_DAILINK_DEF(platform, DAILINK_COMP_ARRAY(COMP_PLATFORM("haswell-pcm-audio")));
SND_SOC_DAILINK_DEF(offload1, SND_SOC_DAILINK_DEF(ssp0_port, DAILINK_COMP_ARRAY(COMP_CPU("ssp0-port")));
DAILINK_COMP_ARRAY(COMP_CPU("Offload1 Pin")));
SND_SOC_DAILINK_DEF(loopback,
DAILINK_COMP_ARRAY(COMP_CPU("Loopback Pin")));
SND_SOC_DAILINK_DEF(codec,
DAILINK_COMP_ARRAY(COMP_CODEC("i2c-INT33CA:00", "rt5640-aif1")));
SND_SOC_DAILINK_DEF(platform,
DAILINK_COMP_ARRAY(COMP_PLATFORM("haswell-pcm-audio")));
SND_SOC_DAILINK_DEF(ssp0_port,
DAILINK_COMP_ARRAY(COMP_CPU("ssp0-port")));
static struct snd_soc_dai_link card_dai_links[] = { static struct snd_soc_dai_link card_dai_links[] = {
/* Front End DAI links */ /* Front End DAI links */
...@@ -137,15 +117,13 @@ static struct snd_soc_dai_link card_dai_links[] = { ...@@ -137,15 +117,13 @@ static struct snd_soc_dai_link card_dai_links[] = {
.dpcm_capture = 1, .dpcm_capture = 1,
SND_SOC_DAILINK_REG(loopback, dummy, platform), SND_SOC_DAILINK_REG(loopback, dummy, platform),
}, },
/* Back End DAI links */ /* Back End DAI links */
{ {
/* SSP0 - Codec */ /* SSP0 - Codec */
.name = "Codec", .name = "Codec",
.id = 0, .id = 0,
.no_pcm = 1, .no_pcm = 1,
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC,
SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = codec_link_hw_params_fixup, .be_hw_params_fixup = codec_link_hw_params_fixup,
.ops = &codec_link_ops, .ops = &codec_link_ops,
...@@ -174,11 +152,10 @@ static int hsw_rt5640_probe(struct platform_device *pdev) ...@@ -174,11 +152,10 @@ static int hsw_rt5640_probe(struct platform_device *pdev)
int ret; int ret;
hsw_rt5640_card.dev = &pdev->dev; hsw_rt5640_card.dev = &pdev->dev;
/* override platform name, if required */ /* override platform name, if required */
mach = pdev->dev.platform_data; mach = pdev->dev.platform_data;
ret = snd_soc_fixup_dai_links_platform_name(&hsw_rt5640_card,
mach->mach_params.platform); ret = snd_soc_fixup_dai_links_platform_name(&hsw_rt5640_card, mach->mach_params.platform);
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment