]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
usb: typec: wcove: remove max_snk_* for sink config
authorLi Jun <jun.li@nxp.com>
Mon, 16 Apr 2018 06:54:36 +0000 (14:54 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 22 Apr 2018 14:06:26 +0000 (16:06 +0200)
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>
drivers/usb/typec/typec_wcove.c

index 19cca7f1b2c5c00a2a7e82902a3976d4b59f7809..39cff11ec7a23b6ad60681cf9b9ed0705e17b6e1 100644 (file)
@@ -558,6 +558,7 @@ static const u32 src_pdo[] = {
 static const u32 snk_pdo[] = {
        PDO_FIXED(5000, 500, PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP |
                  PDO_FIXED_USB_COMM),
+       PDO_VAR(5000, 12000, 3000),
 };
 
 static struct tcpc_config wcove_typec_config = {
@@ -566,9 +567,6 @@ static struct tcpc_config wcove_typec_config = {
        .snk_pdo = snk_pdo,
        .nr_snk_pdo = ARRAY_SIZE(snk_pdo),
 
-       .max_snk_mv = 12000,
-       .max_snk_ma = 3000,
-       .max_snk_mw = 36000,
        .operating_snk_mw = 15000,
 
        .type = TYPEC_PORT_DRP,