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

Commit 38e3c63d authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 5d8cf768 f5cc1772

sound/soc/codecs/tlv320aic31xx.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/regulator/consumer.h>

#include <linux/regulator/consumer.h>

#include <linux/acpi.h>

#include <linux/of.h>

#include <linux/of.h>

#include <linux/of_gpio.h>

#include <linux/of_gpio.h>

#include <linux/slab.h>

#include <linux/slab.h>
@@ -1280,10 +1281,19 @@ static const struct i2c_device_id aic31xx_i2c_id[] = { 
};

};

MODULE_DEVICE_TABLE(i2c, aic31xx_i2c_id);

MODULE_DEVICE_TABLE(i2c, aic31xx_i2c_id);





#ifdef CONFIG_ACPI

static const struct acpi_device_id aic31xx_acpi_match[] = {

	{ "10TI3100", 0 },

	{ }

};

MODULE_DEVICE_TABLE(acpi, aic31xx_acpi_match);

#endif



static struct i2c_driver aic31xx_i2c_driver = {

static struct i2c_driver aic31xx_i2c_driver = {

	.driver = {

	.driver = {

		.name	= "tlv320aic31xx-codec",

		.name	= "tlv320aic31xx-codec",

		.of_match_table = of_match_ptr(tlv320aic31xx_of_match),

		.of_match_table = of_match_ptr(tlv320aic31xx_of_match),

		.acpi_match_table = ACPI_PTR(aic31xx_acpi_match),

	},

	},

	.probe		= aic31xx_i2c_probe,

	.probe		= aic31xx_i2c_probe,

	.remove		= aic31xx_i2c_remove,

	.remove		= aic31xx_i2c_remove,