From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kishon Vijay Abraham I <kishon@kernel•org>,
Vinod Koul <vkoul@kernel•org>
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the phy-next tree with the phy tree
Date: Mon, 19 Feb 2024 15:06:29 +1100 [thread overview]
Message-ID: <20240219150629.7d45ae60@canb.auug.org.au> (raw)
In-Reply-To: <20240219144423.16a76202@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2336 bytes --]
Hi all,
On Mon, 19 Feb 2024 14:44:23 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the phy-next tree got a conflict in:
>
> drivers/phy/qualcomm/phy-qcom-qmp-usb.c
>
> between commit:
>
> d4c08d8b23b2 ("phy: qcom-qmp-usb: fix v3 offsets data")
>
> from the phy tree and commit:
>
> 52cfdc9c6c33 ("phy: qcom: qmp-usb: drop dual-lane handling")
>
> 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.
Actually the below ...
--
Cheers,
Stephen Rothwell
diff --cc drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index 5c003988c35d,6b6994cb77d7..85253936fac3
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@@ -1621,27 -1328,7 +1336,23 @@@ static const struct qmp_usb_offsets qmp
.rx = 0x1000,
};
+static const struct qmp_phy_cfg ipq6018_usb3phy_cfg = {
- .lanes = 1,
-
+ .offsets = &qmp_usb_offsets_v3,
+
+ .serdes_tbl = ipq9574_usb3_serdes_tbl,
+ .serdes_tbl_num = ARRAY_SIZE(ipq9574_usb3_serdes_tbl),
+ .tx_tbl = msm8996_usb3_tx_tbl,
+ .tx_tbl_num = ARRAY_SIZE(msm8996_usb3_tx_tbl),
+ .rx_tbl = ipq8074_usb3_rx_tbl,
+ .rx_tbl_num = ARRAY_SIZE(ipq8074_usb3_rx_tbl),
+ .pcs_tbl = ipq8074_usb3_pcs_tbl,
+ .pcs_tbl_num = ARRAY_SIZE(ipq8074_usb3_pcs_tbl),
+ .vreg_list = qmp_phy_vreg_l,
+ .num_vregs = ARRAY_SIZE(qmp_phy_vreg_l),
+ .regs = qmp_v3_usb3phy_regs_layout,
+};
+
static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = {
- .lanes = 1,
-
.offsets = &qmp_usb_offsets_v3,
.serdes_tbl = ipq8074_usb3_serdes_tbl,
@@@ -1676,9 -1361,7 +1385,7 @@@ static const struct qmp_phy_cfg ipq9574
};
static const struct qmp_phy_cfg msm8996_usb3phy_cfg = {
- .lanes = 1,
-
- .offsets = &qmp_usb_offsets_v3,
+ .offsets = &qmp_usb_offsets_v3_msm8996,
.serdes_tbl = msm8996_usb3_serdes_tbl,
.serdes_tbl_num = ARRAY_SIZE(msm8996_usb3_serdes_tbl),
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-02-19 4:06 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-19 3:44 linux-next: manual merge of the phy-next tree with the phy tree Stephen Rothwell
2024-02-19 4:06 ` Stephen Rothwell [this message]
2024-02-19 6:13 ` Vinod Koul
-- strict thread matches above, loose matches on Subject: below --
2026-01-05 3:59 Stephen Rothwell
2025-05-15 7:14 Stephen Rothwell
2025-05-20 8:07 ` Geert Uytterhoeven
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
2024-10-23 3:15 Stephen Rothwell
2024-01-25 1:33 Stephen Rothwell
2024-01-25 11:41 ` Vinod Koul
2023-09-25 3:16 Stephen Rothwell
2023-09-25 3:24 ` Stephen Rothwell
2023-09-25 3:10 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=20240219150629.7d45ae60@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dmitry.baryshkov@linaro$(echo .)org \
--cc=kishon@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=vkoul@kernel$(echo .)org \
/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