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

ASoC: add compatible for ti,pcm5242 

Merge series from Christian Hewitt <christianshewitt@gmail.com>:

Update bindings and add a driver compatible for the pcm5242
chip used on the Odroid HiFi-Shield2 i2c mezzanine board.
parents f57d7f52 9427997a

Documentation/devicetree/bindings/sound/pcm512x.txt

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ on the board). The TAS575x devices only support I2C. 
Required properties:



  - compatible : One of "ti,pcm5121", "ti,pcm5122", "ti,pcm5141",

                 "ti,pcm5142", "ti,tas5754" or "ti,tas5756"

                 "ti,pcm5142", "ti,pcm5242", "ti,tas5754" or "ti,tas5756"



  - reg : the I2C address of the device for I2C, the chip select

          number for SPI.

sound/soc/codecs/pcm512x-i2c.c

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ static const struct i2c_device_id pcm512x_i2c_id[] = { 
	{ "pcm5122", },

	{ "pcm5141", },

	{ "pcm5142", },

	{ "pcm5242", },

	{ "tas5754", },

	{ "tas5756", },

	{ }
@@ -51,6 +52,7 @@ static const struct of_device_id pcm512x_of_match[] = { 
	{ .compatible = "ti,pcm5122", },

	{ .compatible = "ti,pcm5141", },

	{ .compatible = "ti,pcm5142", },

	{ .compatible = "ti,pcm5242", },

	{ .compatible = "ti,tas5754", },

	{ .compatible = "ti,tas5756", },

	{ }

sound/soc/codecs/pcm512x-spi.c

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ static const struct spi_device_id pcm512x_spi_id[] = { 
	{ "pcm5122", },

	{ "pcm5141", },

	{ "pcm5142", },

	{ "pcm5242", },

	{ },

};

MODULE_DEVICE_TABLE(spi, pcm512x_spi_id);
@@ -45,6 +46,7 @@ static const struct of_device_id pcm512x_of_match[] = { 
	{ .compatible = "ti,pcm5122", },

	{ .compatible = "ti,pcm5141", },

	{ .compatible = "ti,pcm5142", },

	{ .compatible = "ti,pcm5242", },

	{ }

};

MODULE_DEVICE_TABLE(of, pcm512x_of_match);