Unverified Commit 24056de9 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: codecs: Update device_id tables for Realtek 

Merge series from Cezary Rojewski <cezary.rojewski@intel.com>:

The series aims to streamline the formatting for ACPI IDs so that a
single pattern can be used to identify the device.

Work implicitly suggested by Andy Shevchenko - reading and learning from
number of his reviews on the Linux mailing lists.

Several formats do exists, however, after technical discussion PCI-based
format has been selected as the recommended one. For Realtek devices, it
is going to be 10ECxxxx where 10EC unambiguously identifies Realtek
company whereas the following 4 hexes specify the PART_ID i.e.: the
device.

While at it, there shall be no comma after the terminator entry and
initializing fields with 0 for statically defined structs is redundant.
parents ee3cce59 739db052

sound/soc/codecs/rt1011.c

+3 −3
Original line number Diff line number Diff line
@@ -2192,15 +2192,15 @@ static const struct regmap_config rt1011_regmap = { 
#if defined(CONFIG_OF)

static const struct of_device_id rt1011_of_match[] = {

	{ .compatible = "realtek,rt1011", },

	{},

	{ }

};

MODULE_DEVICE_TABLE(of, rt1011_of_match);

#endif



#ifdef CONFIG_ACPI

static const struct acpi_device_id rt1011_acpi_match[] = {

	{"10EC1011", 0,},

	{},

	{ "10EC1011" },

	{ }

};

MODULE_DEVICE_TABLE(acpi, rt1011_acpi_match);

#endif

sound/soc/codecs/rt1015.c

+3 −3
Original line number Diff line number Diff line
@@ -1105,15 +1105,15 @@ MODULE_DEVICE_TABLE(i2c, rt1015_i2c_id); 
#if defined(CONFIG_OF)

static const struct of_device_id rt1015_of_match[] = {

	{ .compatible = "realtek,rt1015", },

	{},

	{ }

};

MODULE_DEVICE_TABLE(of, rt1015_of_match);

#endif



#ifdef CONFIG_ACPI

static const struct acpi_device_id rt1015_acpi_match[] = {

	{"10EC1015", 0,},

	{},

	{ "10EC1015" },

	{ }

};

MODULE_DEVICE_TABLE(acpi, rt1015_acpi_match);

#endif

sound/soc/codecs/rt1016.c

+3 −3
Original line number Diff line number Diff line
@@ -616,15 +616,15 @@ MODULE_DEVICE_TABLE(i2c, rt1016_i2c_id); 
#if defined(CONFIG_OF)

static const struct of_device_id rt1016_of_match[] = {

	{ .compatible = "realtek,rt1016", },

	{},

	{ }

};

MODULE_DEVICE_TABLE(of, rt1016_of_match);

#endif



#ifdef CONFIG_ACPI

static const struct acpi_device_id rt1016_acpi_match[] = {

	{"10EC1016", 0,},

	{},

	{ "10EC1016" },

	{ }

};

MODULE_DEVICE_TABLE(acpi, rt1016_acpi_match);

#endif

sound/soc/codecs/rt1019.c

+3 −3
Original line number Diff line number Diff line
@@ -547,14 +547,14 @@ MODULE_DEVICE_TABLE(i2c, rt1019_i2c_id); 


static const struct of_device_id rt1019_of_match[] __maybe_unused = {

	{ .compatible = "realtek,rt1019", },

	{},

	{ }

};

MODULE_DEVICE_TABLE(of, rt1019_of_match);



#ifdef CONFIG_ACPI

static const struct acpi_device_id rt1019_acpi_match[] = {

	{ "10EC1019", 0},

	{ },

	{ "10EC1019" },

	{ }

};

MODULE_DEVICE_TABLE(acpi, rt1019_acpi_match);

#endif

sound/soc/codecs/rt1305.c

+4 −4
Original line number Diff line number Diff line
@@ -966,16 +966,16 @@ static const struct regmap_config rt1305_regmap = { 
static const struct of_device_id rt1305_of_match[] = {

	{ .compatible = "realtek,rt1305", },

	{ .compatible = "realtek,rt1306", },

	{},

	{ }

};

MODULE_DEVICE_TABLE(of, rt1305_of_match);

#endif



#ifdef CONFIG_ACPI

static const struct acpi_device_id rt1305_acpi_match[] = {

	{"10EC1305", 0,},

	{"10EC1306", 0,},

	{},

	{ "10EC1305" },

	{ "10EC1306" },

	{ }

};

MODULE_DEVICE_TABLE(acpi, rt1305_acpi_match);

#endif