[PATCH 1/2] riscv: dts: spacemit: add common board dtsi for OrangePi

[PATCH 1/2] riscv: dts: spacemit: add common board dtsi for OrangePi

[Chukun Pan]

The OrangePi R2S and OrangePi RV2 boards share many similarities, the
difference being that the RV2 board has more peripherals, such as HDMI
and Wi-Fi. Create a dtsi for shared parts to reduce duplication.

Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
---
 .../boot/dts/spacemit/k1-orangepi-r2s.dts     | 69 +----------------
 .../boot/dts/spacemit/k1-orangepi-rv2.dts     | 69 +----------------
 arch/riscv/boot/dts/spacemit/k1-orangepi.dtsi | 76 +++++++++++++++++++
 3 files changed, 78 insertions(+), 136 deletions(-)
 create mode 100644 arch/riscv/boot/dts/spacemit/k1-orangepi.dtsi

diff --git a/arch/riscv/boot/dts/spacemit/k1-orangepi-r2s.dts b/arch/riscv/boot/dts/spacemit/k1-orangepi-r2s.dts
index 58098c4a2aab..393270641b04 100644
--- a/arch/riscv/boot/dts/spacemit/k1-orangepi-r2s.dts
+++ b/arch/riscv/boot/dts/spacemit/k1-orangepi-r2s.dts
@@ -5,22 +5,11 @@
 
 /dts-v1/;
 
-#include "k1.dtsi"
-#include "k1-pinctrl.dtsi"
+#include "k1-orangepi.dtsi"
 
 / {
 	model = "OrangePi R2S";
 	compatible = "xunlong,orangepi-r2s", "spacemit,k1";
-
-	aliases {
-		serial0 = &uart0;
-		ethernet0 = &eth0;
-		ethernet1 = &eth1;
-	};
-
-	chosen {
-		stdout-path = "serial0";
-	};
 };
 
 &emmc {
@@ -32,59 +21,3 @@ &emmc {
 	no-sdio;
 	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>;
-	status = "okay";
-};
diff --git a/arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts b/arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts
index 41dc8e35e6eb..e53f52e27477 100644
--- a/arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts
+++ b/arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts
@@ -6,23 +6,12 @@
 
 /dts-v1/;
 
-#include "k1.dtsi"
-#include "k1-pinctrl.dtsi"
+#include "k1-orangepi.dtsi"
 
 / {
 	model = "OrangePi RV2";
 	compatible = "xunlong,orangepi-rv2", "spacemit,k1";
 
-	aliases {
-		serial0 = &uart0;
-		ethernet0 = &eth0;
-		ethernet1 = &eth1;
-	};
-
-	chosen {
-		stdout-path = "serial0";
-	};
-
 	leds {
 		compatible = "gpio-leds";
 
@@ -34,59 +23,3 @@ led1 {
 		};
 	};
 };
-
-&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>;
-	status = "okay";
-};
diff --git a/arch/riscv/boot/dts/spacemit/k1-orangepi.dtsi b/arch/riscv/boot/dts/spacemit/k1-orangepi.dtsi
new file mode 100644
index 000000000000..b4808f258adf
--- /dev/null
+++ b/arch/riscv/boot/dts/spacemit/k1-orangepi.dtsi
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2024 Yangyu Chen <cyy@cyyself.name>
+ * Copyright (C) 2025 Hendrik Hamerlinck <hendrik.hamerlinck@hammernet.be>
+ */
+
+#include "k1.dtsi"
+#include "k1-pinctrl.dtsi"
+
+/ {
+	aliases {
+		ethernet0 = &eth0;
+		ethernet1 = &eth1;
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0";
+	};
+};
+
+&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>;
+	status = "okay";
+};
-- 
2.25.1

[PATCH 2/2] riscv: dts: spacemit: add fixed regulators for OrangePi

[Chukun Pan]

Define the power input and the 4V / 3.3V power as fixed regulator
supplies for the PMIC, PCIe and Wi-Fi.

Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
---
 arch/riscv/boot/dts/spacemit/k1-orangepi.dtsi | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/arch/riscv/boot/dts/spacemit/k1-orangepi.dtsi b/arch/riscv/boot/dts/spacemit/k1-orangepi.dtsi
index b4808f258adf..c71c5bc1d341 100644
--- a/arch/riscv/boot/dts/spacemit/k1-orangepi.dtsi
+++ b/arch/riscv/boot/dts/spacemit/k1-orangepi.dtsi
@@ -17,6 +17,34 @@ aliases {
 	chosen {
 		stdout-path = "serial0";
 	};
+
+	pcie_vcc3v3: regulator-pcie-vcc3v3 {
+		compatible = "regulator-fixed";
+		regulator-name = "pcie_vcc3v3";
+		regulator-always-on;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc_5v0>;
+	};
+
+	vcc_5v0: regulator-vcc-5v0 {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_5v0";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+	};
+
+	vcc4v0: regulator-vcc4v0 {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc4v0";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <4000000>;
+		regulator-max-microvolt = <4000000>;
+		vin-supply = <&vcc_5v0>;
+	};
 };
 
 &eth0 {
-- 
2.25.1

Re: [PATCH 1/2] riscv: dts: spacemit: add common board dtsi for OrangePi

[Yixun Lan]

Hi Chukun,

On 18:00 Fri 16 Jan     , Chukun Pan wrote:
> The OrangePi R2S and OrangePi RV2 boards share many similarities, the
> difference being that the RV2 board has more peripherals, such as HDMI
> and Wi-Fi. Create a dtsi for shared parts to reduce duplication.
no, as I checked these two boards having too many differences that
I don't think it's worth trying to create a shared dtsi file

> 
> Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
> ---
>  .../boot/dts/spacemit/k1-orangepi-r2s.dts     | 69 +----------------
>  .../boot/dts/spacemit/k1-orangepi-rv2.dts     | 69 +----------------
>  arch/riscv/boot/dts/spacemit/k1-orangepi.dtsi | 76 +++++++++++++++++++
>  3 files changed, 78 insertions(+), 136 deletions(-)
>  create mode 100644 arch/riscv/boot/dts/spacemit/k1-orangepi.dtsi
> 
> diff --git a/arch/riscv/boot/dts/spacemit/k1-orangepi-r2s.dts b/arch/riscv/boot/dts/spacemit/k1-orangepi-r2s.dts
> index 58098c4a2aab..393270641b04 100644
> --- a/arch/riscv/boot/dts/spacemit/k1-orangepi-r2s.dts
> +++ b/arch/riscv/boot/dts/spacemit/k1-orangepi-r2s.dts
> @@ -5,22 +5,11 @@
>  
>  /dts-v1/;
>  
> -#include "k1.dtsi"
> -#include "k1-pinctrl.dtsi"
> +#include "k1-orangepi.dtsi"
>  
>  / {
>  	model = "OrangePi R2S";
>  	compatible = "xunlong,orangepi-r2s", "spacemit,k1";
> -
> -	aliases {
> -		serial0 = &uart0;
> -		ethernet0 = &eth0;
> -		ethernet1 = &eth1;
> -	};
> -
> -	chosen {
> -		stdout-path = "serial0";
> -	};
>  };
>  

-- 
Yixun Lan (dlan)

Re: [PATCH 2/2] riscv: dts: spacemit: add fixed regulators for OrangePi

[Yixun Lan]

Hi Chukun, 

On 18:00 Fri 16 Jan     , Chukun Pan wrote:
> Define the power input and the 4V / 3.3V power as fixed regulator
> supplies for the PMIC, PCIe and Wi-Fi.
> 
> Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
> ---
>  arch/riscv/boot/dts/spacemit/k1-orangepi.dtsi | 28 +++++++++++++++++++
>  1 file changed, 28 insertions(+)
> 
> diff --git a/arch/riscv/boot/dts/spacemit/k1-orangepi.dtsi b/arch/riscv/boot/dts/spacemit/k1-orangepi.dtsi
> index b4808f258adf..c71c5bc1d341 100644
> --- a/arch/riscv/boot/dts/spacemit/k1-orangepi.dtsi
> +++ b/arch/riscv/boot/dts/spacemit/k1-orangepi.dtsi
> @@ -17,6 +17,34 @@ aliases {
>  	chosen {
>  		stdout-path = "serial0";
>  	};
> +
> +	pcie_vcc3v3: regulator-pcie-vcc3v3 {
can you follow the same name scheme with k1-bananapi-f3.dts?

also please add this regulator with explict consumer - pcie,
otherwise I see the patch isn't really useful

> +		compatible = "regulator-fixed";
> +		regulator-name = "pcie_vcc3v3";
> +		regulator-always-on;
> +		regulator-min-microvolt = <3300000>;
> +		regulator-max-microvolt = <3300000>;
> +		vin-supply = <&vcc_5v0>;
> +	};
> +
> +	vcc_5v0: regulator-vcc-5v0 {
> +		compatible = "regulator-fixed";
> +		regulator-name = "vcc_5v0";
> +		regulator-always-on;
> +		regulator-boot-on;
> +		regulator-min-microvolt = <5000000>;
> +		regulator-max-microvolt = <5000000>;
> +	};
> +
> +	vcc4v0: regulator-vcc4v0 {
> +		compatible = "regulator-fixed";
> +		regulator-name = "vcc4v0";
> +		regulator-always-on;
> +		regulator-boot-on;
> +		regulator-min-microvolt = <4000000>;
> +		regulator-max-microvolt = <4000000>;
> +		vin-supply = <&vcc_5v0>;
> +	};
>  };
>  
>  &eth0 {
> -- 
> 2.25.1
> 

-- 
Yixun Lan (dlan)

Re: [PATCH 1/2] riscv: dts: spacemit: add common board dtsi for OrangePi

[Chukun Pan]

Hi,

> no, as I checked these two boards having too many differences that
> I don't think it's worth trying to create a shared dtsi file

I think some of them can be shared? If you think this is inappropriate,
I will abandon this. By the way, it seems that the OrangePi R2S lacks
publicly available schematics.

Some parts are the same:
- emmc
- eeprom
- ethernet
- p1 pmic
- combo phy
- pdma / uart0
- always-on regulator
- pcie (excluding supply)
- usb2/3 (excluding supply)

Some parts are different:
- hdmi
- qspi
- sdcard
- gpio led
- sdio wifi
- audio codec
- pcie supply
- usb2/3 supply
- gpio regulator

Thanks,
Chukun

Re: [PATCH 2/2] riscv: dts: spacemit: add fixed regulators for OrangePi

[Chukun Pan]

Hi,

> > +	pcie_vcc3v3: regulator-pcie-vcc3v3 {
> can you follow the same name scheme with k1-bananapi-f3.dts?

Sorry, but I don't quite understand?

From fixed-regulator.yaml:
properties:
  $nodename:
    anyOf:
      - description: Preferred name is 'regulator-[0-9]v[0-9]'
        pattern: '^regulator(-[0-9]+v[0-9]+|-[0-9a-z-]+)?$'
      - description: Any name allowed
        deprecated: true

Using 'regulator-' as a prefix is correct.
There are also some commits that changed regulator nodenames. [1]

As for the regulator-name, it should be consistent with the name in
the schematics so that people can look it up between the two.
The BPI-F3 also seems to have some names [2] that need improvement:

vcc_4v     -> vcc4v0_sys
USB30_HUB  -> vcc5v0_hub
USB30_VBUS -> 5v_vbus
vin-supply    vcc5v0_sys

> also please add this regulator with explict consumer - pcie,
> otherwise I see the patch isn't really useful

I will update this in the next version.

[1] https://github.com/torvalds/linux/commit/5c96e63301978f4657c9082c55a066763c8db7b1
[2] https://drive.google.com/file/d/19iLJ5xnCB_oK8VeQjkPGjzAn39WYyylv/view?usp=sharing

Thanks,
Chukun

Re: [PATCH 2/2] riscv: dts: spacemit: add fixed regulators for OrangePi

[Yixun Lan]

Hi Chunkun,

On 22:50 Fri 23 Jan     , Chukun Pan wrote:
> Hi,
> 
> > > +	pcie_vcc3v3: regulator-pcie-vcc3v3 {
> > can you follow the same name scheme with k1-bananapi-f3.dts?
> 
> Sorry, but I don't quite understand?
> 
> From fixed-regulator.yaml:
> properties:
>   $nodename:
>     anyOf:
>       - description: Preferred name is 'regulator-[0-9]v[0-9]'
>         pattern: '^regulator(-[0-9]+v[0-9]+|-[0-9a-z-]+)?$'
>       - description: Any name allowed
>         deprecated: true
> 
> Using 'regulator-' as a prefix is correct.
> There are also some commits that changed regulator nodenames. [1]
Ok, good to know, then I'm fine with the prefix

> 
> As for the regulator-name, it should be consistent with the name in
> the schematics so that people can look it up between the two.
> The BPI-F3 also seems to have some names [2] that need improvement:
> 
> vcc_4v     -> vcc4v0_sys
> USB30_HUB  -> vcc5v0_hub
> USB30_VBUS -> 5v_vbus
> vin-supply    vcc5v0_sys
I do not have strong preference to have label/node name *strictly* matched
with the schematics, IMO, keeping certain alignment is ok, you can still
make some adjustment as long as keep it clean and explicit..
also it's still helpful to give a high level abstract name in 'regulator-name'
for the end user to know what's the regulator connect to.. e.g. in
 /sys/kernel/debug/regulator/regulator_summary

-- 
Yixun Lan (dlan)

Re: [PATCH 1/2] riscv: dts: spacemit: add common board dtsi for OrangePi

[Yixun Lan]

Hi Chukun,

On 22:06 Fri 23 Jan     , Chukun Pan wrote:
> Hi,
> 
> > no, as I checked these two boards having too many differences that
> > I don't think it's worth trying to create a shared dtsi file
> 
> I think some of them can be shared? If you think this is inappropriate,
that's true, but I'd rather we think of this in whole K1 board perspective,
not just two boards of orangepi.

> I will abandon this. By the way, it seems that the OrangePi R2S lacks
> publicly available schematics.
> 
> Some parts are the same:
> - emmc
> - eeprom
> - ethernet
> - p1 pmic
> - combo phy
> - pdma / uart0
> - always-on regulator
> - pcie (excluding supply)
> - usb2/3 (excluding supply)
I'm not surprised of this, as most ODM copy the design from vendor.

> 
> Some parts are different:
> - hdmi
> - qspi
> - sdcard
> - gpio led
> - sdio wifi
> - audio codec
> - pcie supply
> - usb2/3 supply
> - gpio regulator
> 
> Thanks,
> Chukun

-- 
Yixun Lan (dlan)