From patchwork Wed Jul 24 20:11:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jameson Thies X-Patchwork-Id: 814327 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2FDE616DC0F for ; Wed, 24 Jul 2024 20:12:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721851943; cv=none; b=Hjtu+LxjLyngoawRpI9yLRZcBn7uqZTfJvYGB3dBXIcx/6qiu/FCcyjWaLbUCiq/yH9oZ0/eAwTbgoM+kPoCyPw4dKOZXxhoWgz+Ha9huFVNQkRCjC0OyKV//Yt59vqHTBHPcgzxx0WZj6nOGRyxc4aOoTsx0JCx7AMFAcm9lpI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721851943; c=relaxed/simple; bh=h58HLHCNa0YzrY3VJan8w1y3GHAehkiK7wZWPvDTkMQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=oNzab7zK+26OQc8XqV8bwKl3ZZcmnoNGBdHO2ClItSbct5xXPlQLmn1c2wuckERpEqZcBejGRtYAapANgwuCgS/NqHzwoPNWWnUZm3+eAwQnM/Oeynx/5ic9QNKLIZlMCNRcQRN1ynUhiYSaj0/JwXQ3ryO/mmOd6AmPbvcvI10= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jthies.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=xhNOSj4d; arc=none smtp.client-ip=209.85.215.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jthies.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="xhNOSj4d" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-721d20a0807so160686a12.1 for ; Wed, 24 Jul 2024 13:12:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1721851941; x=1722456741; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=uLze0kadUGbSBXCo4aky2nkQ49F0HsvXX1UCI/WKp1o=; b=xhNOSj4dCcUemx9vY6CORPziQOytusxE3o8zPAUWwMUJRpsLuKijbO7SErJCK2mf3J GidKKkAdOlaNDdgzNV/1SvFtZk9rRzGjajxiwJ2FfQgjsHd5ptLe5Zx0YpKmoKL5Tp8G flPdnGeKAXLFqzdmxHJ1TEypvTpN2PMYm5eOBcQ1tCXvhSxTjp9hcrgZCP8YeXJRTSgL wOyYltN4YOKiBKhh85QVAh8tbxVUZW+vcjGK7DM1fnQD1HI1af5dmU54YpCPz/vaiF5q ewIrD+u8FQGN6EGDZswwD1K7LpCy99MSresZ7U6IcUzxVRjfxqWy54xxdYWjnpEzmfya jszw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721851941; x=1722456741; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uLze0kadUGbSBXCo4aky2nkQ49F0HsvXX1UCI/WKp1o=; b=rutqpi+VnMF+JWwWvXRrKh4QkRG6+H/cCLF++10csVnvPGkHNI3FmRd7UD3tNJ5pLQ 4k/piaShmBdwki/H5Gu97VM1cL5XaMNxrngMfsWIzHgJFbdG9PW7Gs8xvhYSApJe3zln VBB34gWUEHByac/tpPmv5vX4UJ4fA+XUGxmR5DWb9t56TUW0DEA6blBg0QVAZw9fkerD FuKZwhZK0I42FGEB6f48fh68+Cdihdye3LeifTsE4i5cTYjDe+b5H7j45TaFoT10HSkK IRgyeBHl/uUVR5U0k2SCjKm6sgmG5ZGhuPLlmLvcIKuTHlMjsWkXlJxByjeKjv+SY9vt S79g== X-Forwarded-Encrypted: i=1; AJvYcCVF0Aih9Hb2+MiJqhA3s7GVYcbVJlm9T34vlAQl00rmupucygYUrYHlQtfNsxQvn2+Kxuxxy9U2rlwKJgDj69MLLLiZekMh0USF X-Gm-Message-State: AOJu0Yyxp7S6Z6Yv1Pa/nIjLj902gb3UqQ6vwnb7hubYC6AD9KsP0MQF Zx3BMXV8b0MkoHmiPoaD3DEC2zKiuxD3bmB4vlDRxICl2ZoiPpC9FU1YuDKVA1AwqM1M2rtsadk 0ew== X-Google-Smtp-Source: AGHT+IGQUzfvNQ0VfRVxY9FJGcd61WeAx5N6cNXLQohbC81lMBoH10RygYZERrbbZNtHojNKZX6YHzJxc9o= X-Received: from jthies.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:23db]) (user=jthies job=sendgmr) by 2002:a17:902:f693:b0:1fe:1a92:5b2 with SMTP id d9443c01a7336-1fed3051a17mr16985ad.1.1721851941169; Wed, 24 Jul 2024 13:12:21 -0700 (PDT) Date: Wed, 24 Jul 2024 20:11:14 +0000 In-Reply-To: <20240724201116.2094059-1-jthies@google.com> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240724201116.2094059-1-jthies@google.com> X-Mailer: git-send-email 2.45.2.1089.g2a221341d9-goog Message-ID: <20240724201116.2094059-3-jthies@google.com> Subject: [PATCH v2 2/4] usb: typec: ucsi: Add USB PD DRP to USB type From: Jameson Thies To: heikki.krogerus@linux.intel.com, linux-usb@vger.kernel.org Cc: jthies@google.com, bleung@google.com, abhishekpandit@chromium.org, andersson@kernel.org, dmitry.baryshkov@linaro.org, fabrice.gasnier@foss.st.com, gregkh@linuxfoundation.org, hdegoede@redhat.com, neil.armstrong@linaro.org, rajaram.regupathy@intel.com, saranya.gopal@intel.com, linux-kernel@vger.kernel.org Add POWER_SUPPLY_USB_TYPE_PD_DRP as a USB type in the UCSI power supply driver. The DRP type is set when the partner sets the DRP bit in one of the source PDOs. Signed-off-by: Jameson Thies --- Changes in V2: - Using DRP bit of source PDOs to determine USB type. Updated commit message. drivers/usb/typec/ucsi/psy.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/usb/typec/ucsi/psy.c b/drivers/usb/typec/ucsi/psy.c index d0b52cee41d2..d708f9eb1654 100644 --- a/drivers/usb/typec/ucsi/psy.c +++ b/drivers/usb/typec/ucsi/psy.c @@ -204,8 +204,17 @@ static int ucsi_psy_get_usb_type(struct ucsi_connector *con, val->intval = POWER_SUPPLY_USB_TYPE_C; if (flags & UCSI_CONSTAT_CONNECTED && - UCSI_CONSTAT_PWR_OPMODE(flags) == UCSI_CONSTAT_PWR_OPMODE_PD) + UCSI_CONSTAT_PWR_OPMODE(flags) == UCSI_CONSTAT_PWR_OPMODE_PD) { + for (int i = 0; i < con->num_pdos; i++) { + if (pdo_type(con->src_pdos[i]) == PDO_TYPE_FIXED && + con->src_pdos[i] & PDO_FIXED_DUAL_ROLE) { + val->intval = POWER_SUPPLY_USB_TYPE_PD_DRP; + return 0; + } + } + val->intval = POWER_SUPPLY_USB_TYPE_PD; + } return 0; } @@ -275,6 +284,7 @@ static enum power_supply_usb_type ucsi_psy_usb_types[] = { POWER_SUPPLY_USB_TYPE_C, POWER_SUPPLY_USB_TYPE_PD, POWER_SUPPLY_USB_TYPE_PD_PPS, + POWER_SUPPLY_USB_TYPE_PD_DRP, }; int ucsi_register_port_psy(struct ucsi_connector *con) From patchwork Wed Jul 24 20:11:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jameson Thies X-Patchwork-Id: 814326 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4623716F26D for ; Wed, 24 Jul 2024 20:12:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721851948; cv=none; b=oFAlXaJzPjaByKSena9hvht808UAbzLXntg7zPg9dbz+8+YHR5wuI/slUVv1l91FG7EVSeLf7QjEGRfoyx9lI9cKe408uRXWm1RewWo1RWegi2lEcuGP6WtJXxD7k2FpozKC++DapeRXjhw23cGjVtKj5KFdewTM8OXE1x3Qed4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721851948; c=relaxed/simple; bh=ftKGBViUOgmYn6lD6rKdnKxeD3XcFNArhW8Gz6/ov7g=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=UO+UfituS9Z/gP/LoOBw9oIzfWrDftlN8h3MR7xiyMSbH1sEEuQ//ldde4WtP06qWWxu6i1v+GKI6RE7Ppx3XJsTS6olw3e849VB2yWtOjkjf+irJsY+P7PWhoElxtcH5ut9LyhY7760AGgir4deAXfUCEuv2mnOCkSR/anqGM4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jthies.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=YLXHRLuW; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jthies.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="YLXHRLuW" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e02b5792baaso238530276.2 for ; Wed, 24 Jul 2024 13:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1721851946; x=1722456746; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=x9PT/6cjnR+Gnm6WIJzoVk3JaTZqlTM7UT6q82pMzX8=; b=YLXHRLuWDD0xy6ohmfotgN+90XuBk1tBb7fWP+wEPbP0/LwralxlcJxd62hBFFaSWX svuXaKhfVQogTbbKxk6YCLbAtEUKwXQSwnSfgsMUW0XJtR7hhbW1BnVIjMP7rErNd25J LCVq19pdRyrkXqNPE73bTiGPnutJ0+XJGp4fyLmKk3eaYs4ZDz5gA9WcHhLSdBydJmOR 7ESiJx/OM6ePVqu36PO6rtWw+EV3/ZLReBsb09yWpet+98jqyKWrkn2oguTOntV97Yhe Zw96oJ9Ev2tVzpt/JLJTUE2eC+1DF1W5e2IslWtdWnXAirckIwPe6BDIJiEUhPoueOGT z9fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721851946; x=1722456746; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=x9PT/6cjnR+Gnm6WIJzoVk3JaTZqlTM7UT6q82pMzX8=; b=sIhXliz2felRS0kU78Ywtts5i8U4NFDM5uRB6yp8T+vyatkBZRMHy58ACjUyRpD9QM XnpRPDo7zApanRwMkyWA0xzxXmJe0YPq7coNbd7SwKRaZ3pX+MOgqDof8t6D/WY7I5ew MUjgTTNAtqw08TIJfgvDqtgDa70OfLYryBAUoi1gjSQITa7rx5256+x/4fkGp4rEA1/3 xzKiJMpF5fZ6Ov/LmZKOJqv//hz8YwUr/Yy1028GYVtgbbEzwYFiqQi6jk9AcrHeJB0K mTUFbhoeWCwpuIY3KoP4QwhpHq/b8jiSBSiGQL7+FB1wUj2BKDToQ/xz5xSpSg7MJHTd mVEQ== X-Forwarded-Encrypted: i=1; AJvYcCXTm4ApGI/VHn0uJ80b/+NcYexVqOfuTjBMhhIjiYOVG+fEYRqRY7BG6xzwOKeJznG7pyuQrsnMsdqSNavVEMzFluZ+bkWHJVPv X-Gm-Message-State: AOJu0YyTU5Mg8zEnVKZDVn5focfrbp0J3Z3+7uhbxl3XIL8kseimUhIf 95pNMWUagxB8vDBNmZQgtB6cj37PZPUYeI+j2t1fmSq1v/d65a8ot93jSOSPSqmWUFUWkPQEWDB 7WQ== X-Google-Smtp-Source: AGHT+IEZtWnLjP/SYhqErAI4vD+nBsv+e3S+tTON9apiX87M2tONY2ATm4vpw94egaaQQU8IqgOAGcYzxBE= X-Received: from jthies.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:23db]) (user=jthies job=sendgmr) by 2002:a05:6902:110e:b0:e05:b006:9e12 with SMTP id 3f1490d57ef6-e0b23239497mr30065276.11.1721851946331; Wed, 24 Jul 2024 13:12:26 -0700 (PDT) Date: Wed, 24 Jul 2024 20:11:16 +0000 In-Reply-To: <20240724201116.2094059-1-jthies@google.com> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240724201116.2094059-1-jthies@google.com> X-Mailer: git-send-email 2.45.2.1089.g2a221341d9-goog Message-ID: <20240724201116.2094059-5-jthies@google.com> Subject: [PATCH v2 4/4] usb: typec: ucsi: Fix SET_PDR typo in UCSI header file From: Jameson Thies To: heikki.krogerus@linux.intel.com, linux-usb@vger.kernel.org Cc: jthies@google.com, bleung@google.com, abhishekpandit@chromium.org, andersson@kernel.org, dmitry.baryshkov@linaro.org, fabrice.gasnier@foss.st.com, gregkh@linuxfoundation.org, hdegoede@redhat.com, neil.armstrong@linaro.org, rajaram.regupathy@intel.com, saranya.gopal@intel.com, linux-kernel@vger.kernel.org Fix SET_PDR typo in UCSI header file. Reviewed-by: Neil Armstrong Signed-off-by: Jameson Thies --- Changes in V2: - None. drivers/usb/typec/ucsi/ucsi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h index 6a958eac5703..a0e91335da80 100644 --- a/drivers/usb/typec/ucsi/ucsi.h +++ b/drivers/usb/typec/ucsi/ucsi.h @@ -153,7 +153,7 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num); #define UCSI_SET_UOR_ROLE(_r_) (((_r_) == TYPEC_HOST ? 1 : 2) << 23) #define UCSI_SET_UOR_ACCEPT_ROLE_SWAPS BIT(25) -/* SET_PDF command bits */ +/* SET_PDR command bits */ #define UCSI_SET_PDR_ROLE(_r_) (((_r_) == TYPEC_SOURCE ? 1 : 2) << 23) #define UCSI_SET_PDR_ACCEPT_ROLE_SWAPS BIT(25)