Merge tag 'usb-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux-2.6-microblaze.git] / drivers / usb / typec / tcpm / tcpm.c

diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index 5d05de6..a4d3720 100644 (file)
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -278,7 +278,7 @@ struct pd_mode_data {
  * @req_max_curr: Requested max current of the port partner
  * @req_out_volt: Requested output voltage to the port partner
  * @req_op_curr: Requested operating current to the port partner
- * @supported: Parter has atleast one APDO hence supports PPS
+ * @supported: Parter has at least one APDO hence supports PPS
  * @active: PPS mode is active
  */
 struct pd_pps_data {
@@ -316,6 +316,7 @@ struct tcpm_port {
        struct typec_partner *partner;
 
        enum typec_cc_status cc_req;
+       enum typec_cc_status src_rp;    /* work only if pd_supported == false */
 
        enum typec_cc_status cc1;
        enum typec_cc_status cc2;
@@ -323,6 +324,7 @@ struct tcpm_port {
 
        bool attached;
        bool connected;
+       bool pd_supported;
        enum typec_port_type port_type;
 
        /*
@@ -817,6 +819,9 @@ static enum typec_cc_status tcpm_rp_cc(struct tcpm_port *port)
        int nr_pdo = port->nr_src_pdo;
        int i;
 
+       if (!port->pd_supported)
+               return port->src_rp;
+
        /*
         * Search for first entry with matching voltage.
         * It should report the maximum supported current.
@@ -2063,7 +2068,7 @@ enum pdo_err {
 
 static const char * const pdo_err_msg[] = {
        [PDO_ERR_NO_VSAFE5V] =
-       " err: source/sink caps should atleast have vSafe5V",
+       " err: source/sink caps should at least have vSafe5V",
        [PDO_ERR_VSAFE5V_NOT_FIRST] =
        " err: vSafe5V Fixed Supply Object Shall always be the first object",
        [PDO_ERR_PDO_TYPE_NOT_IN_ORDER] =
@@ -3571,9 +3576,11 @@ static int tcpm_src_attach(struct tcpm_port *port)
        if (ret < 0)
                return ret;
 
-       ret = port->tcpc->set_pd_rx(port->tcpc, true);
-       if (ret < 0)
-               goto out_disable_mux;
+       if (port->pd_supported) {
+               ret = port->tcpc->set_pd_rx(port->tcpc, true);
+               if (ret < 0)
+                       goto out_disable_mux;
+       }
 
        /*
         * USB Type-C specification, version 1.2,
@@ -3603,7 +3610,8 @@ static int tcpm_src_attach(struct tcpm_port *port)
 out_disable_vconn:
        tcpm_set_vconn(port, false);
 out_disable_pd:
-       port->tcpc->set_pd_rx(port->tcpc, false);
+       if (port->pd_supported)
+               port->tcpc->set_pd_rx(port->tcpc, false);
 out_disable_mux:
        tcpm_mux_set(port, TYPEC_STATE_SAFE, USB_ROLE_NONE,
                     TYPEC_ORIENTATION_NONE);
@@ -3807,6 +3815,20 @@ static enum typec_pwr_opmode tcpm_get_pwr_opmode(enum typec_cc_status cc)
        }
 }
 
+static enum typec_cc_status tcpm_pwr_opmode_to_rp(enum typec_pwr_opmode opmode)
+{
+       switch (opmode) {
+       case TYPEC_PWR_MODE_USB:
+               return TYPEC_CC_RP_DEF;
+       case TYPEC_PWR_MODE_1_5A:
+               return TYPEC_CC_RP_1_5;
+       case TYPEC_PWR_MODE_3_0A:
+       case TYPEC_PWR_MODE_PD:
+       default:
+               return TYPEC_CC_RP_3_0;
+       }
+}
+
 static void run_state_machine(struct tcpm_port *port)
 {
        int ret;
@@ -3917,6 +3939,10 @@ static void run_state_machine(struct tcpm_port *port)
                if (port->ams == POWER_ROLE_SWAP ||
                    port->ams == FAST_ROLE_SWAP)
                        tcpm_ams_finish(port);
+               if (!port->pd_supported) {
+                       tcpm_set_state(port, SRC_READY, 0);
+                       break;
+               }
                port->upcoming_state = SRC_SEND_CAPABILITIES;
                tcpm_ams_start(port, POWER_NEGOTIATION);
                break;
@@ -4164,7 +4190,10 @@ static void run_state_machine(struct tcpm_port *port)
                                current_lim = PD_P_SNK_STDBY_MW / 5;
                        tcpm_set_current_limit(port, current_lim, 5000);
                        tcpm_set_charge(port, true);
-                       tcpm_set_state(port, SNK_WAIT_CAPABILITIES, 0);
+                       if (!port->pd_supported)
+                               tcpm_set_state(port, SNK_READY, 0);
+                       else
+                               tcpm_set_state(port, SNK_WAIT_CAPABILITIES, 0);
                        break;
                }
                /*
@@ -4392,7 +4421,8 @@ static void run_state_machine(struct tcpm_port *port)
                tcpm_set_vbus(port, true);
                if (port->ams == HARD_RESET)
                        tcpm_ams_finish(port);
-               port->tcpc->set_pd_rx(port->tcpc, true);
+               if (port->pd_supported)
+                       port->tcpc->set_pd_rx(port->tcpc, true);
                tcpm_set_attached_state(port, true);
                tcpm_set_state(port, SRC_UNATTACHED, PD_T_PS_SOURCE_ON);
                break;
@@ -5894,6 +5924,7 @@ EXPORT_SYMBOL_GPL(tcpm_tcpc_reset);
 static int tcpm_fw_get_caps(struct tcpm_port *port,
                            struct fwnode_handle *fwnode)
 {
+       const char *opmode_str;
        const char *cap_str;
        int ret;
        u32 mw, frs_current;
@@ -5928,22 +5959,37 @@ static int tcpm_fw_get_caps(struct tcpm_port *port,
                return ret;
        port->typec_caps.type = ret;
        port->port_type = port->typec_caps.type;
+       port->pd_supported = !fwnode_property_read_bool(fwnode, "pd-disable");
 
        port->slow_charger_loop = fwnode_property_read_bool(fwnode, "slow-charger-loop");
        if (port->port_type == TYPEC_PORT_SNK)
                goto sink;
 
-       /* Get source pdos */
-       ret = fwnode_property_count_u32(fwnode, "source-pdos");
-       if (ret <= 0)
-               return -EINVAL;
+       /* Get Source PDOs for the PD port or Source Rp value for the non-PD port */
+       if (port->pd_supported) {
+               ret = fwnode_property_count_u32(fwnode, "source-pdos");
+               if (ret == 0)
+                       return -EINVAL;
+               else if (ret < 0)
+                       return ret;
 
-       port->nr_src_pdo = min(ret, PDO_MAX_OBJECTS);
-       ret = fwnode_property_read_u32_array(fwnode, "source-pdos",
-                                            port->src_pdo, port->nr_src_pdo);
-       if ((ret < 0) || tcpm_validate_caps(port, port->src_pdo,
-                                           port->nr_src_pdo))
-               return -EINVAL;
+               port->nr_src_pdo = min(ret, PDO_MAX_OBJECTS);
+               ret = fwnode_property_read_u32_array(fwnode, "source-pdos",
+                                                    port->src_pdo, port->nr_src_pdo);
+               if (ret)
+                       return ret;
+               ret = tcpm_validate_caps(port, port->src_pdo, port->nr_src_pdo);
+               if (ret)
+                       return ret;
+       } else {
+               ret = fwnode_property_read_string(fwnode, "typec-power-opmode", &opmode_str);
+               if (ret)
+                       return ret;
+               ret = typec_find_pwr_opmode(opmode_str);
+               if (ret < 0)
+                       return ret;
+               port->src_rp = tcpm_pwr_opmode_to_rp(ret);
+       }
 
        if (port->port_type == TYPEC_PORT_SRC)
                return 0;
@@ -5957,6 +6003,11 @@ static int tcpm_fw_get_caps(struct tcpm_port *port,
        if (port->typec_caps.prefer_role < 0)
                return -EINVAL;
 sink:
+       port->self_powered = fwnode_property_read_bool(fwnode, "self-powered");
+
+       if (!port->pd_supported)
+               return 0;
+
        /* Get sink pdos */
        ret = fwnode_property_count_u32(fwnode, "sink-pdos");
        if (ret <= 0)
@@ -5973,9 +6024,7 @@ sink:
                return -EINVAL;
        port->operating_snk_mw = mw / 1000;
 
-       port->self_powered = fwnode_property_read_bool(fwnode, "self-powered");
-
-       /* FRS can only be supported byb DRP ports */
+       /* FRS can only be supported by DRP ports */
        if (port->port_type == TYPEC_PORT_DRP) {
                ret = fwnode_property_read_u32(fwnode, "new-source-frs-typec-current",
                                               &frs_current);