This contains a fix for the new device tree for the T1040RDB rev A
board, which never worked, and an update to enable multiple CPU port
support for all revisions of the T1040RDB.
Vladimir Oltean (2):
powerpc: dts: t1040rdb: fix compatible string for Rev A boards
powerpc: dts: t1040rdb: enable both CPU ports
arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts | 1 -
arch/powerpc/boot/dts/fsl/t1040rdb.dts | 5 ++++-
arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
--
2.34.1
It looks like U-Boot fails to start the kernel properly when the
compatible string of the board isn't fsl,T1040RDB, so stop overriding it
from the rev-a.dts.
Fixes: 5ebb74749202 ("powerpc: dts: t1040rdb: fix ports names for Seville Ethernet switch")
Signed-off-by: Vladimir Oltean <[email protected]>
---
arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts b/arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts
index 73f8c998c64d..d4f5f159d6f2 100644
--- a/arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts
+++ b/arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts
@@ -10,7 +10,6 @@
/ {
model = "fsl,T1040RDB-REV-A";
- compatible = "fsl,T1040RDB-REV-A";
};
&seville_port0 {
--
2.34.1
Since commit eca70102cfb1 ("net: dsa: felix: add support for changing
DSA master") included in kernel v6.1, the driver supports 2 CPU ports,
and they can be put in a LAG, for example (see
Documentation/networking/dsa/configuration.rst for more details).
Defining the second CPU port in the device tree should not cause any
compatibility issue, because the default CPU port was &seville_port8
before this change, and still is &seville_port8 now (the numerically
first CPU port is used by default).
Signed-off-by: Vladimir Oltean <[email protected]>
---
arch/powerpc/boot/dts/fsl/t1040rdb.dts | 5 ++++-
arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/boot/dts/fsl/t1040rdb.dts b/arch/powerpc/boot/dts/fsl/t1040rdb.dts
index b6733e7e6580..dd3aab81e9de 100644
--- a/arch/powerpc/boot/dts/fsl/t1040rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/t1040rdb.dts
@@ -180,6 +180,9 @@ &seville_port7 {
};
&seville_port8 {
- ethernet = <&enet0>;
+ status = "okay";
+};
+
+&seville_port9 {
status = "okay";
};
diff --git a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
index f58eb820eb5e..ad0ab33336b8 100644
--- a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
@@ -686,6 +686,7 @@ seville_port7: port@7 {
seville_port8: port@8 {
reg = <8>;
phy-mode = "internal";
+ ethernet = <&enet0>;
status = "disabled";
fixed-link {
@@ -697,6 +698,7 @@ fixed-link {
seville_port9: port@9 {
reg = <9>;
phy-mode = "internal";
+ ethernet = <&enet1>;
status = "disabled";
fixed-link {
--
2.34.1
Hello:
This series was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
On Fri, 24 Feb 2023 17:59:38 +0200 you wrote:
> This contains a fix for the new device tree for the T1040RDB rev A
> board, which never worked, and an update to enable multiple CPU port
> support for all revisions of the T1040RDB.
>
> Vladimir Oltean (2):
> powerpc: dts: t1040rdb: fix compatible string for Rev A boards
> powerpc: dts: t1040rdb: enable both CPU ports
>
> [...]
Here is the summary with links:
- [1/2] powerpc: dts: t1040rdb: fix compatible string for Rev A boards
https://git.kernel.org/netdev/net/c/ae44f1c9d1fc
- [2/2] powerpc: dts: t1040rdb: enable both CPU ports
https://git.kernel.org/netdev/net/c/8b322f9fdb35
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html