From: Holger Assmann <h.assmann@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Holger Assmann <h.assmann@pengutronix.de>
Subject: [DistroKit] [PATCH 2/2] platform-v7a: kernel patch to fix PHY warnings
Date: Mon, 10 Aug 2020 12:00:58 +0200 [thread overview]
Message-ID: <20200810100058.11911-2-h.assmann@pengutronix.de> (raw)
In-Reply-To: <20200810100058.11911-1-h.assmann@pengutronix.de>
With the recent move to Linux v5.8, we get a new kernel warning
because it skew timings are now specified twice; once from use of
"rgmii-id" and one from the [rt]xc-skew-ps in the device tree.
This patch removes those timings since the board works fine
with the new default settings.
Patch has also been sent[1] to the respective mailing lists for upstream
inclusion.
[1]: https://lore.kernel.org/linux-arm-kernel/20200807150355.6116-1-h.assmann@pengutronix.de/
Signed-off-by: Holger Assmann <h.assmann@pengutronix.de>
---
...a-mc1-Fix-kernel-warning-about-PHY-d.patch | 38 +++++++++++++++++++
...omers-pengutronix-distrokit-v7a-2020.patch | 21 ++++++++++
configs/platform-v7a/patches/linux-5.8/series | 11 ++++++
3 files changed, 70 insertions(+)
create mode 100644 configs/platform-v7a/patches/linux-5.8/0001-ARM-dts-stm32-lxa-mc1-Fix-kernel-warning-about-PHY-d.patch
create mode 100644 configs/platform-v7a/patches/linux-5.8/0101-Release-5.8-customers-pengutronix-distrokit-v7a-2020.patch
create mode 100644 configs/platform-v7a/patches/linux-5.8/series
diff --git a/configs/platform-v7a/patches/linux-5.8/0001-ARM-dts-stm32-lxa-mc1-Fix-kernel-warning-about-PHY-d.patch b/configs/platform-v7a/patches/linux-5.8/0001-ARM-dts-stm32-lxa-mc1-Fix-kernel-warning-about-PHY-d.patch
new file mode 100644
index 0000000..7cd4ed5
--- /dev/null
+++ b/configs/platform-v7a/patches/linux-5.8/0001-ARM-dts-stm32-lxa-mc1-Fix-kernel-warning-about-PHY-d.patch
@@ -0,0 +1,38 @@
+From: Holger Assmann <h.assmann@pengutronix.de>
+Date: Fri, 7 Aug 2020 16:13:47 +0200
+Subject: [PATCH] ARM: dts: stm32: lxa-mc1: Fix kernel warning about PHY delays
+
+The KSZ9031 PHY skew timings for rxc/txc, originally set to achieve
+the desired phase shift between clock- and data-signal, now trigger a
+kernel warning when used in rgmii-id mode:
+
+ *-skew-ps values should be used only with phy-mode = "rgmii"
+
+This is because commit bcf3440c6dd7 ("net: phy: micrel: add phy-mode
+support for the KSZ9031 PHY") now configures own timings when
+phy-mode = "rgmii-id". Device trees wanting to set their own delays
+should use phy-mode "rgmii" instead as the warning prescribes.
+
+The "standard" timings now used with "rgmii-id" work fine on this
+board, so drop the explicit timings in the device tree and thereby
+silence the warning.
+
+Fixes: 666b5ca85cd3 ("ARM: dts: stm32: add STM32MP1-based Linux Automation MC-1 board")
+Signed-off-by: Holger Assmann <h.assmann@pengutronix.de>
+---
+ arch/arm/boot/dts/stm32mp157c-lxa-mc1.dts | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/arch/arm/boot/dts/stm32mp157c-lxa-mc1.dts b/arch/arm/boot/dts/stm32mp157c-lxa-mc1.dts
+index 5700e6b700d3..b85025d00943 100644
+--- a/arch/arm/boot/dts/stm32mp157c-lxa-mc1.dts
++++ b/arch/arm/boot/dts/stm32mp157c-lxa-mc1.dts
+@@ -121,8 +121,6 @@
+ reset-gpios = <&gpiog 0 GPIO_ACTIVE_LOW>; /* ETH_RST# */
+ interrupt-parent = <&gpioa>;
+ interrupts = <6 IRQ_TYPE_EDGE_FALLING>; /* ETH_MDINT# */
+- rxc-skew-ps = <1860>;
+- txc-skew-ps = <1860>;
+ reset-assert-us = <10000>;
+ reset-deassert-us = <300>;
+ micrel,force-master;
diff --git a/configs/platform-v7a/patches/linux-5.8/0101-Release-5.8-customers-pengutronix-distrokit-v7a-2020.patch b/configs/platform-v7a/patches/linux-5.8/0101-Release-5.8-customers-pengutronix-distrokit-v7a-2020.patch
new file mode 100644
index 0000000..daf1a5c
--- /dev/null
+++ b/configs/platform-v7a/patches/linux-5.8/0101-Release-5.8-customers-pengutronix-distrokit-v7a-2020.patch
@@ -0,0 +1,21 @@
+From: Holger Assmann <h.assmann@pengutronix.de>
+Date: Mon, 10 Aug 2020 11:49:47 +0200
+Subject: [PATCH] Release 5.8/customers/pengutronix/distrokit-v7a/20200810-1
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 24a4c1b97bb0..a818f6ab7d0e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,7 +2,7 @@
+ VERSION = 5
+ PATCHLEVEL = 8
+ SUBLEVEL = 0
+-EXTRAVERSION =
++EXTRAVERSION =-20200810-1
+ NAME = Kleptomaniac Octopus
+
+ # *DOCUMENTATION*
diff --git a/configs/platform-v7a/patches/linux-5.8/series b/configs/platform-v7a/patches/linux-5.8/series
new file mode 100644
index 0000000..2b84aa8
--- /dev/null
+++ b/configs/platform-v7a/patches/linux-5.8/series
@@ -0,0 +1,11 @@
+# umpf-base: v5.8
+# umpf-name: 5.8/customers/pengutronix/distrokit-v7a
+# umpf-version: 5.8/customers/pengutronix/distrokit-v7a/20200810-1
+# umpf-topic: v5.8/topic/lxa-mc1
+# umpf-hashinfo: ad23fe24adf0adf9b835e62be2867583793b0f7f
+# umpf-topic-range: bcf876870b95592b52519ed4aafcf9d95999bc9c..38b726a88e33a215f3d486b01fd02750458343ad
+0001-ARM-dts-stm32-lxa-mc1-Fix-kernel-warning-about-PHY-d.patch
+# umpf-release: 5.8/customers/pengutronix/distrokit-v7a/20200810-1
+# umpf-topic-range: 38b726a88e33a215f3d486b01fd02750458343ad..2b6a337cbda196361cb8d98f82c3976a956889a1
+0101-Release-5.8-customers-pengutronix-distrokit-v7a-2020.patch
+# umpf-end
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
prev parent reply other threads:[~2020-08-10 10:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-10 10:00 [DistroKit] [PATCH 1/2] platform-v7a: kernel version bump 5.6.2 -> 5.8 Holger Assmann
2020-08-10 10:00 ` Holger Assmann [this message]
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=20200810100058.11911-2-h.assmann@pengutronix.de \
--to=h.assmann@pengutronix.de \
--cc=distrokit@pengutronix.de \
/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