From nobody Thu Apr 9 10:40:51 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 E652534F488 for ; Sat, 14 Mar 2026 05:14:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773465278; cv=none; b=TOABg+sUk65DQ1FZ2kTWiVcNf6mAJPJNXqmtPMLQG3QpMUWSJXGDpdgo3OITbdyU2cT6/SGjtk2B0/vJch6qe3P3wmxCh7nwPFHzP+uzC/EMwpR8hd20dCLqDDMv3BQeHyYrOi7+d+XDQ5BUa6gSifzXFaPzr24FDk4xYrzR3NA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773465278; c=relaxed/simple; bh=R5pBNcEPa4QwUC9qHRuUBfaydPXuwi+4YjH+F5br9qw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D3jVEnUidcR5REczwQuPTee+PyT12PPxd/P5baBKKsaMdVHbe9A8mKN94SPu6Wy81693rE58/62WVxP3jq1Vh+NrMPfUvtOBTbePjmk0L93Y7oHz+E0WZ7GgqLFkUEBTgnXq80x7RRd4Ir+Mt11ruh5IGBuJZY6ohEB+z2hp3o0= 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=oUKq/TBh; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=LRIC7gpW; arc=none smtp.client-ip=205.220.168.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="oUKq/TBh"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="LRIC7gpW" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62E3nwbK2907986 for ; Sat, 14 Mar 2026 05:14:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=W+O9wnUc0BV uNOqySW59HE3hd1+OnCD6FN9BarAEYVk=; b=oUKq/TBhLPLk85a4QdvGAwgNHwa EbJ/yzPRBPplSuT2brKkWzD1DEzhvGVDT7Su9G0iJdjQOtYK/aRQInSmiOa9vuBj dJTfE+LdOLoYAm2+J2Je7OhFDh0vrdit5//mAIx40BpT9XHELLQTTJOPBzS3Kpeo FijodJFHsGZPmGCGv0j8M7k400xqlqLJ1nl/L6S/wrKTZ4tNOV63vG3Q+7wSR/X8 CEjZNt6Bx36D8NuQRpTJ4h9sBjtJ93eZxXORFR4ol1+ofTZEoB7CH3NY4JNsu0mm vlpcG0TftkEgUXBhXSfqBmlVVOcQ5bRBenGtvsqz6AvpLTEMm63+KRiKrLQ== Received: from mail-dy1-f200.google.com (mail-dy1-f200.google.com [74.125.82.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cw043g48e-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 14 Mar 2026 05:14:34 +0000 (GMT) Received: by mail-dy1-f200.google.com with SMTP id 5a478bee46e88-2beace83f92so754571eec.0 for ; Fri, 13 Mar 2026 22:14:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773465273; x=1774070073; 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=W+O9wnUc0BVuNOqySW59HE3hd1+OnCD6FN9BarAEYVk=; b=LRIC7gpWSOWnAskY0JiB7HrdyWPycZD+8uWX0/WMcMntPXTOL1UPexA6tuJwNtENnO TXs9dGRm/gW8czgFCFupPpt2XCRKv6R2T45++HIerbb/5or9/omp/pMIjYlzJ9xFpivT I2eK9HoNcirHReflLYur//fYy22PmCO5NDcPQHfyRczh1mMVNxNzNNLIsLbbncguJVNd 3wgIPnPchEY5zcT63pmdZwPgz2nzxlas+eqhz4LoM2FkIS7bn7JWmFTFogZVaaImAHOq xgnMg287OqdCjPOkU6wqOI999V5+tc65lKGecKUVLe49nOTzpyDk6/FGxv76tlgemmGi jYeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773465273; x=1774070073; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=W+O9wnUc0BVuNOqySW59HE3hd1+OnCD6FN9BarAEYVk=; b=ePdej2WqKRxnNeC5F1jYdBMP7XHJwHTdNPZ9hJLfdhabQM4fOWxbHLfLp3giK5YPLd yKAXjOhR0/Pxkl88H74qFVLlYP82u5rT+Jzu034fWe0Ffo0Gx4wktvRxevOvv72neZBX FlzwWE6EdPi0YwB8rrm6muUCupnBuuF1+Om3UM5gTndhe1TwEv45G6HW5GYGp7lrWZkv ry5ie9mssW4w3vvG0OOfFZrHeN8AkyqWwtn8+shqkRaXupJ+SYbJD8sd9T0db8iymarS np3fR+KsWcK5m1+tO1yZ005WdBfG6LwKUf/J8BqLHL51igGmiL8JAKwOqv2zrNzXxo+n KcRQ== X-Forwarded-Encrypted: i=1; AJvYcCXz+8sOTgqlw47dSLZfJmjZV26kDurfVqNwvY+u/owXEUtEzVs16hBHElPR/2Qs4YscDOcow+nzYS17fJQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwDtDRfnHW0uqEgj8P0c6UouSvI6Bzwo38Tuz6+hH6/HLAdZZ9Y Ti6IvxttSPV7QmB2h3EMXldodRaFAeNIHrbAPty+RxUWGxtDgSZsIFaG0vgTj/kUo0QQTNaQ/2E 7kOlOVjj1wRgCDUYgQhJKOb6ZeSW1QZRggXbfKwmFuyV4rQNrQrZ4kG4r027MwXwSnx8= X-Gm-Gg: ATEYQzxWe4Ekq9vAJv4q1GcnYKOenvkpF7b5PYl84/mf6JA2hhY/0hwnTv7zNyaKFhB fU5B1lIvnZTjYnztbB263cKpOvQl2Kp4pZ5xgGfHTr1xlsWbgWRP7H6YPOpB+JNCvABPftMIjSc N84lH6eHi9MpWufWLePBVXDXBb25Ql7Vu1j+6B3eJxupI+XXEkHXMXDeZq2Ld8myOUWAvmdibJG /9IZWNUSfxiwJrj1+eF+QqQYVQTRPmgRmyG0c6bSQW1hE1/bcGSfNG2twhCaNrVTgtPnJGuHHKI 0wu2/In6U/rU/HOxM7PL9ZUXhVlhmZepumai/bfnFfiqjceu8Kdwt8GdIJCYIhjVOHw3+QVdqQU 8y7LnS7XaGlGrpOy9AdnUdjfsvn/gc/K+RmYysWJl6xopxOrxwTnbQGYJ3EZNgsJtWqtjQdrBXT Uz/nwrNg== X-Received: by 2002:a05:7300:bc19:b0:2b7:fdb6:ccc2 with SMTP id 5a478bee46e88-2bea545498fmr2542588eec.16.1773465273340; Fri, 13 Mar 2026 22:14:33 -0700 (PDT) X-Received: by 2002:a05:7300:bc19:b0:2b7:fdb6:ccc2 with SMTP id 5a478bee46e88-2bea545498fmr2542581eec.16.1773465272819; Fri, 13 Mar 2026 22:14:32 -0700 (PDT) Received: from QCOM-aGQu4IUr3Y.qualcomm.com (i-global052.qualcomm.com. [199.106.103.52]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2c098cbd4dasm1784045eec.0.2026.03.13.22.14.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2026 22:14:32 -0700 (PDT) From: Shawn Guo To: Vinod Koul Cc: Neil Armstrong , Dmitry Baryshkov , Abel Vesa , Konrad Dybcio , Xiangxu Yin , Manivannan Sadhasivam , Luca Weiss , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, Shawn Guo Subject: [PATCH 4/6] phy: qcom-qmp-usbc: Rename QCS615 DP PHY variables and functions Date: Sat, 14 Mar 2026 13:13:23 +0800 Message-ID: <20260314051325.198137-5-shengchao.guo@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260314051325.198137-1-shengchao.guo@oss.qualcomm.com> References: <20260314051325.198137-1-shengchao.guo@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE0MDAzOCBTYWx0ZWRfX0HNklhJ7hlU7 AV+oiegXVA8rfeX5raQBOa4N4aqSCQ4qAw6/0iaEkL8Rs5fnKL0VKcy3ICSqoXJzYC7Pjmqgjsd ZmE4Cris9Ylm2jbPYBnuQOQVC2TnY8XybGEncKuWrM9f6awwLwNi2dHr8P5a7Od28RQ2uFEjHRZ MObkVrHTjQ/6QrDWlViob1Nh0g6hRWaN8H/MHrRCWg7N4/LdnhwA0Dy5LyiY7DFvuPbfUwtQlxA q48HktIueaaHpRP+Lj03oGpvzutQarYZRaB46XJiJWNPmoPuck9w9UvmkWcYWlrHV3Ojqs90bv1 4KAnkZauOGdBva+pM0lPOnt7kSzfiOlJ/FtGQRbQOBUbNo9n0IJtopbqcyuRQBqG9uZ8UNqJnkn C8/39n8oJEM4cWPDQNrtxeJIIcEu2CetPylzBWIaFGifMHbWH8CMhSG7AvCu0F72LdlFSBEev0v HB7cCNQ+slO0kz7uybw== X-Proofpoint-GUID: _pwbYRsF-VQ1_hM_H7zKaOz1pYjl1sR0 X-Authority-Analysis: v=2.4 cv=fLs0HJae c=1 sm=1 tr=0 ts=69b4eeba cx=c_pps a=PfFC4Oe2JQzmKTvty2cRDw==:117 a=b9+bayejhc3NMeqCNyeLQQ==:17 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=BQofoxfB7IYdQntn66wA:9 a=6Ab_bkdmUrQuMsNx7PHu:22 X-Proofpoint-ORIG-GUID: _pwbYRsF-VQ1_hM_H7zKaOz1pYjl1sR0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-14_01,2026-03-13_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 priorityscore=1501 malwarescore=0 lowpriorityscore=0 suspectscore=0 impostorscore=0 clxscore=1015 adultscore=0 spamscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603140038 Content-Type: text/plain; charset="utf-8" Commit 81791c45c8e0 ("phy: qcom: qmp-usbc: Add QCS615 USB/DP PHY config and DP mode support") chose to name QCS615 DP PHY variables/functions with qmp_v2 prefix, by assuming that QMP PHY registers are versioned as a whole. However, the reality is that the registers are versioned in sub-modules like QSERDES COM and QSERDES TXRX respectively, e.g. QCS615 DP PHY has registers of QSERDES COM v2 and QSERDES TXRX v3. Thus it may cause confusion that qmp_v2_xxx table and functions access QSERDES TXRX v3 registers. Rename QCS615 DP PHY variables and functions to be prefixed by qcs615 instead of qmp_v2. This better aligns with how the driver names USB3 PHY variables for QCM2290 etc. Signed-off-by: Shawn Guo --- drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 66 ++++++++++++------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c b/drivers/phy/qualcom= m/phy-qcom-qmp-usbc.c index 3f8c4280b933..edfc1ae68f49 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c @@ -290,7 +290,7 @@ static const struct qmp_phy_init_tbl qcm2290_usb3_pcs_t= bl[] =3D { QMP_PHY_INIT_CFG(QPHY_V3_PCS_RX_SIGDET_LVL, 0x88), }; =20 -static const struct qmp_phy_init_tbl qmp_v2_dp_serdes_tbl[] =3D { +static const struct qmp_phy_init_tbl qcs615_dp_serdes_tbl[] =3D { QMP_PHY_INIT_CFG(QSERDES_V2_COM_SVS_MODE_CLK_SEL, 0x01), QMP_PHY_INIT_CFG(QSERDES_V2_COM_SYSCLK_EN_SEL, 0x37), QMP_PHY_INIT_CFG(QSERDES_V2_COM_CLK_SELECT, 0x00), @@ -317,7 +317,7 @@ static const struct qmp_phy_init_tbl qmp_v2_dp_serdes_t= bl[] =3D { QMP_PHY_INIT_CFG(QSERDES_V2_COM_CMN_CONFIG, 0x02), }; =20 -static const struct qmp_phy_init_tbl qmp_v2_dp_serdes_tbl_rbr[] =3D { +static const struct qmp_phy_init_tbl qcs615_dp_serdes_tbl_rbr[] =3D { QMP_PHY_INIT_CFG(QSERDES_V2_COM_HSCLK_SEL, 0x2c), QMP_PHY_INIT_CFG(QSERDES_V2_COM_DEC_START_MODE0, 0x69), QMP_PHY_INIT_CFG(QSERDES_V2_COM_DIV_FRAC_START1_MODE0, 0x00), @@ -328,7 +328,7 @@ static const struct qmp_phy_init_tbl qmp_v2_dp_serdes_t= bl_rbr[] =3D { QMP_PHY_INIT_CFG(QSERDES_V2_COM_LOCK_CMP3_MODE0, 0x00), }; =20 -static const struct qmp_phy_init_tbl qmp_v2_dp_serdes_tbl_hbr[] =3D { +static const struct qmp_phy_init_tbl qcs615_dp_serdes_tbl_hbr[] =3D { QMP_PHY_INIT_CFG(QSERDES_V2_COM_HSCLK_SEL, 0x24), QMP_PHY_INIT_CFG(QSERDES_V2_COM_DEC_START_MODE0, 0x69), QMP_PHY_INIT_CFG(QSERDES_V2_COM_DIV_FRAC_START1_MODE0, 0x00), @@ -339,7 +339,7 @@ static const struct qmp_phy_init_tbl qmp_v2_dp_serdes_t= bl_hbr[] =3D { QMP_PHY_INIT_CFG(QSERDES_V2_COM_LOCK_CMP3_MODE0, 0x00), }; =20 -static const struct qmp_phy_init_tbl qmp_v2_dp_serdes_tbl_hbr2[] =3D { +static const struct qmp_phy_init_tbl qcs615_dp_serdes_tbl_hbr2[] =3D { QMP_PHY_INIT_CFG(QSERDES_V2_COM_HSCLK_SEL, 0x20), QMP_PHY_INIT_CFG(QSERDES_V2_COM_DEC_START_MODE0, 0x8c), QMP_PHY_INIT_CFG(QSERDES_V2_COM_DIV_FRAC_START1_MODE0, 0x00), @@ -350,7 +350,7 @@ static const struct qmp_phy_init_tbl qmp_v2_dp_serdes_t= bl_hbr2[] =3D { QMP_PHY_INIT_CFG(QSERDES_V2_COM_LOCK_CMP3_MODE0, 0x00), }; =20 -static const struct qmp_phy_init_tbl qmp_v2_dp_tx_tbl[] =3D { +static const struct qmp_phy_init_tbl qcs615_dp_tx_tbl[] =3D { QMP_PHY_INIT_CFG(QSERDES_V3_TX_TRANSCEIVER_BIAS_EN, 0x1a), QMP_PHY_INIT_CFG(QSERDES_V3_TX_VMODE_CTRL1, 0x40), QMP_PHY_INIT_CFG(QSERDES_V3_TX_PRE_STALL_LDO_BOOST_EN, 0x30), @@ -555,14 +555,14 @@ static const struct qmp_usbc_offsets qmp_usbc_usb3dp_= offsets_qcs615 =3D { .dp_dp_phy =3D 0x1000, }; =20 -static const u8 qmp_v2_dp_pre_emphasis_hbr2_rbr[4][4] =3D { +static const u8 qcs615_dp_pre_emphasis_hbr2_rbr[4][4] =3D { {0x00, 0x0b, 0x12, 0xff}, {0x00, 0x0a, 0x12, 0xff}, {0x00, 0x0c, 0xff, 0xff}, {0xff, 0xff, 0xff, 0xff} }; =20 -static const u8 qmp_v2_dp_voltage_swing_hbr2_rbr[4][4] =3D { +static const u8 qcs615_dp_voltage_swing_hbr2_rbr[4][4] =3D { {0x07, 0x0f, 0x14, 0xff}, {0x11, 0x1d, 0x1f, 0xff}, {0x18, 0x1f, 0xff, 0xff}, @@ -641,10 +641,10 @@ static const struct qmp_phy_cfg qcs615_usb3phy_cfg = =3D { .regs =3D qmp_v3_usb3phy_regs_layout_qcm2290, }; =20 -static void qmp_v2_dp_aux_init(struct qmp_usbc *qmp); -static void qmp_v2_configure_dp_tx(struct qmp_usbc *qmp); -static int qmp_v2_configure_dp_phy(struct qmp_usbc *qmp); -static int qmp_v2_calibrate_dp_phy(struct qmp_usbc *qmp); +static void qcs615_qmp_dp_aux_init(struct qmp_usbc *qmp); +static void qcs615_qmp_configure_dp_tx(struct qmp_usbc *qmp); +static int qcs615_qmp_configure_dp_phy(struct qmp_usbc *qmp); +static int qcs615_qmp_calibrate_dp_phy(struct qmp_usbc *qmp); =20 static const struct qmp_phy_cfg qcs615_usb3dp_phy_cfg =3D { .offsets =3D &qmp_usbc_usb3dp_offsets_qcs615, @@ -660,25 +660,25 @@ static const struct qmp_phy_cfg qcs615_usb3dp_phy_cfg= =3D { =20 .regs =3D qmp_v3_usb3phy_regs_layout_qcm2290, =20 - .dp_serdes_tbl =3D qmp_v2_dp_serdes_tbl, - .dp_serdes_tbl_num =3D ARRAY_SIZE(qmp_v2_dp_serdes_tbl), - .dp_tx_tbl =3D qmp_v2_dp_tx_tbl, - .dp_tx_tbl_num =3D ARRAY_SIZE(qmp_v2_dp_tx_tbl), + .dp_serdes_tbl =3D qcs615_dp_serdes_tbl, + .dp_serdes_tbl_num =3D ARRAY_SIZE(qcs615_dp_serdes_tbl), + .dp_tx_tbl =3D qcs615_dp_tx_tbl, + .dp_tx_tbl_num =3D ARRAY_SIZE(qcs615_dp_tx_tbl), =20 - .serdes_tbl_rbr =3D qmp_v2_dp_serdes_tbl_rbr, - .serdes_tbl_rbr_num =3D ARRAY_SIZE(qmp_v2_dp_serdes_tbl_rbr), - .serdes_tbl_hbr =3D qmp_v2_dp_serdes_tbl_hbr, - .serdes_tbl_hbr_num =3D ARRAY_SIZE(qmp_v2_dp_serdes_tbl_hbr), - .serdes_tbl_hbr2 =3D qmp_v2_dp_serdes_tbl_hbr2, - .serdes_tbl_hbr2_num =3D ARRAY_SIZE(qmp_v2_dp_serdes_tbl_hbr2), + .serdes_tbl_rbr =3D qcs615_dp_serdes_tbl_rbr, + .serdes_tbl_rbr_num =3D ARRAY_SIZE(qcs615_dp_serdes_tbl_rbr), + .serdes_tbl_hbr =3D qcs615_dp_serdes_tbl_hbr, + .serdes_tbl_hbr_num =3D ARRAY_SIZE(qcs615_dp_serdes_tbl_hbr), + .serdes_tbl_hbr2 =3D qcs615_dp_serdes_tbl_hbr2, + .serdes_tbl_hbr2_num =3D ARRAY_SIZE(qcs615_dp_serdes_tbl_hbr2), =20 - .swing_tbl =3D &qmp_v2_dp_voltage_swing_hbr2_rbr, - .pre_emphasis_tbl =3D &qmp_v2_dp_pre_emphasis_hbr2_rbr, + .swing_tbl =3D &qcs615_dp_voltage_swing_hbr2_rbr, + .pre_emphasis_tbl =3D &qcs615_dp_pre_emphasis_hbr2_rbr, =20 - .dp_aux_init =3D qmp_v2_dp_aux_init, - .configure_dp_tx =3D qmp_v2_configure_dp_tx, - .configure_dp_phy =3D qmp_v2_configure_dp_phy, - .calibrate_dp_phy =3D qmp_v2_calibrate_dp_phy, + .dp_aux_init =3D qcs615_qmp_dp_aux_init, + .configure_dp_tx =3D qcs615_qmp_configure_dp_tx, + .configure_dp_phy =3D qcs615_qmp_configure_dp_phy, + .calibrate_dp_phy =3D qcs615_qmp_calibrate_dp_phy, =20 .reset_list =3D usb3dpphy_reset_l, .num_resets =3D ARRAY_SIZE(usb3dpphy_reset_l), @@ -744,7 +744,7 @@ static int qmp_usbc_com_exit(struct phy *phy) return 0; } =20 -static void qmp_v2_dp_aux_init(struct qmp_usbc *qmp) +static void qcs615_qmp_dp_aux_init(struct qmp_usbc *qmp) { writel(DP_PHY_PD_CTL_AUX_PWRDN | DP_PHY_PD_CTL_LANE_0_1_PWRDN | DP_PHY_PD_CTL_LANE_2_3_PWRDN | @@ -774,7 +774,7 @@ static void qmp_v2_dp_aux_init(struct qmp_usbc *qmp) qmp->dp_dp_phy + QSERDES_V2_DP_PHY_AUX_INTERRUPT_MASK); } =20 -static int qmp_v2_configure_dp_swing(struct qmp_usbc *qmp) +static int qcs615_qmp_configure_dp_swing(struct qmp_usbc *qmp) { const struct qmp_phy_cfg *cfg =3D qmp->cfg; const struct phy_configure_opts_dp *dp_opts =3D &qmp->dp_opts; @@ -864,7 +864,7 @@ static int qmp_usbc_configure_dp_clocks(struct qmp_usbc= *qmp) return 0; } =20 -static void qmp_v2_configure_dp_tx(struct qmp_usbc *qmp) +static void qcs615_qmp_configure_dp_tx(struct qmp_usbc *qmp) { const struct phy_configure_opts_dp *dp_opts =3D &qmp->dp_opts; void __iomem *tx =3D qmp->dp_tx; @@ -884,10 +884,10 @@ static void qmp_v2_configure_dp_tx(struct qmp_usbc *q= mp) writel(0xc6, tx2 + QSERDES_V3_TX_LANE_MODE_1); } =20 - qmp_v2_configure_dp_swing(qmp); + qcs615_qmp_configure_dp_swing(qmp); } =20 -static int qmp_v2_configure_dp_phy(struct qmp_usbc *qmp) +static int qcs615_qmp_configure_dp_phy(struct qmp_usbc *qmp) { u32 status; int ret; @@ -977,7 +977,7 @@ static int qmp_v2_configure_dp_phy(struct qmp_usbc *qmp) return 0; } =20 -static int qmp_v2_calibrate_dp_phy(struct qmp_usbc *qmp) +static int qcs615_qmp_calibrate_dp_phy(struct qmp_usbc *qmp) { static const u8 cfg1_settings[] =3D {0x13, 0x23, 0x1d}; u8 val; --=20 2.43.0