Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc592b3b authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next

parents 1521b379 ba5295e5

Documentation/devicetree/bindings/sound/pcm512x.txt

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ on the board). 


Required properties:



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

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

                 "ti,pcm5142"



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

          number for SPI.

sound/soc/codecs/pcm512x-i2c.c

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ static int pcm512x_i2c_remove(struct i2c_client *i2c) 
static const struct i2c_device_id pcm512x_i2c_id[] = {

	{ "pcm5121", },

	{ "pcm5122", },

	{ "pcm5141", },

	{ "pcm5142", },

	{ }

};

MODULE_DEVICE_TABLE(i2c, pcm512x_i2c_id);
@@ -53,6 +55,8 @@ MODULE_DEVICE_TABLE(i2c, pcm512x_i2c_id); 
static const struct of_device_id pcm512x_of_match[] = {

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

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

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

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

	{ }

};

MODULE_DEVICE_TABLE(of, pcm512x_of_match);

sound/soc/codecs/pcm512x-spi.c

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ static int pcm512x_spi_remove(struct spi_device *spi) 
static const struct spi_device_id pcm512x_spi_id[] = {

	{ "pcm5121", },

	{ "pcm5122", },

	{ "pcm5141", },

	{ "pcm5142", },

	{ },

};

MODULE_DEVICE_TABLE(spi, pcm512x_spi_id);
@@ -50,6 +52,8 @@ MODULE_DEVICE_TABLE(spi, pcm512x_spi_id); 
static const struct of_device_id pcm512x_of_match[] = {

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

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

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

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

	{ }

};

MODULE_DEVICE_TABLE(of, pcm512x_of_match);