diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-09 03:12:01 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-09 03:12:01 -0800 |
| commit | 387bc274f5602ad22b04ab42e6ffc0cd63d0fa17 (patch) | |
| tree | a47e82c888ba7a506b6d5dc57c09b8a9ca2aafb1 | |
| parent | 23d7f4b61391fe8370342675f6c73e72ac00d148 (diff) | |
| parent | b5085c2b591596cac510a7f1360eaf081e7e4a7d (diff) | |
Merge "soundwire: Add support to disable smart boost data port"
| -rw-r--r-- | drivers/soundwire/swr-wcd-ctrl.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/drivers/soundwire/swr-wcd-ctrl.c b/drivers/soundwire/swr-wcd-ctrl.c index 424ad7c57b43..63bc3961de3b 100644 --- a/drivers/soundwire/swr-wcd-ctrl.c +++ b/drivers/soundwire/swr-wcd-ctrl.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -65,6 +65,8 @@ struct usecase uc[] = { {6, 10, 7800}, /* UC15: 2*(Spkr + SB + VI) */ {2, 3, 3600}, /* UC16: Spkr + VI */ {4, 6, 7200}, /* UC17: 2*(Spkr + VI) */ + {3, 7, 4200}, /* UC18: Spkr + Comp + VI */ + {6, 14, 8400}, /* UC19: 2*(Spkr + Comp + VI) */ }; #define MAX_USECASE ARRAY_SIZE(uc) @@ -179,6 +181,21 @@ struct port_params pp[MAX_USECASE][SWR_MSTR_PORT_LEN] = { {7, 6, 0}, {15, 10, 0}, }, + /* UC 18 */ + { + {7, 1, 0}, + {31, 2, 0}, + {15, 7, 0}, + }, + /* UC 19 */ + { + {7, 1, 0}, + {31, 2, 0}, + {15, 7, 0}, + {7, 6, 0}, + {31, 18, 0}, + {15, 10, 0}, + }, }; enum { |