Commit 643aa2c5 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/adsp', 'asoc/fix/cs41l51',... 

Merge remote-tracking branches 'asoc/fix/adsp', 'asoc/fix/cs41l51', 'asoc/fix/dpcm', 'asoc/fix/es8328', 'asoc/fix/fsl-asrc', 'asoc/fix/max98090', 'asoc/fix/rcar', 'asoc/fix/rockchip' and 'asoc/fix/rt5645' into asoc-linus
parents a9aa32c5 9da7a5a9 2cb1e025 ea9d0d77 b2a9a3b8 86a570c5 ece509c1 706c6621 29f95bd7 df078d29

include/sound/soc-dpcm.h

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ struct snd_soc_dpcm_runtime { 
	/* state and update */

	enum snd_soc_dpcm_update runtime_update;

	enum snd_soc_dpcm_state state;



	int trigger_pending; /* trigger cmd + 1 if pending, 0 if not */

};



/* can this BE stop and free */

sound/soc/codecs/cs42l51-i2c.c

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static struct i2c_driver cs42l51_i2c_driver = { 
	.driver = {

		.name = "cs42l51",

		.owner = THIS_MODULE,

		.of_match_table = cs42l51_of_match,

	},

	.probe = cs42l51_i2c_probe,

	.remove = cs42l51_i2c_remove,

sound/soc/codecs/cs42l51.c

+3 −1
Original line number Diff line number Diff line
@@ -558,11 +558,13 @@ int cs42l51_probe(struct device *dev, struct regmap *regmap) 
}

EXPORT_SYMBOL_GPL(cs42l51_probe);



static const struct of_device_id cs42l51_of_match[] = {

const struct of_device_id cs42l51_of_match[] = {

	{ .compatible = "cirrus,cs42l51", },

	{ }

};

MODULE_DEVICE_TABLE(of, cs42l51_of_match);

EXPORT_SYMBOL_GPL(cs42l51_of_match);



MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>");

MODULE_DESCRIPTION("Cirrus Logic CS42L51 ALSA SoC Codec Driver");

MODULE_LICENSE("GPL");

sound/soc/codecs/cs42l51.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ struct device; 


extern const struct regmap_config cs42l51_regmap;

int cs42l51_probe(struct device *dev, struct regmap *regmap);

extern const struct of_device_id cs42l51_of_match[];



#define CS42L51_CHIP_ID			0x1B

#define CS42L51_CHIP_REV_A		0x00

sound/soc/codecs/es8328-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include "es8328.h"



static const struct i2c_device_id es8328_id[] = {

	{ "everest,es8328", 0 },

	{ "es8328", 0 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, es8328_id);