linux-kernel - linux-next: manual merge of the net-next tree with the spacemit tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <aMqby4Cz8hn6lZgv@sirena.org.uk>
Date: Wed, 17 Sep 2025 12:30:19 +0100
From: Mark Brown <broonie@...nel.org>
To: David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
	Paolo Abeni <pabeni@...hat.com>,
	Networking <netdev@...r.kernel.org>
Cc: Guodong Xu <guodong@...cstar.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Vivian Wang <wangruikang@...as.ac.cn>, Yixun Lan <dlan@...too.org>
Subject: linux-next: manual merge of the net-next tree with the spacemit tree

Hi all,

Today's linux-next merge of the net-next tree got conflicts in:

  arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts
  arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts

between commit:

  0e28eab0ca512 ("riscv: dts: spacemit: Enable PDMA on Banana Pi F3 and Milkv Jupiter")

from the spacemit tree and commits:

  3c247a6366d58 ("riscv: dts: spacemit: Add Ethernet support for BPI-F3")
  e32dc7a936b11 ("riscv: dts: spacemit: Add Ethernet support for Jupiter")

from the net-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.

diff --cc arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts
index 6013be2585428,33e223cefd4bd..0000000000000
--- a/arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts
+++ b/arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts
@@@ -40,10 -42,52 +42,56 @@@
  	status = "okay";
  };
  
+ &eth0 {
+ 	phy-handle = <&rgmii0>;
+ 	phy-mode = "rgmii-id";
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&gmac0_cfg>;
+ 	rx-internal-delay-ps = <0>;
+ 	tx-internal-delay-ps = <0>;
+ 	status = "okay";
+ 
+ 	mdio-bus {
+ 		#address-cells = <0x1>;
+ 		#size-cells = <0x0>;
+ 
+ 		reset-gpios = <&gpio K1_GPIO(110) GPIO_ACTIVE_LOW>;
+ 		reset-delay-us = <10000>;
+ 		reset-post-delay-us = <100000>;
+ 
+ 		rgmii0: phy@1 {
+ 			reg = <0x1>;
+ 		};
+ 	};
+ };
+ 
+ &eth1 {
+ 	phy-handle = <&rgmii1>;
+ 	phy-mode = "rgmii-id";
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&gmac1_cfg>;
+ 	rx-internal-delay-ps = <0>;
+ 	tx-internal-delay-ps = <250>;
+ 	status = "okay";
+ 
+ 	mdio-bus {
+ 		#address-cells = <0x1>;
+ 		#size-cells = <0x0>;
+ 
+ 		reset-gpios = <&gpio K1_GPIO(115) GPIO_ACTIVE_LOW>;
+ 		reset-delay-us = <10000>;
+ 		reset-post-delay-us = <100000>;
+ 
+ 		rgmii1: phy@1 {
+ 			reg = <0x1>;
+ 		};
+ 	};
+ };
+ 
 +&pdma {
 +	status = "okay";
 +};
 +
  &uart0 {
  	pinctrl-names = "default";
  	pinctrl-0 = <&uart0_2_cfg>;
diff --cc arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts
index c615fcadbd333,89f4132778931..0000000000000
--- a/arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts
+++ b/arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts
@@@ -20,10 -22,52 +22,56 @@@
  	};
  };
  
+ &eth0 {
+ 	phy-handle = <&rgmii0>;
+ 	phy-mode = "rgmii-id";
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&gmac0_cfg>;
+ 	rx-internal-delay-ps = <0>;
+ 	tx-internal-delay-ps = <0>;
+ 	status = "okay";
+ 
+ 	mdio-bus {
+ 		#address-cells = <0x1>;
+ 		#size-cells = <0x0>;
+ 
+ 		reset-gpios = <&gpio K1_GPIO(110) GPIO_ACTIVE_LOW>;
+ 		reset-delay-us = <10000>;
+ 		reset-post-delay-us = <100000>;
+ 
+ 		rgmii0: phy@1 {
+ 			reg = <0x1>;
+ 		};
+ 	};
+ };
+ 
+ &eth1 {
+ 	phy-handle = <&rgmii1>;
+ 	phy-mode = "rgmii-id";
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&gmac1_cfg>;
+ 	rx-internal-delay-ps = <0>;
+ 	tx-internal-delay-ps = <250>;
+ 	status = "okay";
+ 
+ 	mdio-bus {
+ 		#address-cells = <0x1>;
+ 		#size-cells = <0x0>;
+ 
+ 		reset-gpios = <&gpio K1_GPIO(115) GPIO_ACTIVE_LOW>;
+ 		reset-delay-us = <10000>;
+ 		reset-post-delay-us = <100000>;
+ 
+ 		rgmii1: phy@1 {
+ 			reg = <0x1>;
+ 		};
+ 	};
+ };
+ 
 +&pdma {
 +	status = "okay";
 +};
 +
  &uart0 {
  	pinctrl-names = "default";
  	pinctrl-0 = <&uart0_2_cfg>;

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)