From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: Jakub Kicinski <jakub.kicinski@netronome.com>,
Antonio Borneo <antonio.borneo@st.com>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>,
has <has@pengutronix.de>,
Alexandre Torgue <alexandre.torgue@st.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
Jose Abreu <joabreu@synopsys.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Giuseppe Cavallaro <peppe.cavallaro@st.com>,
"David S. Miller" <davem@davemloft.net>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] net: stmmac: add flexible PPS to dwmac 4.10a
Date: Tue, 24 Nov 2020 15:15:37 +0100 [thread overview]
Message-ID: <42960ede-9355-1277-9a6f-4eac3c22365c@pengutronix.de> (raw)
In-Reply-To: <20191009152618.33b45c2d@cakuba.netronome.com>
Hello Jakub,
On 10.10.19 00:26, Jakub Kicinski wrote:
> On Mon, 7 Oct 2019 17:43:06 +0200, Antonio Borneo wrote:
>> All the registers and the functionalities used in the callback
>> dwmac5_flex_pps_config() are common between dwmac 4.10a [1] and
>> 5.00a [2].
>>
>> Reuse the same callback for dwmac 4.10a too.
>>
>> Tested on STM32MP15x, based on dwmac 4.10a.
>>
>> [1] DWC Ethernet QoS Databook 4.10a October 2014
>> [2] DWC Ethernet QoS Databook 5.00a September 2017
>>
>> Signed-off-by: Antonio Borneo <antonio.borneo@st.com>
>
> Applied to net-next.
This patch seems to have been fuzzily applied at the wrong location.
The diff describes extension of dwmac 4.10a and so does the @@ line:
@@ -864,6 +864,7 @@ const struct stmmac_ops dwmac410_ops = {
The patch was applied mainline as 757926247836 ("net: stmmac: add
flexible PPS to dwmac 4.10a"), but it extends dwmac4_ops instead:
@@ -938,6 +938,7 @@ const struct stmmac_ops dwmac4_ops = {
I don't know if dwmac4 actually supports FlexPPS, so I think it's
better to be on the safe side and revert 757926247836 and add the
change for the correct variant.
Cheers,
Ahmad
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-11-24 14:17 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20191007154306.95827-1-antonio.borneo@st.com>
2019-10-07 15:43 ` [PATCH] net: stmmac: fix length of PTP clock's name string Antonio Borneo
2019-10-09 23:10 ` Jakub Kicinski
2019-10-07 15:43 ` [PATCH] net: stmmac: fix disabling flexible PPS output Antonio Borneo
2019-10-09 23:10 ` Jakub Kicinski
2019-10-07 15:43 ` [PATCH] net: stmmac: add flexible PPS to dwmac 4.10a Antonio Borneo
2019-10-09 22:26 ` Jakub Kicinski
2020-11-24 14:15 ` Ahmad Fatoum [this message]
2020-11-24 14:23 ` Antonio Borneo
2020-11-24 18:20 ` Jakub Kicinski
2020-11-24 18:27 ` Antonio Borneo
2020-11-24 18:56 ` Jakub Kicinski
2020-11-24 14:27 ` Ahmad Fatoum
2020-11-24 22:37 ` [PATCH] net: stmmac: fix incorrect merge of patch upstream Antonio Borneo
2020-11-25 10:55 ` Ahmad Fatoum
2020-11-25 19:26 ` Jakub Kicinski
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=42960ede-9355-1277-9a6f-4eac3c22365c@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=alexandre.torgue@st.com \
--cc=antonio.borneo@st.com \
--cc=davem@davemloft.net \
--cc=has@pengutronix.de \
--cc=jakub.kicinski@netronome.com \
--cc=joabreu@synopsys.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).