Unverified Commit a3e39ed1 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/amd', 'asoc/fix/hdmi-codec',... 

Merge remote-tracking branches 'asoc/fix/amd', 'asoc/fix/hdmi-codec', 'asoc/fix/rt5651', 'asoc/fix/samsung', 'asoc/fix/sgtl5000', 'asoc/fix/sunxi' and 'asoc/fix/wm-adsp' into asoc-linus
parents 0c8efd61 a37d48e3 5e558f8a 2d30e949 dbe7d4c6 a8992973 5a338679 d7789f5b

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -9925,6 +9925,13 @@ F: Documentation/ABI/stable/sysfs-bus-nvmem 
F:	include/linux/nvmem-consumer.h

F:	include/linux/nvmem-provider.h



NXP SGTL5000 DRIVER

M:	Fabio Estevam <fabio.estevam@nxp.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/sound/sgtl5000.txt

F:	sound/soc/codecs/sgtl5000*



NXP TDA998X DRM DRIVER

M:	Russell King <linux@armlinux.org.uk>

S:	Supported
@@ -12107,6 +12114,7 @@ M: Sylwester Nawrocki <s.nawrocki@samsung.com> 
L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

F:	sound/soc/samsung/

F:	Documentation/devicetree/bindings/sound/samsung*



SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER

M:	Krzysztof Kozlowski <krzk@kernel.org>

sound/soc/amd/acp-pcm-dma.c

+9 −7
Original line number Diff line number Diff line
@@ -579,13 +579,6 @@ static int acp_init(void __iomem *acp_mmio, u32 asic_type) 
		for (bank = 1; bank < 48; bank++)

			acp_set_sram_bank_state(acp_mmio, bank, false);

	}



	/* Stoney supports 16bit resolution */

	if (asic_type == CHIP_STONEY) {

		val = acp_reg_read(acp_mmio, mmACP_I2S_16BIT_RESOLUTION_EN);

		val |= 0x03;

		acp_reg_write(val, acp_mmio, mmACP_I2S_16BIT_RESOLUTION_EN);

	}

	return 0;

}
@@ -774,6 +767,7 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, 
{

	int status;

	uint64_t size;

	u32 val = 0;

	struct page *pg;

	struct snd_pcm_runtime *runtime;

	struct audio_substream_data *rtd;
@@ -786,6 +780,14 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, 
	if (WARN_ON(!rtd))

		return -EINVAL;



	if (adata->asic_type == CHIP_STONEY) {

		val = acp_reg_read(adata->acp_mmio, mmACP_I2S_16BIT_RESOLUTION_EN);

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)

			val |= ACP_I2S_SP_16BIT_RESOLUTION_EN;

		else

			val |= ACP_I2S_MIC_16BIT_RESOLUTION_EN;

		acp_reg_write(val, adata->acp_mmio, mmACP_I2S_16BIT_RESOLUTION_EN);

	}

	size = params_buffer_bytes(params);

	status = snd_pcm_lib_malloc_pages(substream, size);

	if (status < 0)

sound/soc/amd/acp.h

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ 
#define CAPTURE_END_DMA_DESCR_CH15 7



#define mmACP_I2S_16BIT_RESOLUTION_EN       0x5209

#define ACP_I2S_MIC_16BIT_RESOLUTION_EN 0x01

#define ACP_I2S_SP_16BIT_RESOLUTION_EN	0x02

enum acp_dma_priority_level {

	/* 0x0 Specifies the DMA channel is given normal priority */

	ACP_DMA_PRIORITY_LEVEL_NORMAL = 0x0,

sound/soc/codecs/hdmi-codec.c

+1 −6
Original line number Diff line number Diff line
@@ -798,12 +798,7 @@ static int hdmi_codec_probe(struct platform_device *pdev) 


static int hdmi_codec_remove(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct hdmi_codec_priv *hcp;



	hcp = dev_get_drvdata(dev);

	kfree(hcp->chmap_info);

	snd_soc_unregister_codec(dev);

	snd_soc_unregister_codec(&pdev->dev);



	return 0;

}

sound/soc/codecs/rt5651.c

+1 −0
Original line number Diff line number Diff line
@@ -1722,6 +1722,7 @@ static const struct regmap_config rt5651_regmap = { 
	.num_reg_defaults = ARRAY_SIZE(rt5651_reg),

	.ranges = rt5651_ranges,

	.num_ranges = ARRAY_SIZE(rt5651_ranges),

	.use_single_rw = true,

};



#if defined(CONFIG_OF)