From patchwork Tue Oct 3 15:58:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abdel Alkuor X-Patchwork-Id: 147982 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2185229vqb; Tue, 3 Oct 2023 09:01:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGaFgeUMEhUeCbYhZXeQbh2Ii70cvtKyEJ/xw6OUq/zCCfMX3mJix29E0hfniQmOiPCW0Kf X-Received: by 2002:a17:902:e5c7:b0:1c6:ec8:4c67 with SMTP id u7-20020a170902e5c700b001c60ec84c67mr3772plf.18.1696348896620; Tue, 03 Oct 2023 09:01:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696348896; cv=none; d=google.com; s=arc-20160816; b=pqLgHDQvzxwVYbMhGYl8pTU2Ndve7VcXVmZ+lHSERCaa9q2i0zHaz57hyufvfFy7ac 1TvExBmgQQ2clBmYUoNXRVTuYU4QGrNmEm+8j2+o3g1DAHIbUHrM2s77OEC3crKTe5et ygumS8XqUUjpBD2YfpY3Lzkbw6GB0/L4gij70YmIkPdKI8e209h3soAsv0GRYz04LCTb XBdUmApPU5vjxRZHSvox3gzIBNVNtECohC/sZ77qLkvHBuJBl6uDCdDXLklpuMcyjOU7 M9dzrPAaaICg4rrPXnriJqe/d0P20eJyXggxVz0VY4JZoWxV/P2Q6x2FFg8UevZzKIRE k+ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=q6moZnvEehkvHZRbYInP508VLRDJS9kH3ayeK/MIHLE=; fh=NDkcCmflgZsGSiSjskszThji4SYIrQ1hJIxt3Zy9sPE=; b=dVU9CVBzpkgcNoigO20yENvqZ8TWkiejeFuwogsdfBlYc5Po1kLvWoiHEppDjs4v3/ FPDFesy72N0nufRfQNZmys7nv9MOgTYFF3BA28dtSySCai1ShG0CyyTkNLevzHR/noOk BpeimLgPyhhgmw2dw03SOdYhJHjlvXVm7JaOALs38X89y5xUA+EVWW1i921lPF9Zs93u Na2BmIu22CbVS5+wD/HwuNH3YA/SRj2+n1AVntnjByU4QTEqRlfRY7j56yBaX38WZXje cUBDxguMyVo01NckA6edGrLTwZm7JQGhbG/Afh6djrRkdsbB6qbzz7rP9nvoukPbFN3l qwRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=mtyBuGct; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id m18-20020a170902db1200b001c62d935854si1787304plx.614.2023.10.03.09.01.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 09:01:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=mtyBuGct; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 9444F8027F12; Tue, 3 Oct 2023 09:01:22 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240262AbjJCQBL (ORCPT + 17 others); Tue, 3 Oct 2023 12:01:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240258AbjJCQBD (ORCPT ); Tue, 3 Oct 2023 12:01:03 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14CFDD3; Tue, 3 Oct 2023 09:00:56 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-9ae75ece209so197671666b.3; Tue, 03 Oct 2023 09:00:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696348855; x=1696953655; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=q6moZnvEehkvHZRbYInP508VLRDJS9kH3ayeK/MIHLE=; b=mtyBuGctHswZ1P8Ry8nXhEQSoDXn0Ql8dWAzk2Fu8rq8yP4S/Q50cxqS0G3XF5gwg2 tMhProMBFqwoXKt0jUw0pRmJjR3fUTq5qQt8AQ5xRLEkHxnpAwjhkxzyV5aaH3Yz3i1J Ldfs1zaPvxii+OFfg+djk4/wpLVHD7H93xBzAhVmD0XomQrJoHiPwe1WialnMZK9MY7W l+fIBS4AT3LPylKwMeDoekKg74DBkTKAw7+mJUsWeLJUAS3naVtmArHDcRYcM/ZUqhyF ryWtPgl/QK4pmndfrzVBF4X7EDM+I39576/biJboPxi3lQ8qvY5dWQKVP6CQCq0jO+u5 RkHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696348855; x=1696953655; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=q6moZnvEehkvHZRbYInP508VLRDJS9kH3ayeK/MIHLE=; b=wKzpFMoTdO+lZqAUBCtyU5F7F3Go1oOZa6HgjFPybV+8XOeNj9aserm9UpUd/tt7OV bhsvEwWzCl6Lxnl8J2lXSbdCkPmZHj4oVQX9lrJiOKM6yinOENQq2DjWHKmIXHUMQz86 VPrYyR4Ip307f//89jTCiCz70kAR98mrbpPIqDkiim3b3wP9Qq3Q9ei9dlR96wa8VDc/ LefepMhBeaTYVpGFIkIs2y9LjA6E083WNh+NxFPqFagx1Wqy1lWVA8cFPZyyUwoxOpXn Ee2JlO1CRGARfjx85AN7idmPJ/QPsFRHOt66hiBdL2GLzEin6kgd5jmio+xXJCC5w+Zf X6XA== X-Gm-Message-State: AOJu0YzUrvZoPhEdfZDXk/c6HvTBTcUVUkxbAp1zgMnNHjU9dp5/UnfF NRolpuxpTS2qlhJtsghVLks= X-Received: by 2002:a17:907:78c4:b0:9b2:b768:3cfc with SMTP id kv4-20020a17090778c400b009b2b7683cfcmr14363809ejc.1.1696348854783; Tue, 03 Oct 2023 09:00:54 -0700 (PDT) Received: from primary.. ([213.139.52.198]) by smtp.gmail.com with ESMTPSA id jo3-20020a170906f6c300b0099df2ddfc37sm1270526ejb.165.2023.10.03.09.00.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 09:00:54 -0700 (PDT) From: Abdel Alkuor To: heikki.krogerus@linux.intel.com, krzysztof.kozlowski+dt@linaro.org, bryan.odonoghue@linaro.org Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, ryan.eleceng@gmail.com, robh+dt@kernel.org, conor+dt@kernel.org, devicetree@vger.kernel.org, Abdel Alkuor Subject: [PATCH v10 4/9] USB: typec: tps6598x: Refactor tps6598x port registration Date: Tue, 3 Oct 2023 11:58:37 -0400 Message-Id: <20231003155842.57313-5-alkuor@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231003155842.57313-1-alkuor@gmail.com> References: <20231003155842.57313-1-alkuor@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 03 Oct 2023 09:01:22 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778750740510326685 X-GMAIL-MSGID: 1778750740510326685 From: Abdel Alkuor tps6598x and cd321x use TPS_REG_SYSTEM_CONF to get dr/pr roles where other similar devices don't have this register such as tps25750. Move tps6598x port registration to its own function Signed-off-by: Abdel Alkuor Reviewed-by: Heikki Krogerus --- Changes in v10 - Move 0004-USB-typec-tps6598x-Load-TPS25750-patch-bundle.patch to patch 6 - Reorder 0009-USB-typec-tps6598x-Refactor-tps6598x-port-registrati.patch to be patch 4 - Add Reviewed-by Changes in v9: - No changes Changes in v8: - Return mode when mode is checked - Use device_is_compatible instead of of_device_is_compatible Changes in v7: - Add driver name to commit subject Changes in v6: - Don't check VID for tps25750 as the VID register doesn't exist - Remove is_tps25750 flag from tps6598x struct - Get patch address from reg property Changes in v5: - Incorporating tps25750 into tps6598x driver drivers/usb/typec/tipd/core.c | 99 +++++++++++++++++++---------------- 1 file changed, 54 insertions(+), 45 deletions(-) diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c index c5bbf03cb74a..56e4997c484a 100644 --- a/drivers/usb/typec/tipd/core.c +++ b/drivers/usb/typec/tipd/core.c @@ -711,15 +711,65 @@ static int devm_tps6598_psy_register(struct tps6598x *tps) return PTR_ERR_OR_ZERO(tps->psy); } +static int +tps6598x_register_port(struct tps6598x *tps, struct fwnode_handle *fwnode) +{ + int ret; + u32 conf; + struct typec_capability typec_cap = { }; + + ret = tps6598x_read32(tps, TPS_REG_SYSTEM_CONF, &conf); + if (ret) + return ret; + + typec_cap.revision = USB_TYPEC_REV_1_2; + typec_cap.pd_revision = 0x200; + typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE; + typec_cap.driver_data = tps; + typec_cap.ops = &tps6598x_ops; + typec_cap.fwnode = fwnode; + + switch (TPS_SYSCONF_PORTINFO(conf)) { + case TPS_PORTINFO_SINK_ACCESSORY: + case TPS_PORTINFO_SINK: + typec_cap.type = TYPEC_PORT_SNK; + typec_cap.data = TYPEC_PORT_UFP; + break; + case TPS_PORTINFO_DRP_UFP_DRD: + case TPS_PORTINFO_DRP_DFP_DRD: + typec_cap.type = TYPEC_PORT_DRP; + typec_cap.data = TYPEC_PORT_DRD; + break; + case TPS_PORTINFO_DRP_UFP: + typec_cap.type = TYPEC_PORT_DRP; + typec_cap.data = TYPEC_PORT_UFP; + break; + case TPS_PORTINFO_DRP_DFP: + typec_cap.type = TYPEC_PORT_DRP; + typec_cap.data = TYPEC_PORT_DFP; + break; + case TPS_PORTINFO_SOURCE: + typec_cap.type = TYPEC_PORT_SRC; + typec_cap.data = TYPEC_PORT_DFP; + break; + default: + return -ENODEV; + } + + tps->port = typec_register_port(tps->dev, &typec_cap); + if (IS_ERR(tps->port)) + return PTR_ERR(tps->port); + + return 0; +} + static int tps6598x_probe(struct i2c_client *client) { irq_handler_t irq_handler = tps6598x_interrupt; struct device_node *np = client->dev.of_node; - struct typec_capability typec_cap = { }; struct tps6598x *tps; struct fwnode_handle *fwnode; u32 status; - u32 conf; u32 vid; int ret; u64 mask1; @@ -780,10 +830,6 @@ static int tps6598x_probe(struct i2c_client *client) goto err_clear_mask; trace_tps6598x_status(status); - ret = tps6598x_read32(tps, TPS_REG_SYSTEM_CONF, &conf); - if (ret < 0) - goto err_clear_mask; - /* * This fwnode has a "compatible" property, but is never populated as a * struct device. Instead we simply parse it to read the properties. @@ -801,50 +847,13 @@ static int tps6598x_probe(struct i2c_client *client) goto err_fwnode_put; } - typec_cap.revision = USB_TYPEC_REV_1_2; - typec_cap.pd_revision = 0x200; - typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE; - typec_cap.driver_data = tps; - typec_cap.ops = &tps6598x_ops; - typec_cap.fwnode = fwnode; - - switch (TPS_SYSCONF_PORTINFO(conf)) { - case TPS_PORTINFO_SINK_ACCESSORY: - case TPS_PORTINFO_SINK: - typec_cap.type = TYPEC_PORT_SNK; - typec_cap.data = TYPEC_PORT_UFP; - break; - case TPS_PORTINFO_DRP_UFP_DRD: - case TPS_PORTINFO_DRP_DFP_DRD: - typec_cap.type = TYPEC_PORT_DRP; - typec_cap.data = TYPEC_PORT_DRD; - break; - case TPS_PORTINFO_DRP_UFP: - typec_cap.type = TYPEC_PORT_DRP; - typec_cap.data = TYPEC_PORT_UFP; - break; - case TPS_PORTINFO_DRP_DFP: - typec_cap.type = TYPEC_PORT_DRP; - typec_cap.data = TYPEC_PORT_DFP; - break; - case TPS_PORTINFO_SOURCE: - typec_cap.type = TYPEC_PORT_SRC; - typec_cap.data = TYPEC_PORT_DFP; - break; - default: - ret = -ENODEV; - goto err_role_put; - } - ret = devm_tps6598_psy_register(tps); if (ret) goto err_role_put; - tps->port = typec_register_port(&client->dev, &typec_cap); - if (IS_ERR(tps->port)) { - ret = PTR_ERR(tps->port); + ret = tps6598x_register_port(tps, fwnode); + if (ret) goto err_role_put; - } if (status & TPS_STATUS_PLUG_PRESENT) { ret = tps6598x_read16(tps, TPS_REG_POWER_STATUS, &tps->pwr_status);