From nobody Mon Oct 6 13:38:28 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 729862D3742 for ; Tue, 22 Jul 2025 07:23:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753168983; cv=none; b=Kmk27DbIRQJjyZIvks50hT1lD205DaLeJ+/ltuM6HE9IxxjlfHSVmtoHUWrQRjtIlvzM6TZ2cAbWYlIfIT9iAM6rVP3jdZjtqOwFQqJyCTbS7u+JyT52GtGimbp4FfFBLgm9ikVe39G5LinwZznRn0ev6tDjA8ZRoJdbp/Xb/GU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753168983; c=relaxed/simple; bh=A/33KDRt3oDK4NDO2X2o64L+cjx2DofT19gj6OCqf7g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PArTjPdclPSpG0UeXIrb97fhrD0QEjcvLuMHVrULR9EvuCz9GSgOrlfrLuc83RB9Ku/3G6wba20vOU2a+Qbtd8C+5EYybSv/fUreYnMKOCnJPxvRN7Q3fohe7C1VqP0dlUp1s4pYBBPTHRkGaF83uvlO9OXWSSZ13v0nro4ClhI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=n6+Xs1t7; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="n6+Xs1t7" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56M2tl3A029269 for ; Tue, 22 Jul 2025 07:23:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= YZ4FgzCJdzXTZ68oWJfU94gpKDzF/Xt5MxzpGoR2lPo=; b=n6+Xs1t7W7KzG/B1 PAhr0SZg0iBIDLsAbPrX2Zwk8Wr4lya+C2+5+OdnzpDd43Z/erbgMbXCuEuBLieQ waICVPJGZEP40CEnOJ/Xt2PGic2xUN9+phA3jiZnCfD7rkKscpsbalAoD78O1JuI E2hGhJ78zHD3ycHeOLq8Zp7/DU3zWGJa/+Q+BBTT//nxGlgTX6ccW2QNCK02azuD G27CI1HVGaN66n/3FsNAoafNreRB0PGEzL9LoyD8+Vke+HLcDDD0Eh5kILUaI7Rg n5rbB372Z+LxwLDwSt6GEEx18Gm5Yvq2dNTsQC5oeqXLoYPDhhpyj9tGN6o6UO9J 3pT8/g== Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 48048tgebj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 22 Jul 2025 07:23:00 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-3132c0c961cso1553373a91.2 for ; Tue, 22 Jul 2025 00:23:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753168979; x=1753773779; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YZ4FgzCJdzXTZ68oWJfU94gpKDzF/Xt5MxzpGoR2lPo=; b=YmEhix5wFHNJ1AEnNwfRIW+X7Bu0vrD8oCvxU4W1MChZ2GwVzCgZzOatWnUH9l0NlU /2+L7oeyqtwbqQlnONqa3DSPVsCsg+dWPvvOFxZ+NoLABU36Z3NjTJ6qCl2oQ+CAsJH/ +VcCtmV+0AM57qyAAPyfjSWHCnYIPvmwDoJuTRmSVpwCUrb2py+2KyFlok1dCUySwSSU L7Tb3yGqgfZTdk6t9D8fMbnegOa+zS5/KVr+cZOny0iQbkf/mdKx/66v65BmUm+jQB4P PLK0+/zkLV6hCxoyV62PDL0TVdD3e3247bjDD43pvSnx+513Tm2T7JrWepkyuqmhMTh1 C4Hg== X-Forwarded-Encrypted: i=1; AJvYcCUUdpVpMc2EvComgn62+QAuYkh2JoUrjXvMurAHJ0Nznvt0H++iYYExFnyBhXWlOjeVnZzQVoEbfI7MpMc=@vger.kernel.org X-Gm-Message-State: AOJu0YwgtaCAlHr/DOZLrGlrVB4awwjBtK24zHuBvoNcDc4v8r8z+3T2 3k66gZGYTt5F2S6Bi3IMjAh8K51XJHEQEv82uClQqag6KToC/rAi6f76fTRJu8VQAre9NkdY8Ye vPEtp/qKoJZ0I3mpH6Noy5UDRur/diM75dPxo6W6DFF772fvQTKsfPYlv4sCJF3dkaNk= X-Gm-Gg: ASbGncuG4rnliLWqYU1p+i8W9CPIq4AoLO6s72ANdE5oikjaLJKzeJ4aQpBQPGXIfhW OpWCxuJD0f//CFH82eXd3MQosozRCrSHe1E3oi8X87UgvdYs+iD1AWcMRJMhjP2YfFmFiDDIkS0 9OkhQ+ht2Sa7hsXXUh8Ho3lGabfLbLsa6sLU3dSpbAk5UQvqW0gGQag990flMj7LQ+0j/2oVCa4 K4bzXTZBIXOfA2Z1pss5cWnKhjMhEWRUXk0mxTNhT7+tvoqNlWfBcN7+2519ZmMGm0HPHdYlxLT CiPRal6wTABXogi2ztvfO3oEM/Yh2EZMPabjoyEFeV1KYwFcAIexxtC/18Lp2ly0kTWvm9bvXGB sLUOoQlK21vsCApn3JQh/pmVq47W+dVBZbylnaP5pFzSrFOpzoa1F3dQ2 X-Received: by 2002:a17:90b:518d:b0:312:ec:411a with SMTP id 98e67ed59e1d1-31c9e76ae7amr13792190a91.3.1753168978870; Tue, 22 Jul 2025 00:22:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF+RLb9NbCc3+jcSeXV7HScdHKbTZCeU1tAR9/nK43lPZ6TFTvGxTPW2EvCOjgTdwguI8na1A== X-Received: by 2002:a17:90b:518d:b0:312:ec:411a with SMTP id 98e67ed59e1d1-31c9e76ae7amr13792158a91.3.1753168978262; Tue, 22 Jul 2025 00:22:58 -0700 (PDT) Received: from sziotdisp01-gv.qualcomm.com.ap.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31cc3e45e6csm7490753a91.3.2025.07.22.00.22.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Jul 2025 00:22:57 -0700 (PDT) From: Xiangxu Yin Date: Tue, 22 Jul 2025 15:22:06 +0800 Subject: [PATCH v2 05/13] phy: qcom: qmp-usbc: Introduce PHY type enum for USB/DP support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250722-add-displayport-support-for-qcs615-platform-v2-5-42b4037171f8@oss.qualcomm.com> References: <20250722-add-displayport-support-for-qcs615-platform-v2-0-42b4037171f8@oss.qualcomm.com> In-Reply-To: <20250722-add-displayport-support-for-qcs615-platform-v2-0-42b4037171f8@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Kuogee Hsieh , Vinod Koul , Kishon Vijay Abraham I Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-phy@lists.infradead.org, dmitry.baryshkov@oss.qualcomm.com, konrad.dybcio@oss.qualcomm.com, fange.zhang@oss.qualcomm.com, quic_lliu6@quicinc.com, quic_yongmou@quicinc.com, Xiangxu Yin X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1753168937; l=10901; i=xiangxu.yin@oss.qualcomm.com; s=20241125; h=from:subject:message-id; bh=A/33KDRt3oDK4NDO2X2o64L+cjx2DofT19gj6OCqf7g=; b=YDREKYRUTca7/pvK1h3Q1whlAfi6sY4u2iLzec2J+rRH4GEmAsQfi5xA6MykrceM7premjvzW 8+2lZrRHeNLCOStdaoVpXGAY81dSnFd33BOhziX5Gq3z9TGWcw3TP/u X-Developer-Key: i=xiangxu.yin@oss.qualcomm.com; a=ed25519; pk=F1TwipJzpywfbt3n/RPi4l/A4AVF+QC89XzCHgZYaOc= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIyMDA1OSBTYWx0ZWRfX2CNdqrHWqWB9 quSX7sC8zMeHHB9k/cH0Ev+e5NanAZeZCwzO2LfhW4LNkCOi5WLhWtLCLTGCPE7OLfrNUMmav4m w0Gjc2sV6UQOQbon5eRtkmj0UN3bW7K9K0/miG3cm11JcPMdj0dt0Wbb/DYeSZpki/sdj0+aTHU 03MfGpsb6oUZpRjhBkmaDvG+uf88pFC9H9iN8A2Zo/4ghY8r6w2/ofsVIpfsySEwLODx+0DHzDU 3CVCB1RqgeqcjOIM/5U2g+U1I0g95dCtlfXz08krZj7LyR+AzSuBzt1FwZdBlS3XYeEBSw72f9r hBJh1wRsz3m+HJ4VQdisnR6pWWU0d+1Pa0b0sA23qs2uKHAaJ9EthvRi66zqQHzu4Niad0Da4Zj 7x/u3DAtCN+Tz0yuoX0mxPzpTAJztRUXMCmRe4MQg3OwI+j1L6a5nfLe6srUCinkwKrWOwMz X-Authority-Analysis: v=2.4 cv=Jb68rVKV c=1 sm=1 tr=0 ts=687f3c54 cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=lpKKpq6P2_pQO93rLgIA:9 a=QEXdDO2ut3YA:10 a=iS9zxrgQBfv6-_F4QbHw:22 X-Proofpoint-GUID: ah7ywia_crxNh9ibP79LCpPQKTZrcLeR X-Proofpoint-ORIG-GUID: ah7ywia_crxNh9ibP79LCpPQKTZrcLeR X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-22_01,2025-07-21_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 adultscore=0 priorityscore=1501 clxscore=1015 phishscore=0 lowpriorityscore=0 suspectscore=0 bulkscore=0 malwarescore=0 mlxscore=0 spamscore=0 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507220059 Add `qmp_phy_usbc_type` enum and a `type` field in `qmp_usbc` to distinguish between USB and DP PHYs. - Introduce `qmp_phy_usbc_type` enum with USB and DP types. - Update device match table to associate compatible strings with type and config. - Wrap existing USB-specific logic with type checks to prepare for future DP support. No functional changes and serves as a preparatory step for adding DP PHY support. Signed-off-by: Xiangxu Yin --- drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 195 ++++++++++++++++++++-------= ---- 1 file changed, 126 insertions(+), 69 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c b/drivers/phy/qualcom= m/phy-qcom-qmp-usbc.c index 078752dbc66f9b9844c003e7755fff6466ea1d6c..647e2f54b744bf099ea667e672c= 606dd7aef3bcf 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c @@ -286,6 +286,16 @@ static const struct qmp_phy_init_tbl qcm2290_usb3_pcs_= tbl[] =3D { QMP_PHY_INIT_CFG(QPHY_V3_PCS_RX_SIGDET_LVL, 0x88), }; =20 +enum qmp_phy_usbc_type { + QMP_PHY_USBC_USB, + QMP_PHY_USBC_DP, +}; + +struct qmp_phy_cfg { + int type; + const void *cfg; +}; + struct qmp_usbc_usb_offsets { u16 serdes; u16 pcs; @@ -454,23 +464,40 @@ static const struct qmp_phy_usb_cfg sdm660_usb3phy_cf= g =3D { .regs =3D qmp_v3_usb3phy_regs_layout_qcm2290, }; =20 +static const struct qmp_phy_cfg msm8998_phy_usb3_cfg =3D { + .type =3D QMP_PHY_USBC_USB, + .cfg =3D &msm8998_usb3phy_cfg, +}; + +static const struct qmp_phy_cfg qcm2290_phy_usb3_cfg =3D { + .type =3D QMP_PHY_USBC_USB, + .cfg =3D &qcm2290_usb3phy_cfg, +}; + +static const struct qmp_phy_cfg sdm660_phy_usb3_cfg =3D { + .type =3D QMP_PHY_USBC_USB, + .cfg =3D &sdm660_usb3phy_cfg, +}; + #define to_usb_cfg(x) ((struct qmp_phy_usb_cfg *)((x)->cfg)) #define to_usb_layout(x) ((struct qmp_phy_usb_layout *)((x)->layout)) =20 static int qmp_usbc_generic_init(struct phy *phy) { struct qmp_usbc *qmp =3D phy_get_drvdata(phy); - struct qmp_phy_usb_cfg *cfg =3D to_usb_cfg(qmp); - struct qmp_phy_usb_layout *layout =3D to_usb_layout(qmp); int num_vregs; - unsigned int reg_pwr_dn; u32 val; int ret; + unsigned int reg_pwr_dn; =20 - num_vregs =3D cfg->num_vregs; - reg_pwr_dn =3D cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL]; + if (qmp->type =3D=3D QMP_PHY_USBC_USB) { + struct qmp_phy_usb_cfg *cfg =3D to_usb_cfg(qmp); =20 - ret =3D regulator_bulk_enable(cfg->num_vregs, qmp->vregs); + num_vregs =3D cfg->num_vregs; + reg_pwr_dn =3D cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL]; + } + + ret =3D regulator_bulk_enable(num_vregs, qmp->vregs); if (ret) { dev_err(qmp->dev, "failed to enable regulators, err=3D%d\n", ret); return ret; @@ -497,8 +524,12 @@ static int qmp_usbc_generic_init(struct phy *phy) if (qmp->orientation =3D=3D TYPEC_ORIENTATION_REVERSE) val |=3D SW_PORTSELECT_VAL; =20 - qphy_setbits(layout->pcs, reg_pwr_dn, SW_PWRDN); - writel(val, layout->pcs_misc); + if (qmp->type =3D=3D QMP_PHY_USBC_USB) { + struct qmp_phy_usb_layout *layout =3D to_usb_layout(qmp); + + qphy_setbits(layout->pcs, reg_pwr_dn, SW_PWRDN); + writel(val, layout->pcs_misc); + } =20 return 0; =20 @@ -513,13 +544,18 @@ static int qmp_usbc_generic_init(struct phy *phy) static int qmp_usbc_generic_exit(struct phy *phy) { struct qmp_usbc *qmp =3D phy_get_drvdata(phy); - struct qmp_phy_usb_cfg *cfg =3D to_usb_cfg(qmp); + int num_vregs; =20 reset_control_bulk_assert(qmp->num_resets, qmp->resets); =20 clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks); =20 - regulator_bulk_disable(cfg->num_vregs, qmp->vregs); + if (qmp->type =3D=3D QMP_PHY_USBC_USB) { + struct qmp_phy_usb_cfg *cfg =3D to_usb_cfg(qmp); + + num_vregs =3D cfg->num_vregs; + } + regulator_bulk_disable(num_vregs, qmp->vregs); =20 return 0; } @@ -650,7 +686,7 @@ static const struct phy_ops qmp_usbc_usb_phy_ops =3D { =20 static void qmp_usbc_enable_autonomous_mode(struct qmp_usbc *qmp) { - const struct qmp_phy_usb_cfg *cfg =3D qmp->cfg; + const struct qmp_phy_usb_cfg *cfg =3D to_usb_cfg(qmp); struct qmp_phy_usb_layout *layout =3D to_usb_layout(qmp); void __iomem *pcs =3D layout->pcs; u32 intr_mask; @@ -698,18 +734,20 @@ static void qmp_usbc_disable_autonomous_mode(struct q= mp_usbc *qmp) static int __maybe_unused qmp_usbc_runtime_suspend(struct device *dev) { struct qmp_usbc *qmp =3D dev_get_drvdata(dev); - struct qmp_phy_usb_layout *layout =3D to_usb_layout(qmp); - - dev_vdbg(dev, "Suspending QMP phy, mode:%d\n", layout->mode); =20 if (!qmp->phy->init_count) { dev_vdbg(dev, "PHY not initialized, bailing out\n"); return 0; } =20 - qmp_usbc_enable_autonomous_mode(qmp); + if (qmp->type =3D=3D QMP_PHY_USBC_USB) { + struct qmp_phy_usb_layout *layout =3D to_usb_layout(qmp); + + dev_vdbg(dev, "Suspending QMP phy, mode:%d\n", layout->mode); + qmp_usbc_enable_autonomous_mode(qmp); + clk_disable_unprepare(layout->pipe_clk); + } =20 - clk_disable_unprepare(layout->pipe_clk); clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks); =20 return 0; @@ -718,11 +756,8 @@ static int __maybe_unused qmp_usbc_runtime_suspend(str= uct device *dev) static int __maybe_unused qmp_usbc_runtime_resume(struct device *dev) { struct qmp_usbc *qmp =3D dev_get_drvdata(dev); - struct qmp_phy_usb_layout *layout =3D to_usb_layout(qmp); int ret =3D 0; =20 - dev_vdbg(dev, "Resuming QMP phy, mode:%d\n", layout->mode); - if (!qmp->phy->init_count) { dev_vdbg(dev, "PHY not initialized, bailing out\n"); return 0; @@ -732,14 +767,19 @@ static int __maybe_unused qmp_usbc_runtime_resume(str= uct device *dev) if (ret) return ret; =20 - ret =3D clk_prepare_enable(layout->pipe_clk); - if (ret) { - dev_err(dev, "pipe_clk enable failed, err=3D%d\n", ret); - clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks); - return ret; - } + if (qmp->type =3D=3D QMP_PHY_USBC_USB) { + struct qmp_phy_usb_layout *layout =3D to_usb_layout(qmp); + + dev_vdbg(dev, "Resuming QMP phy, mode:%d\n", layout->mode); + ret =3D clk_prepare_enable(layout->pipe_clk); + if (ret) { + dev_err(dev, "pipe_clk enable failed, err=3D%d\n", ret); + clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks); + return ret; + } =20 - qmp_usbc_disable_autonomous_mode(qmp); + qmp_usbc_disable_autonomous_mode(qmp); + } =20 return 0; } @@ -751,20 +791,28 @@ static const struct dev_pm_ops qmp_usbc_pm_ops =3D { =20 static int qmp_usbc_vreg_init(struct qmp_usbc *qmp) { - struct qmp_phy_usb_cfg *cfg =3D to_usb_cfg(qmp); struct device *dev =3D qmp->dev; - int i; + int ret, i; =20 - int num =3D cfg->num_vregs; + if (qmp->type =3D=3D QMP_PHY_USBC_USB) { + struct qmp_phy_usb_cfg *cfg =3D to_usb_cfg(qmp); + int num =3D cfg->num_vregs; =20 - qmp->vregs =3D devm_kcalloc(dev, num, sizeof(*qmp->vregs), GFP_KERNEL); - if (!qmp->vregs) - return -ENOMEM; + qmp->vregs =3D devm_kcalloc(dev, num, sizeof(*qmp->vregs), GFP_KERNEL); + if (!qmp->vregs) + return -ENOMEM; =20 - for (i =3D 0; i < num; i++) - qmp->vregs[i].supply =3D cfg->vreg_list[i]; + for (i =3D 0; i < num; i++) + qmp->vregs[i].supply =3D cfg->vreg_list[i]; =20 - return devm_regulator_bulk_get(dev, num, qmp->vregs); + ret =3D devm_regulator_bulk_get(dev, num, qmp->vregs); + if (ret) { + dev_err(dev, "failed at devm_regulator_bulk_get\n"); + return ret; + } + } + + return 0; } =20 static int qmp_usbc_reset_init(struct qmp_usbc *qmp, @@ -1061,6 +1109,7 @@ static int qmp_usbc_probe(struct platform_device *pde= v) struct phy_provider *phy_provider; struct device_node *np; struct qmp_usbc *qmp; + const struct qmp_phy_cfg *data_cfg; int ret; =20 qmp =3D devm_kzalloc(dev, sizeof(*qmp), GFP_KERNEL); @@ -1072,39 +1121,45 @@ static int qmp_usbc_probe(struct platform_device *p= dev) =20 qmp->orientation =3D TYPEC_ORIENTATION_NORMAL; =20 - qmp->cfg =3D of_device_get_match_data(dev); - if (!qmp->cfg) + data_cfg =3D of_device_get_match_data(dev); + if (!data_cfg) return -EINVAL; =20 mutex_init(&qmp->phy_mutex); =20 + qmp->type =3D data_cfg->type; + qmp->cfg =3D data_cfg->cfg; + ret =3D qmp_usbc_vreg_init(qmp); if (ret) return ret; =20 - qmp->layout =3D devm_kzalloc(dev, sizeof(struct qmp_phy_usb_layout), GFP_= KERNEL); - if (!qmp->layout) - return -ENOMEM; + if (qmp->type =3D=3D QMP_PHY_USBC_USB) { + qmp->layout =3D devm_kzalloc(dev, sizeof(struct qmp_phy_usb_layout), GFP= _KERNEL); + if (!qmp->layout) + return -ENOMEM; + + ret =3D qmp_usbc_parse_vls_clamp(qmp); + if (ret) + return ret; + + /* Check for legacy binding with child node. */ + np =3D of_get_child_by_name(dev->of_node, "phy"); + if (np) { + ret =3D qmp_usbc_parse_usb_dt_legacy(qmp, np); + } else { + np =3D of_node_get(dev->of_node); + ret =3D qmp_usbc_parse_usb_dt(qmp); + } + + if (ret) + goto err_node_put; + } =20 ret =3D qmp_usbc_typec_switch_register(qmp); if (ret) return ret; =20 - ret =3D qmp_usbc_parse_vls_clamp(qmp); - if (ret) - return ret; - - /* Check for legacy binding with child node. */ - np =3D of_get_child_by_name(dev->of_node, "phy"); - if (np) { - ret =3D qmp_usbc_parse_usb_dt_legacy(qmp, np); - } else { - np =3D of_node_get(dev->of_node); - ret =3D qmp_usbc_parse_usb_dt(qmp); - } - if (ret) - goto err_node_put; - pm_runtime_set_active(dev); ret =3D devm_pm_runtime_enable(dev); if (ret) @@ -1115,15 +1170,17 @@ static int qmp_usbc_probe(struct platform_device *p= dev) */ pm_runtime_forbid(dev); =20 - ret =3D phy_pipe_clk_register(qmp, np); - if (ret) - goto err_node_put; - - qmp->phy =3D devm_phy_create(dev, np, &qmp_usbc_usb_phy_ops); - if (IS_ERR(qmp->phy)) { - ret =3D PTR_ERR(qmp->phy); - dev_err(dev, "failed to create PHY: %d\n", ret); - goto err_node_put; + if (qmp->type =3D=3D QMP_PHY_USBC_USB) { + ret =3D phy_pipe_clk_register(qmp, np); + if (ret) + goto err_node_put; + + qmp->phy =3D devm_phy_create(dev, np, &qmp_usbc_usb_phy_ops); + if (IS_ERR(qmp->phy)) { + ret =3D PTR_ERR(qmp->phy); + dev_err(dev, "failed to create PHY: %d\n", ret); + goto err_node_put; + } } =20 phy_set_drvdata(qmp->phy, qmp); @@ -1142,19 +1199,19 @@ static int qmp_usbc_probe(struct platform_device *p= dev) static const struct of_device_id qmp_usbc_of_match_table[] =3D { { .compatible =3D "qcom,msm8998-qmp-usb3-phy", - .data =3D &msm8998_usb3phy_cfg, + .data =3D &msm8998_phy_usb3_cfg, }, { .compatible =3D "qcom,qcm2290-qmp-usb3-phy", - .data =3D &qcm2290_usb3phy_cfg, + .data =3D &qcm2290_phy_usb3_cfg, }, { .compatible =3D "qcom,qcs615-qmp-usb3-phy", - .data =3D &qcm2290_usb3phy_cfg, + .data =3D &qcm2290_phy_usb3_cfg, }, { .compatible =3D "qcom,sdm660-qmp-usb3-phy", - .data =3D &sdm660_usb3phy_cfg, + .data =3D &sdm660_phy_usb3_cfg, }, { .compatible =3D "qcom,sm6115-qmp-usb3-phy", - .data =3D &qcm2290_usb3phy_cfg, + .data =3D &qcm2290_phy_usb3_cfg, }, { }, }; --=20 2.34.1