diff options
author | Li Jun <jun.li@nxp.com> | 2018-04-16 02:54:36 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-22 10:06:26 -0400 |
commit | c457a9c4fe78a443fcbd7701812e8f8382638689 (patch) | |
tree | 5327c1607c677c2bfa64cee02a0bbf857a9f58bd | |
parent | 75b0220a63487bd7243626f23bb3bdad25887a9a (diff) |
usb: typec: wcove: remove max_snk_* for sink config
Since max_snk_* is to be deprecated, so remove max_snk_* by adding a
variable PDO for sink config.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/typec/typec_wcove.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/typec/typec_wcove.c b/drivers/usb/typec/typec_wcove.c index 19cca7f1b2c5..39cff11ec7a2 100644 --- a/drivers/usb/typec/typec_wcove.c +++ b/drivers/usb/typec/typec_wcove.c | |||
@@ -558,6 +558,7 @@ static const u32 src_pdo[] = { | |||
558 | static const u32 snk_pdo[] = { | 558 | static const u32 snk_pdo[] = { |
559 | PDO_FIXED(5000, 500, PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP | | 559 | PDO_FIXED(5000, 500, PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP | |
560 | PDO_FIXED_USB_COMM), | 560 | PDO_FIXED_USB_COMM), |
561 | PDO_VAR(5000, 12000, 3000), | ||
561 | }; | 562 | }; |
562 | 563 | ||
563 | static struct tcpc_config wcove_typec_config = { | 564 | static struct tcpc_config wcove_typec_config = { |
@@ -566,9 +567,6 @@ static struct tcpc_config wcove_typec_config = { | |||
566 | .snk_pdo = snk_pdo, | 567 | .snk_pdo = snk_pdo, |
567 | .nr_snk_pdo = ARRAY_SIZE(snk_pdo), | 568 | .nr_snk_pdo = ARRAY_SIZE(snk_pdo), |
568 | 569 | ||
569 | .max_snk_mv = 12000, | ||
570 | .max_snk_ma = 3000, | ||
571 | .max_snk_mw = 36000, | ||
572 | .operating_snk_mw = 15000, | 570 | .operating_snk_mw = 15000, |
573 | 571 | ||
574 | .type = TYPEC_PORT_DRP, | 572 | .type = TYPEC_PORT_DRP, |