From patchwork Tue Jul 6 23:07:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 470489 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5434068jao; Tue, 6 Jul 2021 16:05:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjCc0km3nKUQrbKP8uV8684LurDhqVMj7VZ3vUO3mLR9GrO4K9hWr/O4PnKcVJAHdFN0Dt X-Received: by 2002:a05:6402:50d3:: with SMTP id h19mr15478572edb.344.1625612717577; Tue, 06 Jul 2021 16:05:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625612717; cv=none; d=google.com; s=arc-20160816; b=YrV7c0H5bHkPuOSiVTOAZLXIP3aedWR3hGMIIYoTZQD1L2TwSNQ5diReuvjOkzZxDq 28Oc+kJJygXhIO+SCAZrMj6WCzXQlPBR48+zcZUaipwwNpXGQcuem4m7qi0y/VTUQ3Yd W+T7h/v1uHm4KeuUEODAz1I7KPUnNkKV9+pKZHIzAm4wZpzZ2ukp6mHOYDhnkYJJrn/+ y5NeNXUpsqA1xbVHkeV8Fb6VUHAadr2pmY/vO7AahuCFQ3O3vGIh8ca3+46dRAVpbV5U n2rBDflhdI8E9vSk0l14Y3/qvwX8DWt9BCvD274YXDS6ZadovAh1kNr9/s3VXbFugb3B drKw== 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=ZS9eSBzf7oMT7niMx+DkLzUKHx+ngK5Yq4k0GX/hQik=; b=IvrdL8A5KSEqVIu2ajioUEx/N89b5PAeAyKtf1ccytPjE/c/eSddnmAglO7gCIiI4p tc/dlBRG0KdNv8DaM2RghNZ9v+VlJmRpzXKIi5Kz7ZQ/4ix9mpTMc/yNh9yA2CS4uTIo wbU0uzRcCq+gwpaNw9hvffYs3yl78ofZriFVDMurXi143KcKHxLA2mgYWOseH9YCUl4W bCSialJVZMZOnjzcLkgq77JCDxzh86KAeeANOko03fPMDiz6eCDY29WQtxa1Bvq3CQ4T 7w5ZOEhj79255b+wbq1YZVsv4E17qOrDalRbz24VAQsR8xwej805mlFfX1PAfJftnupm ooVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=koPKEiSd; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b21si4000308eds.363.2021.07.06.16.05.17; Tue, 06 Jul 2021 16:05:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=koPKEiSd; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229787AbhGFXHz (ORCPT + 17 others); Tue, 6 Jul 2021 19:07:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229753AbhGFXHz (ORCPT ); Tue, 6 Jul 2021 19:07:55 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD1EBC061760 for ; Tue, 6 Jul 2021 16:05:15 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id p8so823824wrr.1 for ; Tue, 06 Jul 2021 16:05:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZS9eSBzf7oMT7niMx+DkLzUKHx+ngK5Yq4k0GX/hQik=; b=koPKEiSdiRlAQbZ2faLxK3HWhvpvv36DkP+iba3gGnHL8I9hgdexpS9Is/0zvVtQca Ryr7XnnBJW/2ZoMrkHFamMjGyrP4Tv4F+t/eaZSjBPwwJiVjBGXA/M+wB3pKvtm4rc1W wBqo7ilBtG3qyIxqvYftjZhw+HIZwYx/Q96ukjOSvmlMeZgC2N8+NcT0+cgxukYGNOVs l4pJTi7B/BUddwfUCAa7yv+tQHEsFW5yZ60g1Gu8N11CdW0t0EXfOaS4XdNNgoHPdXpV MV2kbMzHEQdTd857EfjH/MQ7qVJUOqZJZcEVPaGqkvdN6AL4PLgR3MewlYT++3iSGr5J 6TzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZS9eSBzf7oMT7niMx+DkLzUKHx+ngK5Yq4k0GX/hQik=; b=mcbFXTEwq5P58jFMeR5BtcZRe6NvfGjbvb8znCwzTcpLCpNCCEEtRzSY+YckqPWv+Z ARIwxpHXNwiBjtYZg5ScqkgNnOY1iAZey8cY40htiZyr6+X2IQdFs5ji8n3ZQYsgUdqh DxzFZyeZBLEweMzB+1zBil57oE/k2qq9+DiQFZ3cO7xQ+6fLhlYxOPhjj6+Bh3Zl01kt LF6JXoYP5kXoHzJtRF/evFqgREHZZxkGdCDUVfSSFpoyJfVSo1J2+9dpbmlcaOta9ODf 7NBpdZ/7VhLJ1VN8m5aF+h0Ebm6Wses/ol/mjmA/LqLVXlayYi+o+Z0RoIlYv++nPjOj LWEA== X-Gm-Message-State: AOAM530NckB2rRl2UzrfABwj3T/vom3qTAur9Q40MAvApah33LK77Nlx tHLFTfuZeaCrL55OF59zisHz4g== X-Received: by 2002:a5d:6c69:: with SMTP id r9mr23670257wrz.8.1625612714199; Tue, 06 Jul 2021 16:05:14 -0700 (PDT) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id g15sm14241866wmh.16.2021.07.06.16.05.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 16:05:13 -0700 (PDT) From: Bryan O'Donoghue To: vkoul@kernel.org, kishon@ti.com, agross@kernel.org, bjorn.andersson@linaro.org, linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org Cc: robh+dt@kernel.org, jonathan@marek.ca, bryan.odonoghue@linaro.org, Dmitry Baryshkov , devicetree@vger.kernel.org Subject: [PATCH 1/2] arm64: dts: qcom: sm8250: fix usb2 qmp phy node Date: Wed, 7 Jul 2021 00:07:01 +0100 Message-Id: <20210706230702.299047-2-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210706230702.299047-1-bryan.odonoghue@linaro.org> References: <20210706230702.299047-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Dmitry Baryshkov Use 'lanes' as SuperSpeed lanes device node instead of just 'lane' to fix issues with TypeC support. Signed-off-by: Dmitry Baryshkov Fixes: be0624b99042 ("arm64: dts: qcom: sm8250: Add USB and PHY device nodes") Cc: robh+dt@kernel.org Cc: devicetree@vger.kernel.org Tested-by: Bryan O'Donoghue Signed-off-by: Bryan O'Donoghue --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.1 diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index 4c0de12aaba6..270d7ff59ec1 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -2123,7 +2123,7 @@ usb_2_qmpphy: phy@88eb000 { <&gcc GCC_USB3_PHY_SEC_BCR>; reset-names = "phy", "common"; - usb_2_ssphy: lane@88eb200 { + usb_2_ssphy: lanes@88eb200 { reg = <0 0x088eb200 0 0x200>, <0 0x088eb400 0 0x200>, <0 0x088eb800 0 0x800>; From patchwork Tue Jul 6 23:07:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 470491 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5434085jao; Tue, 6 Jul 2021 16:05:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyM3+uC31u/g3kYXR8hIYqrCRO6A6f7ycfqYKbaiw/1kMC9sR8Kwtn0gw0/06PL8wH0mVcJ X-Received: by 2002:a17:907:970e:: with SMTP id jg14mr16200489ejc.105.1625612719403; Tue, 06 Jul 2021 16:05:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625612719; cv=none; d=google.com; s=arc-20160816; b=Pzcq79shYQ8zTSooDuF5CX4wRSEyM0jpLb/1JgpFmNeRpu17jXWzUtoqAfWIYlUFnH 6ld6OLJ8UFWa0KJguXsLniXiUnOS8rOgKi5WWDK/XFRfIZIo8+4w0hgFe4oCu6KCMyyy 0yKXdOKQbPVCS0RhordFbHQLtpOq0eArfWK1zD/Nd/qco7M3ryRkdHP6CWnAj9Sk6Ycq yb6SMamg6aVQV00awxBBxS/omiIlvlO7XdOyJjfspNLKwqNmWcIxedJVExy67uGy7lBw rBVRyA7hVTiPJ70+bHpBD2Wy63y99eYCPx3QDd6yQY8cKD7Mbqt1/cjGAEw8XKbIZGJE 8+jw== 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=nyetHryyvI7ABcE7bII71QomcdRH1S5cUoHyXLnJduU=; b=MadkSrDACefEu57yzEgV6NEUvbqqbRotM/eJULvPQD89tUsMaKQGfBxaMiZRjOMSGl FcLDBmLE0UohwRpo5KoIuFZUh/uoSURUigM7R5lIP6s9YfkLV2A1939wrusUvDNQodfo oKUpt/kmpGezp1G1kEtbV8+Fo4uJQUN5q5E1tRfr48isqYHlTwniSSp8M29TcepUk+6y 7VeljlFv8/UZfqVSIKV1VB0Kndl9pMECkzi8FAVMqsz0CpeaZuAzto32LfFJQZgzGcuO ZoggpiImLBFSpiGarwQcBKJXdVk7JosVHTaoUU4cEpY4SwcUycdf7G12lkYR6RQKl/Tc sm6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oLC5O8l9; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b21si4000308eds.363.2021.07.06.16.05.19; Tue, 06 Jul 2021 16:05:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oLC5O8l9; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229873AbhGFXH5 (ORCPT + 17 others); Tue, 6 Jul 2021 19:07:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229811AbhGFXH5 (ORCPT ); Tue, 6 Jul 2021 19:07:57 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4CCCC061760 for ; Tue, 6 Jul 2021 16:05:16 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id w13so561608wmc.3 for ; Tue, 06 Jul 2021 16:05:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nyetHryyvI7ABcE7bII71QomcdRH1S5cUoHyXLnJduU=; b=oLC5O8l9dqqJ6SutSNJNtFJzEJBobnMrm3Uske5U9UnMXMGRNKh8y5Gpem1Dd0Yfxh ruJdjI2Ll6r9cAk7CaK1BOR47Dd/Aw/37dmw9Q6oOxi+JfztZdBGSn2VwHNRNngTZvIa mCJjFP+v1V2Cci8ynZJKFkic9p/XBofSlsyxhpvnLnTql7EjRnnghxMLCDZCE+v0m3iw pRwAD5roHcQv5aEsrMFkGe5edqllMGKuFjBB9/iF+AN8fcdYG8ps5AIaxkMiDgZyR3JA Y3mnCW8PWxXwGxdKmysBus9p0JfJAdzAeDxZPWApNb4xVyJFkfsCnrIfmYGl8sHQVJUu /n0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nyetHryyvI7ABcE7bII71QomcdRH1S5cUoHyXLnJduU=; b=op89V96V950o2nZUzXKGj6c61f2MTunhnlzT3QVv5ZLw9/SlZHThBruCXVbDEXWzLf 0NA7Q3ZSEQojs01baGE4b4Bt7ue3XEv4jdiQZVOrXNz+uOM9s5KNvCMkkTDRTWgbJNH4 FHxgVCxzQaXsV9fCW+t0hSAB+2NB3DRf0H1JeE8esIATNV/3Mgv9J2gYY/oFhA8fCfVJ IBj5Yx9apuX4dM6tA+BcMfq+HnbsZnDoOZTjTVD7eMhRjLNH2BnbamY2dmLnBRNGgg4n cXXcPCTKgG4nYSP4QszBZj35g9Lp9KWmhMUgRc9ia+QKlZ2Gbu1F2LfZFQX71poK0cAr EbKw== X-Gm-Message-State: AOAM532e5wSZHIPZfFnR3mokvaiGVZACwXY0sIHUvrxVvJ7tziIDXsk3 a+/te3MCWUGKqlg58meLwQX46g== X-Received: by 2002:a05:600c:35c1:: with SMTP id r1mr3209324wmq.181.1625612715300; Tue, 06 Jul 2021 16:05:15 -0700 (PDT) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id g15sm14241866wmh.16.2021.07.06.16.05.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 16:05:14 -0700 (PDT) From: Bryan O'Donoghue To: vkoul@kernel.org, kishon@ti.com, agross@kernel.org, bjorn.andersson@linaro.org, linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org Cc: robh+dt@kernel.org, jonathan@marek.ca, bryan.odonoghue@linaro.org, Dmitry Baryshkov , Wesley Cheng Subject: [PATCH 2/2] phy: qcom-qmp: Register as a typec switch for orientation detection Date: Wed, 7 Jul 2021 00:07:02 +0100 Message-Id: <20210706230702.299047-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210706230702.299047-1-bryan.odonoghue@linaro.org> References: <20210706230702.299047-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Dmitry Baryshkov The lane select switch for USB typec orientation is within the USB QMP PHY. the current device. It could be connected through an endpoint, to an independent device handling the typec detection, ie the QCOM SPMI typec driver. bod: Fixed the logic qcom_qmp_phy_typec_switch_set() to disable phy on disconnect if and only if we have initialized the PHY. Retained CC orientation logic in qcom_qmp_phy_com_init() to simplify patch. Co-developed-by: Wesley Cheng Signed-off-by: Wesley Cheng Co-developed-by: Bryan O'Donoghue Signed-off-by: Bryan O'Donoghue Signed-off-by: Dmitry Baryshkov --- drivers/phy/qualcomm/Kconfig | 8 +++ drivers/phy/qualcomm/phy-qcom-qmp.c | 107 ++++++++++++++++++++++------ 2 files changed, 95 insertions(+), 20 deletions(-) -- 2.30.1 diff --git a/drivers/phy/qualcomm/Kconfig b/drivers/phy/qualcomm/Kconfig index 7f6fcb8ec5ba..47d56333a512 100644 --- a/drivers/phy/qualcomm/Kconfig +++ b/drivers/phy/qualcomm/Kconfig @@ -48,6 +48,14 @@ config PHY_QCOM_QMP Enable this to support the QMP PHY transceiver that is used with controllers such as PCIe, UFS, and USB on Qualcomm chips. +config PHY_QCOM_QMP_TYPEC + def_bool PHY_QCOM_QMP=y && TYPEC=y || PHY_QCOM_QMP=m && TYPEC + help + Register a type C switch from the QMP PHY driver for type C + orientation support. This has dependencies with if the type C kernel + configuration is enabled or not. This support will not be present if + USB type C is disabled. + config PHY_QCOM_QUSB2 tristate "Qualcomm QUSB2 PHY Driver" depends on OF && (ARCH_QCOM || COMPILE_TEST) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c index 7877f70cf86f..9afc09f241e5 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c @@ -19,6 +19,7 @@ #include #include #include +#include #include @@ -66,6 +67,10 @@ /* QPHY_V3_PCS_MISC_CLAMP_ENABLE register bits */ #define CLAMP_EN BIT(0) /* enables i/o clamp_n */ +/* QPHY_V3_DP_COM_TYPEC_CTRL register bits */ +#define SW_PORTSELECT_VAL BIT(0) +#define SW_PORTSELECT_MUX BIT(1) + #define PHY_INIT_COMPLETE_TIMEOUT 10000 #define POWER_DOWN_DELAY_US_MIN 10 #define POWER_DOWN_DELAY_US_MAX 11 @@ -2494,6 +2499,8 @@ struct qmp_phy_dp_clks { * @phy_mutex: mutex lock for PHY common block initialization * @init_count: phy common block initialization count * @ufs_reset: optional UFS PHY reset handle + * @sw: typec switch for receiving orientation changes + * @orientation: carries current CC orientation */ struct qcom_qmp { struct device *dev; @@ -2509,6 +2516,8 @@ struct qcom_qmp { int init_count; struct reset_control *ufs_reset; + struct typec_switch *sw; + enum typec_orientation orientation; }; static void qcom_qmp_v3_phy_dp_aux_init(struct qmp_phy *qphy); @@ -3609,30 +3618,26 @@ static void qcom_qmp_v3_phy_configure_dp_tx(struct qmp_phy *qphy) static bool qcom_qmp_phy_configure_dp_mode(struct qmp_phy *qphy) { + const struct phy_configure_opts_dp *dp_opts = &qphy->dp_opts; + struct qcom_qmp *qmp = qphy->qmp; u32 val; - bool reverse = false; + bool reverse = qmp->orientation == TYPEC_ORIENTATION_REVERSE; val = DP_PHY_PD_CTL_PWRDN | DP_PHY_PD_CTL_AUX_PWRDN | DP_PHY_PD_CTL_PLL_PWRDN | DP_PHY_PD_CTL_DP_CLAMP_EN; - /* - * TODO: Assume orientation is CC1 for now and two lanes, need to - * use type-c connector to understand orientation and lanes. - * - * Otherwise val changes to be like below if this code understood - * the orientation of the type-c cable. - * - * if (lane_cnt == 4 || orientation == ORIENTATION_CC2) - * val |= DP_PHY_PD_CTL_LANE_0_1_PWRDN; - * if (lane_cnt == 4 || orientation == ORIENTATION_CC1) - * val |= DP_PHY_PD_CTL_LANE_2_3_PWRDN; - * if (orientation == ORIENTATION_CC2) - * writel(0x4c, qphy->pcs + QSERDES_V3_DP_PHY_MODE); - */ + if (dp_opts->lanes == 4 || reverse) + val |= DP_PHY_PD_CTL_LANE_0_1_PWRDN; + if (dp_opts->lanes == 4 || !reverse) + val |= DP_PHY_PD_CTL_LANE_2_3_PWRDN; + val |= DP_PHY_PD_CTL_LANE_2_3_PWRDN; writel(val, qphy->pcs + QSERDES_DP_PHY_PD_CTL); - writel(0x5c, qphy->pcs + QSERDES_DP_PHY_MODE); + if (reverse) + writel(0x4c, qphy->pcs + QSERDES_DP_PHY_MODE); + else + writel(0x5c, qphy->pcs + QSERDES_DP_PHY_MODE); return reverse; } @@ -3959,6 +3964,7 @@ static int qcom_qmp_phy_com_init(struct qmp_phy *qphy) void __iomem *serdes = qphy->serdes; void __iomem *pcs = qphy->pcs; void __iomem *dp_com = qmp->dp_com; + u32 val; int ret, i; mutex_lock(&qmp->phy_mutex); @@ -4001,13 +4007,17 @@ static int qcom_qmp_phy_com_init(struct qmp_phy *qphy) if (cfg->has_phy_dp_com_ctrl) { qphy_setbits(dp_com, QPHY_V3_DP_COM_POWER_DOWN_CTRL, SW_PWRDN); + /* override hardware control for reset of qmp phy */ qphy_setbits(dp_com, QPHY_V3_DP_COM_RESET_OVRD_CTRL, SW_DPPHY_RESET_MUX | SW_DPPHY_RESET | SW_USB3PHY_RESET_MUX | SW_USB3PHY_RESET); - /* Default type-c orientation, i.e CC1 */ - qphy_setbits(dp_com, QPHY_V3_DP_COM_TYPEC_CTRL, 0x02); + /* Latch CC orientation based on reported state by TCPM */ + val = SW_PORTSELECT_MUX; + if (qmp->orientation == TYPEC_ORIENTATION_REVERSE) + val |= SW_PORTSELECT_VAL; + qphy_setbits(dp_com, QPHY_V3_DP_COM_TYPEC_CTRL, val); qphy_setbits(dp_com, QPHY_V3_DP_COM_PHY_MODE_CTRL, USB3_MODE | DP_MODE); @@ -5021,6 +5031,52 @@ static const struct dev_pm_ops qcom_qmp_phy_pm_ops = { qcom_qmp_phy_runtime_resume, NULL) }; +#if IS_ENABLED(CONFIG_PHY_QCOM_QMP_TYPEC) +static int qcom_qmp_phy_typec_switch_set(struct typec_switch *sw, + enum typec_orientation orientation) +{ + struct qcom_qmp *qmp = typec_switch_get_drvdata(sw); + struct qmp_phy *qphy = qmp->phys[0]; + + dev_dbg(qmp->dev, "Toggling orientation current %d requested %d\n", + qmp->orientation, orientation); + + qmp->orientation = orientation; + + if (orientation == TYPEC_ORIENTATION_NONE) { + if (qmp->init_count) + qcom_qmp_phy_disable(qphy->phy); + } else { + if (!qmp->init_count) + qcom_qmp_phy_enable(qphy->phy); + } + + return 0; +} + +static int qcom_qmp_phy_typec_switch_register(struct qcom_qmp *qmp, const struct qmp_phy_cfg *cfg) +{ + struct typec_switch_desc sw_desc; + struct device *dev = qmp->dev; + + sw_desc.drvdata = qmp; + sw_desc.fwnode = dev->fwnode; + sw_desc.set = qcom_qmp_phy_typec_switch_set; + qmp->sw = typec_switch_register(dev, &sw_desc); + if (IS_ERR(qmp->sw)) { + dev_err(dev, "Error registering typec switch: %ld\n", + PTR_ERR(qmp->sw)); + } + + return 0; +} +#else +static int qcom_qmp_phy_typec_switch_register(struct qcom_qmp *qmp, const struct qmp_phy_cfg *cfg) +{ + return 0; +} +#endif + static int qcom_qmp_phy_probe(struct platform_device *pdev) { struct qcom_qmp *qmp; @@ -5103,7 +5159,12 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) return ret; } - num = of_get_available_child_count(dev->of_node); + /* count child nodes ingoring connection graph ports */ + num = 0; + for_each_available_child_of_node(dev->of_node, child) + if (strncmp("port", child->name, 4)) + num++; + /* do we have a rogue child node ? */ if (num > expected_phys) return -EINVAL; @@ -5130,7 +5191,10 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) serdes = usb_serdes; } - /* Create per-lane phy */ + /* Ignore conngraph nodes */ + if (!strncmp("port", child->name, 4)) + continue; + ret = qcom_qmp_phy_create(dev, child, id, serdes, cfg); if (ret) { dev_err(dev, "failed to create lane%d phy, %d\n", @@ -5160,6 +5224,9 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) id++; } + if (cfg->has_phy_dp_com_ctrl) + qcom_qmp_phy_typec_switch_register(qmp, cfg); + phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); if (!IS_ERR(phy_provider)) dev_info(dev, "Registered Qcom-QMP phy\n");