Am Mittwoch, 12. Juni 2024, 22:48:10 CEST schrieb Sebastian Kropatsch:
> The FriendlyElec NanoPi R6C and R6S are quite similar boards,
> although they differ in:
> - M.2 M-Key connector vs second RTL8125BG Ethernet port
> - One of the LEDs has a different function on each board
> - 12-pin GPIO FPC vs 30-pin GPIO header
> - R6S has a PWM-based IR receiver while the R6C has not
> - R6S has a 5V fan connector while the R6C has not
>
> Refactor their DT files by adding a common definitions file to
> improve differentiation clarity between both boards and to make
> hardware-specific DT changes easier in the long run.
> Do not introduce any functional changes.
>
> Signed-off-by: Sebastian Kropatsch <seb-dev@xxxxxxx>
> ---
> ...-nanopi-r6s.dts => rk3588s-nanopi-r6.dtsi} | 7 +-
> .../boot/dts/rockchip/rk3588s-nanopi-r6c.dts | 2 +-
> .../boot/dts/rockchip/rk3588s-nanopi-r6s.dts | 756 +-----------------
> 3 files changed, 7 insertions(+), 758 deletions(-)
> copy arch/arm64/boot/dts/rockchip/{rk3588s-nanopi-r6s.dts => rk3588s-nanopi-r6.dtsi} (99%)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
> similarity index 99%
> copy from arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts
> copy to arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
> index 4fa644ae510c..e68d4071400e 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
> @@ -1,4 +1,7 @@
> // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Common devicetree definitions for the NanoPi R6C and R6S
> + */
>
> /dts-v1/;
>
> @@ -8,9 +11,6 @@
> #include "rk3588s.dtsi"
>
> / {
> - model = "FriendlyElec NanoPi R6S";
> - compatible = "friendlyarm,nanopi-r6s", "rockchip,rk3588s";
> -
> aliases {
> ethernet0 = &gmac1;
> mmc0 = &sdmmc;
> @@ -74,7 +74,6 @@ lan1_led: led-2 {
> };
>
> lan2_led: led-3 {
> - label = "lan2_led";
> gpios = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>;
> pinctrl-names = "default";
> pinctrl-0 = <&lan2_led_pin>;
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts
> index 497bbb57071f..ccc5e4627517 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts
> @@ -2,7 +2,7 @@
>
> /dts-v1/;
>
> -#include "rk3588s-nanopi-r6s.dts"
> +#include "rk3588s-nanopi-r6.dtsi"
>
> / {
> model = "FriendlyElec NanoPi R6C";
you didn't add a label for that led here.
Though I think it might very well be much nicer to just define the led
with differing function in each board separately.
Especially as the phandle in the new dtsi now still reference the removed
label.
Heiko
