mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-03 16:07:51 +00:00
Merge pull request #4689 from jernejsk/linux5.9.11
linux: Update to 5.9.11
This commit is contained in:
CvH
GitHub
commit
09751e2946
@ -22,8 +22,8 @@ case "$LINUX" in
|
||||
PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
|
||||
;;
|
||||
*)
|
||||
PKG_VERSION="5.9.6"
|
||||
PKG_SHA256="6cc182fe19a8f3958c24d453f4ab68eb73fb5cfb8af4c95b02f3db049e655370"
|
||||
PKG_VERSION="5.9.11"
|
||||
PKG_SHA256="5eb20a65a410669928f94b3975872e493fa6d0fe441c6a78b7564affa2a5d260"
|
||||
PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_PATCH_DIRS="default"
|
||||
;;
|
||||
|
||||
@ -1,422 +0,0 @@
|
||||
From 18125f3cbf9eb37e2639e2cdf2f025c0297b7b3a Mon Sep 17 00:00:00 2001
|
||||
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
||||
Date: Thu, 22 Oct 2020 20:53:26 +0200
|
||||
Subject: [PATCH 1/4] arm64: dts: allwinner: a64: OrangePi Win: Fix ethernet
|
||||
node
|
||||
|
||||
RX/TX delay on OrangePi Win board is set on PHY. Reflect that in
|
||||
ethernet node.
|
||||
|
||||
Fixes: 93d6a27cfcc0 ("arm64: dts: allwinner: a64: Orange Pi Win: Add Ethernet node")
|
||||
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
|
||||
index d894ec5fa8a1..70e31743f0ba 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
|
||||
@@ -120,7 +120,7 @@ &ehci1 {
|
||||
&emac {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&rgmii_pins>;
|
||||
- phy-mode = "rgmii";
|
||||
+ phy-mode = "rgmii-id";
|
||||
phy-handle = <&ext_rgmii_phy>;
|
||||
phy-supply = <®_gmac_3v3>;
|
||||
status = "okay";
|
||||
--
|
||||
2.29.0
|
||||
|
||||
|
||||
From e72a8b0e1c6520215ae0374f83d8961d4188e472 Mon Sep 17 00:00:00 2001
|
||||
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
||||
Date: Thu, 22 Oct 2020 22:55:55 +0200
|
||||
Subject: [PATCH 2/4] arm64: dts: allwinner: a64: Pine64 Plus: Fix ethernet
|
||||
node
|
||||
|
||||
According to board schematic, PHY provides both, RX and TX delays.
|
||||
However, according to "fix" Realtek provided for this board, only TX
|
||||
delay should be provided by PHY.
|
||||
Tests show that both variants work but TX only PHY delay works
|
||||
slightly better.
|
||||
|
||||
Update ethernet node to reflect the fact that PHY provides TX delay.
|
||||
|
||||
Fixes: 94f442886711 ("arm64: dts: allwinner: A64: Restore EMAC changes")
|
||||
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts
|
||||
index b26181cf9095..b54099b654c8 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts
|
||||
@@ -13,7 +13,7 @@ / {
|
||||
&emac {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&rgmii_pins>;
|
||||
- phy-mode = "rgmii";
|
||||
+ phy-mode = "rgmii-txid";
|
||||
phy-handle = <&ext_rgmii_phy>;
|
||||
status = "okay";
|
||||
};
|
||||
--
|
||||
2.29.0
|
||||
|
||||
|
||||
From 15df417b521f4a799668b4d49a9072d62ca40b53 Mon Sep 17 00:00:00 2001
|
||||
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
||||
Date: Fri, 23 Oct 2020 20:46:58 +0200
|
||||
Subject: [PATCH 3/4] arm64: dts: allwinner: h5: OrangePi PC2: Fix ethernet
|
||||
node
|
||||
|
||||
RX and TX delay are provided by ethernet PHY. Reflect that in ethernet
|
||||
node.
|
||||
|
||||
Fixes: 44a94c7ef989 ("arm64: dts: allwinner: H5: Restore EMAC changes")
|
||||
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
|
||||
index 7d7aad18f078..8bf2db9dcbda 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
|
||||
@@ -123,7 +123,7 @@ &emac {
|
||||
pinctrl-0 = <&emac_rgmii_pins>;
|
||||
phy-supply = <®_gmac_3v3>;
|
||||
phy-handle = <&ext_rgmii_phy>;
|
||||
- phy-mode = "rgmii";
|
||||
+ phy-mode = "rgmii-id";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
--
|
||||
2.29.0
|
||||
|
||||
|
||||
From 39b809dabfa0b585cc1b18c1365e8b156ea9c3e4 Mon Sep 17 00:00:00 2001
|
||||
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
||||
Date: Fri, 23 Oct 2020 21:43:42 +0200
|
||||
Subject: [PATCH 4/4] arm64: dts: allwinner: h6: Pine H64: Fix ethernet node
|
||||
|
||||
Ethernet PHY provides RX and TX delay on both models, A and B. Although
|
||||
schematic for model A suggests only TX delay, network never worked with
|
||||
such configuration.
|
||||
|
||||
Fix ethernet node to reflect PHY delays.
|
||||
|
||||
Fixes: 729e1ffcf47e ("arm64: allwinner: h6: add support for the Ethernet on Pine H64")
|
||||
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
|
||||
index af85b2074867..961732c52aa0 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
|
||||
@@ -100,7 +100,7 @@ &ehci3 {
|
||||
&emac {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&ext_rgmii_pins>;
|
||||
- phy-mode = "rgmii";
|
||||
+ phy-mode = "rgmii-id";
|
||||
phy-handle = <&ext_rgmii_phy>;
|
||||
phy-supply = <®_gmac_3v3>;
|
||||
allwinner,rx-delay-ps = <200>;
|
||||
--
|
||||
2.29.0
|
||||
|
||||
From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= <peron.clem@gmail.com>
|
||||
Subject: [PATCH] arm64: dts: allwinner: beelink-gs1: Enable both RGMII RX/TX
|
||||
delay
|
||||
Date: Sun, 18 Oct 2020 19:24:09 +0200
|
||||
|
||||
Before the commit:
|
||||
net: phy: realtek: fix rtl8211e rx/tx delay config
|
||||
|
||||
The software overwrite for RX/TX delays of the RTL8211e were not
|
||||
working properly and the Beelink GS1 had both RX/TX delay of RGMII
|
||||
interface set using pull-up on the TXDLY and RXDLY pins.
|
||||
|
||||
Now that these delays are working properly they overwrite the HW
|
||||
config and set this to 'rgmii' meaning no delay on both RX/TX.
|
||||
This makes the ethernet of this board not working anymore.
|
||||
|
||||
Set the phy-mode to 'rgmii-id' meaning RGMII with RX/TX delays
|
||||
in the device-tree to keep the correct configuration.
|
||||
|
||||
Fixes: 089bee8dd119 ("arm64: dts: allwinner: h6: Introduce Beelink GS1 board")
|
||||
Signed-off-by: Clément Péron <peron.clem@gmail.com>
|
||||
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
|
||||
index a364cb4e5b3f..6ab53860e447 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
|
||||
@@ -99,7 +99,7 @@ &ehci0 {
|
||||
&emac {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&ext_rgmii_pins>;
|
||||
- phy-mode = "rgmii";
|
||||
+ phy-mode = "rgmii-id";
|
||||
phy-handle = <&ext_rgmii_phy>;
|
||||
phy-supply = <®_aldo2>;
|
||||
status = "okay";
|
||||
|
||||
From: Chen-Yu Tsai <wens@kernel.org>
|
||||
Subject: [PATCH 01/10] Revert "arm: sun8i: orangepi-pc-plus: Set EMAC activity
|
||||
LEDs to active high"
|
||||
Date: Sun, 25 Oct 2020 00:25:06 +0800
|
||||
|
||||
From: Chen-Yu Tsai <wens@csie.org>
|
||||
|
||||
This reverts commit 75ee680cbd2e4d0156b94f9fec50076361ab12f2.
|
||||
|
||||
Turns out the activity and link LEDs on the RJ45 port are active low,
|
||||
just like on the Orange Pi PC.
|
||||
|
||||
Revert the commit that says otherwise.
|
||||
|
||||
Fixes: 75ee680cbd2e ("arm: sun8i: orangepi-pc-plus: Set EMAC activity LEDs to active high")
|
||||
Fixes: 4904337fe34f ("ARM: dts: sunxi: Restore EMAC changes (boards)")
|
||||
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
|
||||
---
|
||||
If you have this board, please help test it.
|
||||
|
||||
For me, the correct lighting of the LEDs is both LEDs should be lit
|
||||
when connected at 100 Mbps.
|
||||
---
|
||||
arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts
|
||||
index 71fb73208939..babf4cf1b2f6 100644
|
||||
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts
|
||||
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts
|
||||
@@ -53,11 +53,6 @@ aliases {
|
||||
};
|
||||
};
|
||||
|
||||
-&emac {
|
||||
- /* LEDs changed to active high on the plus */
|
||||
- /delete-property/ allwinner,leds-active-low;
|
||||
-};
|
||||
-
|
||||
&mmc1 {
|
||||
vmmc-supply = <®_vcc3v3>;
|
||||
bus-width = <4>;
|
||||
|
||||
From: Chen-Yu Tsai <wens@kernel.org>
|
||||
Subject: [PATCH 05/10] ARM: dts: sun8i: h3: orangepi-plus2e: Enable RGMII
|
||||
RX/TX delay on Ethernet PHY
|
||||
Date: Sun, 25 Oct 2020 00:25:10 +0800
|
||||
|
||||
From: Chen-Yu Tsai <wens@csie.org>
|
||||
|
||||
The Ethernet PHY on the Orange Pi Plus 2E has the RX and TX delays
|
||||
enabled on the PHY, using pull-ups on the RXDLY and TXDLY pins.
|
||||
|
||||
Fix the phy-mode description to correct reflect this so that the
|
||||
implementation doesn't reconfigure the delays incorrectly. This
|
||||
happened with commit bbc4d71d6354 ("net: phy: realtek: fix rtl8211e
|
||||
rx/tx delay config").
|
||||
|
||||
Fixes: 4904337fe34f ("ARM: dts: sunxi: Restore EMAC changes (boards)")
|
||||
Fixes: 7a78ef92cdc5 ("ARM: sun8i: h3: Enable EMAC with external PHY on Orange Pi Plus 2E")
|
||||
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
|
||||
---
|
||||
arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts
|
||||
index 6dbf7b2e0c13..b6ca45d18e51 100644
|
||||
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts
|
||||
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts
|
||||
@@ -67,7 +67,7 @@ &emac {
|
||||
pinctrl-0 = <&emac_rgmii_pins>;
|
||||
phy-supply = <®_gmac_3v3>;
|
||||
phy-handle = <&ext_rgmii_phy>;
|
||||
- phy-mode = "rgmii";
|
||||
+ phy-mode = "rgmii-id";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
||||
From: Chen-Yu Tsai <wens@kernel.org>
|
||||
Subject: [PATCH 08/10] ARM: dts: sunxi: bananapi-m2-plus: Enable RGMII RX/TX
|
||||
delay on Ethernet PHY
|
||||
Date: Sun, 25 Oct 2020 00:25:13 +0800
|
||||
|
||||
From: Chen-Yu Tsai <wens@csie.org>
|
||||
|
||||
The Ethernet PHY on the Bananapi M2+ has the RX and TX delays
|
||||
enabled on the PHY, using pull-ups on the RXDLY and TXDLY pins.
|
||||
|
||||
Fix the phy-mode description to correct reflect this so that the
|
||||
implementation doesn't reconfigure the delays incorrectly. This
|
||||
happened with commit bbc4d71d6354 ("net: phy: realtek: fix rtl8211e
|
||||
rx/tx delay config").
|
||||
|
||||
Fixes: 8c7ba536e709 ("ARM: sun8i: bananapi-m2-plus: Enable dwmac-sun8i")
|
||||
Fixes: 4904337fe34f ("ARM: dts: sunxi: Restore EMAC changes (boards)")
|
||||
Fixes: aa8fee415f46 ("ARM: dts: sun8i: h3: Split out non-SoC-specific parts of Bananapi M2 Plus")
|
||||
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
|
||||
---
|
||||
arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi b/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi
|
||||
index 39263e74fbb5..8e5cb3b3fd68 100644
|
||||
--- a/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi
|
||||
+++ b/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi
|
||||
@@ -126,7 +126,7 @@ &emac {
|
||||
pinctrl-0 = <&emac_rgmii_pins>;
|
||||
phy-supply = <®_gmac_3v3>;
|
||||
phy-handle = <&ext_rgmii_phy>;
|
||||
- phy-mode = "rgmii";
|
||||
+ phy-mode = "rgmii-id";
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
From: Chen-Yu Tsai <wens@kernel.org>
|
||||
Subject: [PATCH 09/10] arm64: dts: allwinner: h5: libretech-all-h5-cc: Enable
|
||||
RGMII RX/TX delay on PHY
|
||||
Date: Sun, 25 Oct 2020 00:25:14 +0800
|
||||
|
||||
From: Chen-Yu Tsai <wens@csie.org>
|
||||
|
||||
The Ethernet PHY on the Libre Computer ALL-H5-CC has the RX and TX
|
||||
delays enabled on the PHY, using pull-ups on the RXDLY and TXDLY pins.
|
||||
|
||||
Fix the phy-mode description to correct reflect this so that the
|
||||
implementation doesn't reconfigure the delays incorrectly. This
|
||||
happened with commit bbc4d71d6354 ("net: phy: realtek: fix rtl8211e
|
||||
rx/tx delay config").
|
||||
|
||||
Fixes: 60d0426d7603 ("arm64: dts: allwinner: h5: Add Libre Computer ALL-H5-CC H5 board")
|
||||
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts
|
||||
index df1b9263ad0e..6e30a564c87f 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts
|
||||
@@ -36,7 +36,7 @@ &emac {
|
||||
pinctrl-0 = <&emac_rgmii_pins>;
|
||||
phy-supply = <®_gmac_3v3>;
|
||||
phy-handle = <&ext_rgmii_phy>;
|
||||
- phy-mode = "rgmii";
|
||||
+ phy-mode = "rgmii-id";
|
||||
/delete-property/ allwinner,leds-active-low;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
From: Chen-Yu Tsai <wens@kernel.org>
|
||||
Subject: [PATCH 10/10] arm64: dts: allwinner: a64: bananapi-m64: Enable RGMII
|
||||
RX/TX delay on PHY
|
||||
Date: Sun, 25 Oct 2020 00:25:15 +0800
|
||||
|
||||
From: Chen-Yu Tsai <wens@csie.org>
|
||||
|
||||
The Ethernet PHY on the Bananapi M64 has the RX and TX delays
|
||||
enabled on the PHY, using pull-ups on the RXDLY and TXDLY pins.
|
||||
|
||||
Fix the phy-mode description to correct reflect this so that the
|
||||
implementation doesn't reconfigure the delays incorrectly. This
|
||||
happened with commit bbc4d71d6354 ("net: phy: realtek: fix rtl8211e
|
||||
rx/tx delay config").
|
||||
|
||||
Fixes: e7295499903d ("arm64: allwinner: bananapi-m64: Enable dwmac-sun8i")
|
||||
Fixes: 94f442886711 ("arm64: dts: allwinner: A64: Restore EMAC changes")
|
||||
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
|
||||
Tested-by: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
|
||||
index 3ea5182ca489..e5e840b9fbb4 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
|
||||
@@ -105,7 +105,7 @@ &ehci1 {
|
||||
&emac {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&rgmii_pins>;
|
||||
- phy-mode = "rgmii";
|
||||
+ phy-mode = "rgmii-id";
|
||||
phy-handle = <&ext_rgmii_phy>;
|
||||
phy-supply = <®_dc1sw>;
|
||||
status = "okay";
|
||||
|
||||
From 992ea5bf6a3583bdb592b2b840a7a5e4205eea19 Mon Sep 17 00:00:00 2001
|
||||
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
||||
Date: Sun, 25 Oct 2020 09:16:38 +0100
|
||||
Subject: [PATCH] ARM: dts: sun8i: r40: bananapi-m2-ultra: Fix ethernet node
|
||||
|
||||
Ethernet PHY on BananaPi M2 Ultra provides RX and TX delays. Fix
|
||||
ethernet node to reflect that fact.
|
||||
|
||||
Fixes: c36fd5a48bd2 ("ARM: dts: sun8i: r40: bananapi-m2-ultra: Enable GMAC ethernet controller")
|
||||
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
|
||||
---
|
||||
arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts b/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
|
||||
index 2fc62ef0cb3e..a6a1087a0c9b 100644
|
||||
--- a/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
|
||||
+++ b/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
|
||||
@@ -129,7 +129,7 @@ &gmac {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&gmac_rgmii_pins>;
|
||||
phy-handle = <&phy1>;
|
||||
- phy-mode = "rgmii";
|
||||
+ phy-mode = "rgmii-id";
|
||||
phy-supply = <®_dc1sw>;
|
||||
status = "okay";
|
||||
};
|
||||
--
|
||||
2.29.1
|
||||
|
||||
From caf602aab3da32c066599f9f30c753d6535441cd Mon Sep 17 00:00:00 2001
|
||||
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
||||
Date: Sun, 1 Nov 2020 08:23:48 +0100
|
||||
Subject: [PATCH] arm64: dts: allwinner: h6: orangepi-one-plus: Fix ethernet
|
||||
|
||||
RX/TX delay on OrangePi One Plus board is set on PHY. Reflect that in
|
||||
ethernet node.
|
||||
|
||||
Fixes: 7ee32a17e0d6 ("arm64: dts: allwinner: h6: orangepi-one-plus: Enable ethernet")
|
||||
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
|
||||
index fceb298bfd53..29a081e72a9b 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
|
||||
@@ -27,7 +27,7 @@ reg_gmac_3v3: gmac-3v3 {
|
||||
&emac {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&ext_rgmii_pins>;
|
||||
- phy-mode = "rgmii";
|
||||
+ phy-mode = "rgmii-id";
|
||||
phy-handle = <&ext_rgmii_phy>;
|
||||
phy-supply = <®_gmac_3v3>;
|
||||
allwinner,rx-delay-ps = <200>;
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
|
||||
index a4ffd71696da..9ad091f5f1ab 100644
|
||||
--- a/drivers/regulator/core.c
|
||||
+++ b/drivers/regulator/core.c
|
||||
@@ -1169,6 +1169,9 @@ static int machine_constraints_voltage(struct regulator_dev *rdev,
|
||||
}
|
||||
|
||||
if (current_uV < 0) {
|
||||
+ if (current_uV == -EINVAL && rdev->supply_name)
|
||||
+ return -EPROBE_DEFER;
|
||||
+
|
||||
rdev_err(rdev,
|
||||
"failed to get the current voltage: %pe\n",
|
||||
ERR_PTR(current_uV));
|
||||
|
||||
|
||||
@ -782,223 +782,6 @@ index 3392df1020be..210269944687 100644
|
||||
ktime_t busy_time;
|
||||
ktime_t idle_time;
|
||||
|
||||
From 3d97427897f27de62bf02518918cc79ac6f7239c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <peron.clem@gmail.com>
|
||||
Date: Fri, 10 Jul 2020 11:54:02 +0200
|
||||
Subject: [PATCH] drm/panfrost: rename error labels in device_init
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Rename goto labels in device_init it will be easier to maintain.
|
||||
|
||||
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
|
||||
Reviewed-by: Steven Price <steven.price@arm.com>
|
||||
Signed-off-by: Clément Péron <peron.clem@gmail.com>
|
||||
Signed-off-by: Rob Herring <robh@kernel.org>
|
||||
Link: https://patchwork.freedesktop.org/patch/msgid/20200710095409.407087-8-peron.clem@gmail.com
|
||||
(cherry picked from commit d3c335da0200be9287cdf5755d19f62ce1670a8d)
|
||||
---
|
||||
drivers/gpu/drm/panfrost/panfrost_device.c | 30 +++++++++++++++---------------
|
||||
1 file changed, 15 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c
|
||||
index b172087eee6a..9f89984f652a 100644
|
||||
--- a/drivers/gpu/drm/panfrost/panfrost_device.c
|
||||
+++ b/drivers/gpu/drm/panfrost/panfrost_device.c
|
||||
@@ -216,56 +216,56 @@ int panfrost_device_init(struct panfrost_device *pfdev)
|
||||
|
||||
err = panfrost_regulator_init(pfdev);
|
||||
if (err)
|
||||
- goto err_out0;
|
||||
+ goto out_clk;
|
||||
|
||||
err = panfrost_reset_init(pfdev);
|
||||
if (err) {
|
||||
dev_err(pfdev->dev, "reset init failed %d\n", err);
|
||||
- goto err_out1;
|
||||
+ goto out_regulator;
|
||||
}
|
||||
|
||||
err = panfrost_pm_domain_init(pfdev);
|
||||
if (err)
|
||||
- goto err_out2;
|
||||
+ goto out_reset;
|
||||
|
||||
res = platform_get_resource(pfdev->pdev, IORESOURCE_MEM, 0);
|
||||
pfdev->iomem = devm_ioremap_resource(pfdev->dev, res);
|
||||
if (IS_ERR(pfdev->iomem)) {
|
||||
dev_err(pfdev->dev, "failed to ioremap iomem\n");
|
||||
err = PTR_ERR(pfdev->iomem);
|
||||
- goto err_out3;
|
||||
+ goto out_pm_domain;
|
||||
}
|
||||
|
||||
err = panfrost_gpu_init(pfdev);
|
||||
if (err)
|
||||
- goto err_out3;
|
||||
+ goto out_pm_domain;
|
||||
|
||||
err = panfrost_mmu_init(pfdev);
|
||||
if (err)
|
||||
- goto err_out4;
|
||||
+ goto out_gpu;
|
||||
|
||||
err = panfrost_job_init(pfdev);
|
||||
if (err)
|
||||
- goto err_out5;
|
||||
+ goto out_mmu;
|
||||
|
||||
err = panfrost_perfcnt_init(pfdev);
|
||||
if (err)
|
||||
- goto err_out6;
|
||||
+ goto out_job;
|
||||
|
||||
return 0;
|
||||
-err_out6:
|
||||
+out_job:
|
||||
panfrost_job_fini(pfdev);
|
||||
-err_out5:
|
||||
+out_mmu:
|
||||
panfrost_mmu_fini(pfdev);
|
||||
-err_out4:
|
||||
+out_gpu:
|
||||
panfrost_gpu_fini(pfdev);
|
||||
-err_out3:
|
||||
+out_pm_domain:
|
||||
panfrost_pm_domain_fini(pfdev);
|
||||
-err_out2:
|
||||
+out_reset:
|
||||
panfrost_reset_fini(pfdev);
|
||||
-err_out1:
|
||||
+out_regulator:
|
||||
panfrost_regulator_fini(pfdev);
|
||||
-err_out0:
|
||||
+out_clk:
|
||||
panfrost_clk_fini(pfdev);
|
||||
return err;
|
||||
}
|
||||
|
||||
From 73bf666c4c5f23c8b0165c4ec8580b335771f3e8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <peron.clem@gmail.com>
|
||||
Date: Fri, 10 Jul 2020 11:54:03 +0200
|
||||
Subject: [PATCH] drm/panfrost: move devfreq_init()/fini() in device
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Later we will introduce devfreq probing regulator if they
|
||||
are present. As regulator should be probe only one time we
|
||||
need to get this logic in the device_init().
|
||||
|
||||
panfrost_device is already taking care of devfreq_resume()
|
||||
and devfreq_suspend(), so it's not totally illogic to move
|
||||
the devfreq_init() and devfreq_fini() here.
|
||||
|
||||
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
|
||||
Reviewed-by: Steven Price <steven.price@arm.com>
|
||||
Signed-off-by: Clément Péron <peron.clem@gmail.com>
|
||||
Signed-off-by: Rob Herring <robh@kernel.org>
|
||||
Link: https://patchwork.freedesktop.org/patch/msgid/20200710095409.407087-9-peron.clem@gmail.com
|
||||
(cherry picked from commit 25e247bbf85af3ad721dfeb2e2caf405f43b7e66)
|
||||
---
|
||||
drivers/gpu/drm/panfrost/panfrost_device.c | 12 +++++++++++-
|
||||
drivers/gpu/drm/panfrost/panfrost_drv.c | 15 ++-------------
|
||||
2 files changed, 13 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c
|
||||
index 9f89984f652a..36b5c8fea3eb 100644
|
||||
--- a/drivers/gpu/drm/panfrost/panfrost_device.c
|
||||
+++ b/drivers/gpu/drm/panfrost/panfrost_device.c
|
||||
@@ -214,9 +214,16 @@ int panfrost_device_init(struct panfrost_device *pfdev)
|
||||
return err;
|
||||
}
|
||||
|
||||
+ err = panfrost_devfreq_init(pfdev);
|
||||
+ if (err) {
|
||||
+ if (err != -EPROBE_DEFER)
|
||||
+ dev_err(pfdev->dev, "devfreq init failed %d\n", err);
|
||||
+ goto out_clk;
|
||||
+ }
|
||||
+
|
||||
err = panfrost_regulator_init(pfdev);
|
||||
if (err)
|
||||
- goto out_clk;
|
||||
+ goto out_devfreq;
|
||||
|
||||
err = panfrost_reset_init(pfdev);
|
||||
if (err) {
|
||||
@@ -265,6 +272,8 @@ int panfrost_device_init(struct panfrost_device *pfdev)
|
||||
panfrost_reset_fini(pfdev);
|
||||
out_regulator:
|
||||
panfrost_regulator_fini(pfdev);
|
||||
+out_devfreq:
|
||||
+ panfrost_devfreq_fini(pfdev);
|
||||
out_clk:
|
||||
panfrost_clk_fini(pfdev);
|
||||
return err;
|
||||
@@ -278,6 +287,7 @@ void panfrost_device_fini(struct panfrost_device *pfdev)
|
||||
panfrost_gpu_fini(pfdev);
|
||||
panfrost_pm_domain_fini(pfdev);
|
||||
panfrost_reset_fini(pfdev);
|
||||
+ panfrost_devfreq_fini(pfdev);
|
||||
panfrost_regulator_fini(pfdev);
|
||||
panfrost_clk_fini(pfdev);
|
||||
}
|
||||
diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
|
||||
index f79f98534ab6..36463c89e966 100644
|
||||
--- a/drivers/gpu/drm/panfrost/panfrost_drv.c
|
||||
+++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
|
||||
@@ -14,7 +14,6 @@
|
||||
#include <drm/drm_utils.h>
|
||||
|
||||
#include "panfrost_device.h"
|
||||
-#include "panfrost_devfreq.h"
|
||||
#include "panfrost_gem.h"
|
||||
#include "panfrost_mmu.h"
|
||||
#include "panfrost_job.h"
|
||||
@@ -606,13 +605,6 @@ static int panfrost_probe(struct platform_device *pdev)
|
||||
goto err_out0;
|
||||
}
|
||||
|
||||
- err = panfrost_devfreq_init(pfdev);
|
||||
- if (err) {
|
||||
- if (err != -EPROBE_DEFER)
|
||||
- dev_err(&pdev->dev, "Fatal error during devfreq init\n");
|
||||
- goto err_out1;
|
||||
- }
|
||||
-
|
||||
pm_runtime_set_active(pfdev->dev);
|
||||
pm_runtime_mark_last_busy(pfdev->dev);
|
||||
pm_runtime_enable(pfdev->dev);
|
||||
@@ -625,16 +617,14 @@ static int panfrost_probe(struct platform_device *pdev)
|
||||
*/
|
||||
err = drm_dev_register(ddev, 0);
|
||||
if (err < 0)
|
||||
- goto err_out2;
|
||||
+ goto err_out1;
|
||||
|
||||
panfrost_gem_shrinker_init(ddev);
|
||||
|
||||
return 0;
|
||||
|
||||
-err_out2:
|
||||
- pm_runtime_disable(pfdev->dev);
|
||||
- panfrost_devfreq_fini(pfdev);
|
||||
err_out1:
|
||||
+ pm_runtime_disable(pfdev->dev);
|
||||
panfrost_device_fini(pfdev);
|
||||
err_out0:
|
||||
drm_dev_put(ddev);
|
||||
@@ -650,7 +640,6 @@ static int panfrost_remove(struct platform_device *pdev)
|
||||
panfrost_gem_shrinker_cleanup(ddev);
|
||||
|
||||
pm_runtime_get_sync(pfdev->dev);
|
||||
- panfrost_devfreq_fini(pfdev);
|
||||
panfrost_device_fini(pfdev);
|
||||
pm_runtime_put_sync_suspend(pfdev->dev);
|
||||
pm_runtime_disable(pfdev->dev);
|
||||
|
||||
From 6d5816fcaa6621b0f7bb9c07bdc4a74696b0d4f6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <peron.clem@gmail.com>
|
||||
Date: Fri, 10 Jul 2020 11:54:04 +0200
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user