Unverified Commit 09303601 authored by Andrew F. Davis's avatar Andrew F. Davis Committed by Mark Brown
Browse files

ASoC: tlv320aic31xx: Move ACPI table next to OF table 



Signed-off-by: default avatarAndrew F. Davis <afd@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c7734e8e

sound/soc/codecs/tlv320aic31xx.c

+8 −8
Original line number Diff line number Diff line
@@ -1285,6 +1285,14 @@ static void aic31xx_pdata_from_of(struct aic31xx_priv *aic31xx) 
}

#endif /* CONFIG_OF */



#ifdef CONFIG_ACPI

static const struct acpi_device_id aic31xx_acpi_match[] = {

	{ "10TI3100", 0 },

	{ }

};

MODULE_DEVICE_TABLE(acpi, aic31xx_acpi_match);

#endif



static int aic31xx_device_init(struct aic31xx_priv *aic31xx)

{

	int ret, i;
@@ -1382,14 +1390,6 @@ static const struct i2c_device_id 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 = {

	.driver = {

		.name	= "tlv320aic31xx-codec",