| Message ID | 20250904132717.8973-1-twoerner@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-rockchip] nanopi-r4s: refresh device-tree patch for linux-6.16.y | expand |
Hi Trevor, On 9/4/25 3:27 PM, Trevor Woerner via lists.yoctoproject.org wrote: > The device-tree organization of the nanopi-r4s device changed slightly in > the linux-6.16.y release, therefore refresh the nanopi-r4s device-tree > patch to match. > > Signed-off-by: Trevor Woerner <twoerner@gmail.com> > --- > .../linux/linux-yocto/nanopi-r4s.scc | 2 +- > ...opi-r4s.dtsi-enable-second-ethernet.patch} | 21 +++++++++---------- > 2 files changed, 11 insertions(+), 12 deletions(-) > rename recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/{0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch => 0001-rk3399-nanopi-r4s.dtsi-enable-second-ethernet.patch} (56%) > > diff --git a/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc b/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc > index 266b77c63fe5..3d1601e28d13 100644 > --- a/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc > +++ b/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc > @@ -3,4 +3,4 @@ define KMACHINE nanopi-r4s > define KTYPE standard > define KARCH arm64 > > -include bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch > +include bsp/rockchip/0001-rk3399-nanopi-r4s.dtsi-enable-second-ethernet.patch > diff --git a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dtsi-enable-second-ethernet.patch > similarity index 56% > rename from recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch > rename to recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dtsi-enable-second-ethernet.patch > index e1f2b92665dd..a3dc23afae7e 100644 > --- a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch > +++ b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dtsi-enable-second-ethernet.patch > @@ -1,9 +1,8 @@ > -From 4c867907b68b417da0711cabdde30a969e368596 Mon Sep 17 00:00:00 2001 > +From de2c28076a50e94659ea9693f9d0a307ef475132 Mon Sep 17 00:00:00 2001 > From: Trevor Woerner <twoerner@gmail.com> > -Date: Sun, 17 Sep 2023 17:30:43 -0400 > -Subject: [PATCH] rk3399-nanopi-r4s.dts: enable second ethernet > +Date: Thu, 4 Sep 2025 09:11:33 -0400 > +Subject: [PATCH] rk3399-nanopi-r4s.dtsi: enable second ethernet > > -# lspci I think this isn't supposed to have disappeared from the commit log. > 00:00.0 PCI bridge: Rockchip Electronics Co., Ltd RK3399 PCI Express Root Port > 01:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ether) > > @@ -11,14 +10,14 @@ Link: https://github.com/armbian/build/pull/2415 > Upstream-Status: Submitted [by someone else] Where was it submitted? I cannot see it on linux-rockchip mailing list archive the little I searched for it? It'd be nice to have this upstreamed so you don't have to carry it around? It does seem odd that every address and range is 0 though... The change does look reasonable though :) Cheers, Quentin
On Thu 2025-09-04 @ 03:43:45 PM, Quentin Schulz via lists.yoctoproject.org wrote: > Hi Trevor, > > On 9/4/25 3:27 PM, Trevor Woerner via lists.yoctoproject.org wrote: > > The device-tree organization of the nanopi-r4s device changed slightly in > > the linux-6.16.y release, therefore refresh the nanopi-r4s device-tree > > patch to match. > > > > Signed-off-by: Trevor Woerner <twoerner@gmail.com> > > --- > > .../linux/linux-yocto/nanopi-r4s.scc | 2 +- > > ...opi-r4s.dtsi-enable-second-ethernet.patch} | 21 +++++++++---------- > > 2 files changed, 11 insertions(+), 12 deletions(-) > > rename recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/{0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch => 0001-rk3399-nanopi-r4s.dtsi-enable-second-ethernet.patch} (56%) > > > > diff --git a/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc b/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc > > index 266b77c63fe5..3d1601e28d13 100644 > > --- a/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc > > +++ b/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc > > @@ -3,4 +3,4 @@ define KMACHINE nanopi-r4s > > define KTYPE standard > > define KARCH arm64 > > -include bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch > > +include bsp/rockchip/0001-rk3399-nanopi-r4s.dtsi-enable-second-ethernet.patch > > diff --git a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dtsi-enable-second-ethernet.patch > > similarity index 56% > > rename from recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch > > rename to recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dtsi-enable-second-ethernet.patch > > index e1f2b92665dd..a3dc23afae7e 100644 > > --- a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch > > +++ b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dtsi-enable-second-ethernet.patch > > @@ -1,9 +1,8 @@ > > -From 4c867907b68b417da0711cabdde30a969e368596 Mon Sep 17 00:00:00 2001 > > +From de2c28076a50e94659ea9693f9d0a307ef475132 Mon Sep 17 00:00:00 2001 > > From: Trevor Woerner <twoerner@gmail.com> > > -Date: Sun, 17 Sep 2023 17:30:43 -0400 > > -Subject: [PATCH] rk3399-nanopi-r4s.dts: enable second ethernet > > +Date: Thu, 4 Sep 2025 09:11:33 -0400 > > +Subject: [PATCH] rk3399-nanopi-r4s.dtsi: enable second ethernet > > -# lspci > > I think this isn't supposed to have disappeared from the commit log. > > > 00:00.0 PCI bridge: Rockchip Electronics Co., Ltd RK3399 PCI Express Root Port > > 01:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ether) > > @@ -11,14 +10,14 @@ Link: https://github.com/armbian/build/pull/2415 > > Upstream-Status: Submitted [by someone else] > > Where was it submitted? I cannot see it on linux-rockchip mailing list > archive the little I searched for it? > > It'd be nice to have this upstreamed so you don't have to carry it around? > > It does seem odd that every address and range is 0 though... Yea, it's a kludge of some sort. > The change does look reasonable though :) I just tried this "trick" on real hardware using the latest 6.16.2 linux-yocto kernel and it does not seem to work anymore. That's unfortunate. So I'll send a new patch to remove this kludge for now.
diff --git a/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc b/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc index 266b77c63fe5..3d1601e28d13 100644 --- a/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc +++ b/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc @@ -3,4 +3,4 @@ define KMACHINE nanopi-r4s define KTYPE standard define KARCH arm64 -include bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch +include bsp/rockchip/0001-rk3399-nanopi-r4s.dtsi-enable-second-ethernet.patch diff --git a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dtsi-enable-second-ethernet.patch similarity index 56% rename from recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch rename to recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dtsi-enable-second-ethernet.patch index e1f2b92665dd..a3dc23afae7e 100644 --- a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch +++ b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dtsi-enable-second-ethernet.patch @@ -1,9 +1,8 @@ -From 4c867907b68b417da0711cabdde30a969e368596 Mon Sep 17 00:00:00 2001 +From de2c28076a50e94659ea9693f9d0a307ef475132 Mon Sep 17 00:00:00 2001 From: Trevor Woerner <twoerner@gmail.com> -Date: Sun, 17 Sep 2023 17:30:43 -0400 -Subject: [PATCH] rk3399-nanopi-r4s.dts: enable second ethernet +Date: Thu, 4 Sep 2025 09:11:33 -0400 +Subject: [PATCH] rk3399-nanopi-r4s.dtsi: enable second ethernet -# lspci 00:00.0 PCI bridge: Rockchip Electronics Co., Ltd RK3399 PCI Express Root Port 01:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ether) @@ -11,14 +10,14 @@ Link: https://github.com/armbian/build/pull/2415 Upstream-Status: Submitted [by someone else] Signed-off-by: Trevor Woerner <twoerner@gmail.com> --- - arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | 11 +++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) -diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts -index fe5b52610010..771615722358 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts -@@ -76,6 +76,17 @@ &pcie0 { +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi +index 8d94d9f91a5c..d6dca18e772c 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi +@@ -74,6 +74,17 @@ &pcie0 { max-link-speed = <1>; num-lanes = <1>; vpcie3v3-supply = <&vcc3v3_sys>; @@ -37,5 +36,5 @@ index fe5b52610010..771615722358 100644 &pinctrl { -- -2.41.0.327.gaa9166bcc0ba +2.44.0.501.g19981daefd7c
The device-tree organization of the nanopi-r4s device changed slightly in the linux-6.16.y release, therefore refresh the nanopi-r4s device-tree patch to match. Signed-off-by: Trevor Woerner <twoerner@gmail.com> --- .../linux/linux-yocto/nanopi-r4s.scc | 2 +- ...opi-r4s.dtsi-enable-second-ethernet.patch} | 21 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) rename recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/{0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch => 0001-rk3399-nanopi-r4s.dtsi-enable-second-ethernet.patch} (56%)