From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kishon Vijay Abraham I <kishon@kernel•org>,
Vinod Koul <vkoul@kernel•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Nitheesh Sekar <quic_nsekar@quicinc•com>,
Varadarajan Narayanan <quic_varada@quicinc•com>,
Yang Yingliang <yangyingliang@huawei•com>
Subject: linux-next: manual merge of the phy-next tree with the phy tree
Date: Mon, 25 Sep 2023 13:10:22 +1000 [thread overview]
Message-ID: <20230925131022.24514a20@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2546 bytes --]
Hi all,
Today's linux-next merge of the phy-next tree got a conflict in:
drivers/phy/qualcomm/phy-qcom-m31.c
between commits:
5f7cd740a6b6 ("phy: qcom: phy-qcom-m31: fix wrong pointer pass to PTR_ERR()")
426e05ce126e ("phy: qcom: phy-qcom-m31: change m31_ipq5332_regs to static")
from the phy tree and commits:
90f7af497a78 ("phy: qcom: m31: Fix indentation issues")
68320e35f8cb ("phy: qcom-m31: Add compatible, phy init sequence for IPQ5018")
from the phy-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/phy/qualcomm/phy-qcom-m31.c
index 5cb7e79b99b3,d5af4dde6960..000000000000
--- a/drivers/phy/qualcomm/phy-qcom-m31.c
+++ b/drivers/phy/qualcomm/phy-qcom-m31.c
@@@ -82,7 -82,51 +82,51 @@@ struct m31_priv_data
unsigned int nregs;
};
+ static const struct m31_phy_regs m31_ipq5018_regs[] = {
+ {
+ .off = USB_PHY_CFG0,
+ .val = UTMI_PHY_OVERRIDE_EN
+ },
+ {
+ .off = USB_PHY_UTMI_CTRL5,
+ .val = POR_EN,
+ .delay = 15
+ },
+ {
+ .off = USB_PHY_FSEL_SEL,
+ .val = FREQ_SEL
+ },
+ {
+ .off = USB_PHY_HS_PHY_CTRL_COMMON0,
+ .val = COMMONONN | FSEL | RETENABLEN
+ },
+ {
+ .off = USB_PHY_REFCLK_CTRL,
+ .val = CLKCORE
+ },
+ {
+ .off = USB_PHY_UTMI_CTRL5,
+ .val = POR_EN
+ },
+ {
+ .off = USB_PHY_HS_PHY_CTRL2,
+ .val = USB2_SUSPEND_N_SEL | USB2_SUSPEND_N | USB2_UTMI_CLK_EN
+ },
+ {
+ .off = USB_PHY_UTMI_CTRL5,
+ .val = 0x0
+ },
+ {
+ .off = USB_PHY_HS_PHY_CTRL2,
+ .val = USB2_SUSPEND_N | USB2_UTMI_CLK_EN
+ },
+ {
+ .off = USB_PHY_CFG0,
+ .val = 0x0
+ },
+ };
+
-struct m31_phy_regs m31_ipq5332_regs[] = {
+static struct m31_phy_regs m31_ipq5332_regs[] = {
{
USB_PHY_CFG0,
UTMI_PHY_OVERRIDE_EN,
@@@ -255,8 -300,8 +299,8 @@@ static int m31usb_phy_probe(struct plat
qphy->vreg = devm_regulator_get(dev, "vdda-phy");
if (IS_ERR(qphy->vreg))
- return dev_err_probe(dev, PTR_ERR(qphy->phy),
+ return dev_err_probe(dev, PTR_ERR(qphy->vreg),
- "failed to get vreg\n");
+ "failed to get vreg\n");
phy_set_drvdata(qphy->phy, qphy);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-09-25 3:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-25 3:10 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-09-25 3:16 linux-next: manual merge of the phy-next tree with the phy tree Stephen Rothwell
2023-09-25 3:24 ` Stephen Rothwell
2024-01-25 1:33 Stephen Rothwell
2024-01-25 11:41 ` Vinod Koul
2024-02-19 3:44 Stephen Rothwell
2024-02-19 4:06 ` Stephen Rothwell
2024-02-19 6:13 ` Vinod Koul
2024-10-23 3:15 Stephen Rothwell
2025-05-15 7:09 Stephen Rothwell
2025-05-15 9:11 ` Prabhakar Mahadev Lad
2025-05-15 10:38 ` Vinod Koul
2025-05-15 10:38 ` Vinod Koul
2025-05-15 7:14 Stephen Rothwell
2025-05-20 8:07 ` Geert Uytterhoeven
2026-01-05 3:59 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230925131022.24514a20@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=kishon@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=quic_nsekar@quicinc$(echo .)com \
--cc=quic_varada@quicinc$(echo .)com \
--cc=vkoul@kernel$(echo .)org \
--cc=yangyingliang@huawei$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox