[PR PATCH] linux6.12: add NanoPC T6 ethernet aliases and Rockchip USB PHYs

[PR PATCH] linux6.12: add NanoPC T6 ethernet aliases and Rockchip USB PHYs

[tsndqst]

[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]

There is a new pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages linux6.12-nanopc
https://github.com/void-linux/void-packages/pull/53947

linux6.12: add NanoPC T6 ethernet aliases and Rockchip USB PHYs
[ci skip]

<!-- Uncomment relevant sections and delete options which are not applicable -->

1. Add more USB PHYs for NanoPC T6 LTS (https://wiki.friendlyelec.com/wiki/index.php/NanoPC-T6)
2. Make use of the fdt_fixup_ethernet() function in u-boot to set the mac address on ethernet interfaces that set `local-mac-address` value.  Adding this patch allows NanoPC T6 network interfaces to retain their mac-addresses.  Without this patch they get random addresses every boot. 

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (aarch64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/53947.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux6.12-nanopc-53947.patch --]
[-- Type: text/x-diff, Size: 2697 bytes --]

From 41240961bd0830fce768a4053490af14cfb4df56 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 11 Dec 2024 04:13:55 -0600
Subject: [PATCH] linux6.12: add NanoPC T6 ethernet aliases and Rockchip USB
 PHYs

---
 srcpkgs/linux6.12/files/arm64-dotconfig       |  4 +-
 .../add-ethernet-aliases-nanopc-t6.dtsi.patch | 49 +++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/linux6.12/patches/add-ethernet-aliases-nanopc-t6.dtsi.patch

diff --git a/srcpkgs/linux6.12/files/arm64-dotconfig b/srcpkgs/linux6.12/files/arm64-dotconfig
index e5b300dc0758b4..176b272492a136 100644
--- a/srcpkgs/linux6.12/files/arm64-dotconfig
+++ b/srcpkgs/linux6.12/files/arm64-dotconfig
@@ -12025,11 +12025,11 @@ CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY=m
 CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
 CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m
 CONFIG_PHY_ROCKCHIP_PCIE=m
-# CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX is not set
+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=m
 CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m
 CONFIG_PHY_ROCKCHIP_TYPEC=m
 CONFIG_PHY_ROCKCHIP_USB=m
-# CONFIG_PHY_ROCKCHIP_USBDP is not set
+CONFIG_PHY_ROCKCHIP_USBDP=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
 CONFIG_PHY_EXYNOS_PCIE=y
diff --git a/srcpkgs/linux6.12/patches/add-ethernet-aliases-nanopc-t6.dtsi.patch b/srcpkgs/linux6.12/patches/add-ethernet-aliases-nanopc-t6.dtsi.patch
new file mode 100644
index 00000000000000..31cdb2479b3075
--- /dev/null
+++ b/srcpkgs/linux6.12/patches/add-ethernet-aliases-nanopc-t6.dtsi.patch
@@ -0,0 +1,49 @@
+diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+index fc131789b4c3..1bb9a8ae4238 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+@@ -20,6 +20,8 @@ / {
+ 	aliases {
+ 		mmc0 = &sdhci;
+ 		mmc1 = &sdmmc;
++		ethernet0 = &r8125_u10;
++		ethernet1 = &r8125_u12;
+ 	};
+ 
+ 	adc-keys-0 {
+@@ -491,6 +494,17 @@ &pcie2x1l0 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&pcie2_0_rst>;
+ 	status = "okay";
++
++	pcie@20 {
++		reg = <0x00200000 0 0 0 0>;
++		#address-cells = <3>;
++		#size-cells = <2>;
++
++		r8125_u10: pcie@20,0 {
++			reg = <0x000000 0 0 0 0>;
++			local-mac-address = [ 00 00 00 00 00 00 ];
++		};
++	};
+ };
+ 
+ &pcie2x1l1 {
+@@ -507,6 +521,17 @@ &pcie2x1l2 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&pcie2_2_rst>;
+ 	status = "okay";
++
++	pcie@40 {
++		reg = <0x00400000 0 0 0 0>;
++		#address-cells = <3>;
++		#size-cells = <2>;
++
++		r8125_u12: pcie@40,0 {
++			reg = <0x000000 0 0 0 0>;
++			local-mac-address = [ 00 00 00 00 00 00 ];
++		};
++	};
+ };
+ 
+ &pcie30phy {

Re: [PR REVIEW] linux6.12: add NanoPC T6 ethernet aliases and Rockchip USB PHYs

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 184 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/53947#discussion_r1912536557

Comment:
does this patch exist upstream?

Re: [PR REVIEW] linux6.12: add NanoPC T6 ethernet aliases and Rockchip USB PHYs

[tsndqst]

[-- Attachment #1: Type: text/plain, Size: 593 bytes --]

New review comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/53947#discussion_r1912537210

Comment:
Unfortunately not.  I found it in [Armbian](https://github.com/armbian/build) or [ubuntu-rockchip](https://github.com/Joshua-Riek/ubuntu-rockchip) but I can't find it now.  If you'd rather not merge it without more background I can understand that.  I can reach out to linux-arm mailing list to see if there's a way to get something like this merged.  I may try converting it into an overlay so I don't have to recompile the kernel all the time.

Re: [PR REVIEW] linux6.12: add NanoPC T6 ethernet aliases and Rockchip USB PHYs

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/53947#discussion_r1912541400

Comment:
we'd prefer it be accepted upstream before adding it here

Re: [PR REVIEW] linux6.12: add NanoPC T6 ethernet aliases and Rockchip USB PHYs

[tsndqst]

[-- Attachment #1: Type: text/plain, Size: 290 bytes --]

New review comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/53947#discussion_r1912541634

Comment:
That makes sense to me and honestly that was what I was expecting.  I'll take it out of the PR.  I'd still like the USB PHYs enabled though.

Re: [PR PATCH] [Updated] linux6.12: add NanoPC T6 ethernet aliases and Rockchip USB PHYs

[tsndqst]

[-- Attachment #1: Type: text/plain, Size: 1549 bytes --]

There is an updated pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages linux6.12-nanopc
https://github.com/void-linux/void-packages/pull/53947

linux6.12: add NanoPC T6 ethernet aliases and Rockchip USB PHYs
[ci skip]

<!-- Uncomment relevant sections and delete options which are not applicable -->

1. Add more USB PHYs for NanoPC T6 LTS (https://wiki.friendlyelec.com/wiki/index.php/NanoPC-T6)
2. Make use of the fdt_fixup_ethernet() function in u-boot to set the mac address on ethernet interfaces that set `local-mac-address` value.  Adding this patch allows NanoPC T6 network interfaces to retain their mac-addresses.  Without this patch they get random addresses every boot. 

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (aarch64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/53947.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux6.12-nanopc-53947.patch --]
[-- Type: text/x-diff, Size: 1041 bytes --]

From 78ec338ec46b55460a927441f01535f3478daa6c Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 11 Dec 2024 04:13:55 -0600
Subject: [PATCH] linux6.12: enable Rockchip USB PHYs

---
 srcpkgs/linux6.12/files/arm64-dotconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux6.12/files/arm64-dotconfig b/srcpkgs/linux6.12/files/arm64-dotconfig
index e5b300dc0758b4..176b272492a136 100644
--- a/srcpkgs/linux6.12/files/arm64-dotconfig
+++ b/srcpkgs/linux6.12/files/arm64-dotconfig
@@ -12025,11 +12025,11 @@ CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY=m
 CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
 CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m
 CONFIG_PHY_ROCKCHIP_PCIE=m
-# CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX is not set
+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=m
 CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m
 CONFIG_PHY_ROCKCHIP_TYPEC=m
 CONFIG_PHY_ROCKCHIP_USB=m
-# CONFIG_PHY_ROCKCHIP_USBDP is not set
+CONFIG_PHY_ROCKCHIP_USBDP=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
 CONFIG_PHY_EXYNOS_PCIE=y

Re: [PR PATCH] [Merged]: linux6.12: add NanoPC T6 ethernet aliases and Rockchip USB PHYs

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 998 bytes --]

There's a merged pull request on the void-packages repository

linux6.12: add NanoPC T6 ethernet aliases and Rockchip USB PHYs
https://github.com/void-linux/void-packages/pull/53947

Description:
[ci skip]

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (aarch64-glibc)