mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 14:11:52 +00:00
Merge branch 'topic/cs35l41' into for-next
Pull updates for CS35L41 codec for HP models. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
commit
cca28db5c6
@ -42,6 +42,28 @@ static const struct cs35l41_config cs35l41_config_table[] = {
|
||||
* in the ACPI. The Reset GPIO is also valid, so we can use the Reset defined in _DSD.
|
||||
*/
|
||||
{ "103C89C6", 2, INTERNAL, { CS35L41_RIGHT, CS35L41_LEFT, 0, 0 }, -1, -1, -1, 1000, 4500, 24 },
|
||||
{ "103C8A28", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8A29", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8A2A", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8A2B", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8A2C", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8A2D", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8A2E", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8A30", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8A31", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8BB3", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8BB4", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8BDF", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8BE0", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8BE1", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8BE2", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8BE9", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8BDD", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8BDE", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8BE3", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8BE5", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8BE6", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "103C8B3A", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },
|
||||
{ "104312AF", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },
|
||||
{ "10431433", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },
|
||||
{ "10431463", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },
|
||||
@ -356,6 +378,28 @@ static const struct cs35l41_prop_model cs35l41_prop_model_table[] = {
|
||||
{ "CSC3551", "10280BEB", generic_dsd_config },
|
||||
{ "CSC3551", "10280C4D", generic_dsd_config },
|
||||
{ "CSC3551", "103C89C6", generic_dsd_config },
|
||||
{ "CSC3551", "103C8A28", generic_dsd_config },
|
||||
{ "CSC3551", "103C8A29", generic_dsd_config },
|
||||
{ "CSC3551", "103C8A2A", generic_dsd_config },
|
||||
{ "CSC3551", "103C8A2B", generic_dsd_config },
|
||||
{ "CSC3551", "103C8A2C", generic_dsd_config },
|
||||
{ "CSC3551", "103C8A2D", generic_dsd_config },
|
||||
{ "CSC3551", "103C8A2E", generic_dsd_config },
|
||||
{ "CSC3551", "103C8A30", generic_dsd_config },
|
||||
{ "CSC3551", "103C8A31", generic_dsd_config },
|
||||
{ "CSC3551", "103C8BB3", generic_dsd_config },
|
||||
{ "CSC3551", "103C8BB4", generic_dsd_config },
|
||||
{ "CSC3551", "103C8BDF", generic_dsd_config },
|
||||
{ "CSC3551", "103C8BE0", generic_dsd_config },
|
||||
{ "CSC3551", "103C8BE1", generic_dsd_config },
|
||||
{ "CSC3551", "103C8BE2", generic_dsd_config },
|
||||
{ "CSC3551", "103C8BE9", generic_dsd_config },
|
||||
{ "CSC3551", "103C8BDD", generic_dsd_config },
|
||||
{ "CSC3551", "103C8BDE", generic_dsd_config },
|
||||
{ "CSC3551", "103C8BE3", generic_dsd_config },
|
||||
{ "CSC3551", "103C8BE5", generic_dsd_config },
|
||||
{ "CSC3551", "103C8BE6", generic_dsd_config },
|
||||
{ "CSC3551", "103C8B3A", generic_dsd_config },
|
||||
{ "CSC3551", "104312AF", generic_dsd_config },
|
||||
{ "CSC3551", "10431433", generic_dsd_config },
|
||||
{ "CSC3551", "10431463", generic_dsd_config },
|
||||
|
Loading…
Reference in New Issue
Block a user