Commit 7d630ce4 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/es8316',... 

Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/es8316', 'asoc/topic/fsi', 'asoc/topic/fsl' and 'asoc/topic/hdmi' into asoc-next
parents 3b2d0bb5 b8884548 a6a67da3 dd80627d b1dc00ab 943fa022

sound/soc/codecs/hdmi-codec.c

+5 −5
Original line number Diff line number Diff line
@@ -67,14 +67,14 @@ struct hdmi_codec_cea_spk_alloc { 
};



/* Channel maps  stereo HDMI */

const struct snd_pcm_chmap_elem hdmi_codec_stereo_chmaps[] = {

static const struct snd_pcm_chmap_elem hdmi_codec_stereo_chmaps[] = {

	{ .channels = 2,

	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } },

	{ }

};



/* Channel maps for multi-channel playbacks, up to 8 n_ch */

const struct snd_pcm_chmap_elem hdmi_codec_8ch_chmaps[] = {

static const struct snd_pcm_chmap_elem hdmi_codec_8ch_chmaps[] = {

	{ .channels = 2, /* CA_ID 0x00 */

	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } },

	{ .channels = 4, /* CA_ID 0x01 */
@@ -340,7 +340,7 @@ static unsigned long hdmi_codec_spk_mask_from_alloc(int spk_alloc) 
	return spk_mask;

}



void hdmi_codec_eld_chmap(struct hdmi_codec_priv *hcp)

static void hdmi_codec_eld_chmap(struct hdmi_codec_priv *hcp)

{

	u8 spk_alloc;

	unsigned long spk_mask;
@@ -696,7 +696,7 @@ static const struct snd_soc_dai_driver hdmi_i2s_dai = { 
	.name = "i2s-hifi",

	.id = DAI_ID_I2S,

	.playback = {

		.stream_name = "Playback",

		.stream_name = "I2S Playback",

		.channels_min = 2,

		.channels_max = 8,

		.rates = HDMI_RATES,
@@ -711,7 +711,7 @@ static const struct snd_soc_dai_driver hdmi_spdif_dai = { 
	.name = "spdif-hifi",

	.id = DAI_ID_SPDIF,

	.playback = {

		.stream_name = "Playback",

		.stream_name = "SPDIF Playback",

		.channels_min = 2,

		.channels_max = 2,

		.rates = HDMI_RATES,

sound/soc/dwc/dwc-i2s.c

+2 −4
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static int dw_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) 
	return ret;

}



static struct snd_soc_dai_ops dw_i2s_dai_ops = {

static const struct snd_soc_dai_ops dw_i2s_dai_ops = {

	.startup	= dw_i2s_startup,

	.shutdown	= dw_i2s_shutdown,

	.hw_params	= dw_i2s_hw_params,
@@ -617,10 +617,8 @@ static int dw_i2s_probe(struct platform_device *pdev) 
	const char *clk_id;



	dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);

	if (!dev) {

		dev_warn(&pdev->dev, "kzalloc fail\n");

	if (!dev)

		return -ENOMEM;

	}



	dw_i2s_dai = devm_kzalloc(&pdev->dev, sizeof(*dw_i2s_dai), GFP_KERNEL);

	if (!dw_i2s_dai)

sound/soc/fsl/fsl-asoc-card.c

+1 −1
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
	snd_soc_card_set_drvdata(&priv->card, priv);



	ret = devm_snd_soc_register_card(&pdev->dev, &priv->card);

	if (ret)

	if (ret && ret != -EPROBE_DEFER)

		dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);



asrc_fail:

sound/soc/fsl/fsl_asrc.c

+1 −1
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static int fsl_asrc_dai_trigger(struct snd_pcm_substream *substream, int cmd, 
	return 0;

}



static struct snd_soc_dai_ops fsl_asrc_dai_ops = {

static const struct snd_soc_dai_ops fsl_asrc_dai_ops = {

	.hw_params    = fsl_asrc_dai_hw_params,

	.hw_free      = fsl_asrc_dai_hw_free,

	.trigger      = fsl_asrc_dai_trigger,

sound/soc/fsl/fsl_asrc_dma.c

+2 −4
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#define FSL_ASRC_DMABUF_SIZE	(256 * 1024)



static struct snd_pcm_hardware snd_imx_hardware = {

static const struct snd_pcm_hardware snd_imx_hardware = {

	.info = SNDRV_PCM_INFO_INTERLEAVED |

		SNDRV_PCM_INFO_BLOCK_TRANSFER |

		SNDRV_PCM_INFO_MMAP |
@@ -279,10 +279,8 @@ static int fsl_asrc_dma_startup(struct snd_pcm_substream *substream) 
	struct fsl_asrc_pair *pair;



	pair = kzalloc(sizeof(struct fsl_asrc_pair), GFP_KERNEL);

	if (!pair) {

		dev_err(dev, "failed to allocate pair\n");

	if (!pair)

		return -ENOMEM;

	}



	pair->asrc_priv = asrc_priv;