[RFC v1 0/4] Add upstream boards Milk-V Mars CM and Mars CM Lite

[RFC v1 0/4] Add upstream boards Milk-V Mars CM and Mars CM Lite

[E Shattow]

Milk-V Mars CM and Mars CM Lite SoM's were formerly supported v2024.07 to
v2025.01 and then absent since the OF_UPSTREAM transition of starfive
visionfive2 multi-board support. Upstream patches are now queued up for the
next merge window to Linux v6.18, so let's re-introduce support for these
boards.

Sorting of OF_LIST is kept consistent with `LANG=C sort`, and callbacks in
SPL for dts selection are ordered the same. Logic for setting fdtfile env
variable corresponds with the sorting of OF_LIST and not the representative
EEPROM value comparisons.

This series does violate some norms as it modifies the dts/upstream tree,
and generally is introducing as upstream something which is not quite yet
stable or release candidate in upstream devicetree-rebasing. RFC patches
sent this way for review would benefit from not modifying dts/upstream
tree at all but here it is done with empty files to pacify the build
system. Actual dts content is simply copied to arch/$ARCH/dts as automatic
inclusion dtsi. This pretends that if merged, then when upstream changes
appear in devicetree-rebasing it would be only this updated content which
can easily be reverted and empty placeholder files in dts/upstream be
merged with less tedious conflict resolution.

For development with a local Linux source tree, the dtsi files for
automatic inclusion may simply have a 1-liner include to the location of
the corresponding dts file from that Linux source tree.

Open to comments about how best to encourage early review of series like
this (notable is StarFive VisionFive2 Lite new product recently posted)
when there is a hard dependency on both the OF_LIST of a multi-board
target as starfive visionfive2 is and the dts which may not yet be
available from dts/upstream devicetree-rebasing.

E Shattow (4):
  riscv: dts: starfive: Add Milk-V Mars CM and Mars CM Lite from
    upstream Linux for-next
  board: starfive: visionfive2: Add Milk-V Mars CM and Mars CM Lite
    selection by product_id
  riscv: dts: Add placeholder files for pending upstream Milk-V Mars CM
    and Mars CM Lite
  configs: starfive: Add Milk-V Mars CM and Mars CM Lite to visionfive2

 .../dts/jh7110-milkv-marscm-emmc-u-boot.dtsi  |  12 ++
 .../dts/jh7110-milkv-marscm-lite-u-boot.dtsi  |  25 +++
 arch/riscv/dts/jh7110-milkv-marscm.dtsi       | 159 ++++++++++++++++++
 board/starfive/visionfive2/spl.c              |   8 +
 .../visionfive2/starfive_visionfive2.c        |   6 +
 configs/starfive_visionfive2_defconfig        |   2 +-
 .../starfive/jh7110-milkv-marscm-emmc.dts     |   0
 .../starfive/jh7110-milkv-marscm-lite.dts     |   0
 8 files changed, 211 insertions(+), 1 deletion(-)
 create mode 100644 arch/riscv/dts/jh7110-milkv-marscm-emmc-u-boot.dtsi
 create mode 100644 arch/riscv/dts/jh7110-milkv-marscm-lite-u-boot.dtsi
 create mode 100644 arch/riscv/dts/jh7110-milkv-marscm.dtsi
 create mode 100644 dts/upstream/src/riscv/starfive/jh7110-milkv-marscm-emmc.dts
 create mode 100644 dts/upstream/src/riscv/starfive/jh7110-milkv-marscm-lite.dts


base-commit: e482fdbbca935de32400054eb532de45b1cc01cb
-- 
2.50.0

[RFC v1 1/4] riscv: dts: starfive: Add Milk-V Mars CM and Mars CM Lite from upstream Linux for-next

[E Shattow]

Import dtsi common to Mars CM and Mars CM Lite, and adopt dts for each as
per-board automatic inclusion. This commit should be reverted
when devicetree-rebasing release candidate for Linux 6.18 is sync'ed.

Signed-off-by: E Shattow <e@freeshell.de>
---
 .../dts/jh7110-milkv-marscm-emmc-u-boot.dtsi  |  12 ++
 .../dts/jh7110-milkv-marscm-lite-u-boot.dtsi  |  25 +++
 arch/riscv/dts/jh7110-milkv-marscm.dtsi       | 159 ++++++++++++++++++
 3 files changed, 196 insertions(+)
 create mode 100644 arch/riscv/dts/jh7110-milkv-marscm-emmc-u-boot.dtsi
 create mode 100644 arch/riscv/dts/jh7110-milkv-marscm-lite-u-boot.dtsi
 create mode 100644 arch/riscv/dts/jh7110-milkv-marscm.dtsi

diff --git a/arch/riscv/dts/jh7110-milkv-marscm-emmc-u-boot.dtsi b/arch/riscv/dts/jh7110-milkv-marscm-emmc-u-boot.dtsi
new file mode 100644
index 00000000000..e568537af2c
--- /dev/null
+++ b/arch/riscv/dts/jh7110-milkv-marscm-emmc-u-boot.dtsi
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/*
+ * Copyright (C) 2025 E Shattow <e@freeshell.de>
+ */
+
+/dts-v1/;
+#include "jh7110-milkv-marscm.dtsi"
+
+/ {
+	model = "Milk-V Mars CM";
+	compatible = "milkv,marscm-emmc", "starfive,jh7110";
+};
diff --git a/arch/riscv/dts/jh7110-milkv-marscm-lite-u-boot.dtsi b/arch/riscv/dts/jh7110-milkv-marscm-lite-u-boot.dtsi
new file mode 100644
index 00000000000..6c40d0ec401
--- /dev/null
+++ b/arch/riscv/dts/jh7110-milkv-marscm-lite-u-boot.dtsi
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/*
+ * Copyright (C) 2025 E Shattow <e@freeshell.de>
+ */
+
+/dts-v1/;
+#include "jh7110-milkv-marscm.dtsi"
+
+/ {
+	model = "Milk-V Mars CM Lite";
+	compatible = "milkv,marscm-lite", "starfive,jh7110";
+};
+
+&mmc0 {
+	bus-width = <4>;
+	cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>;
+};
+
+&mmc0_pins {
+	pwren-pins {
+		pinmux = <GPIOMUX(22, GPOUT_HIGH,
+				      GPOEN_ENABLE,
+				      GPI_NONE)>;
+	};
+};
diff --git a/arch/riscv/dts/jh7110-milkv-marscm.dtsi b/arch/riscv/dts/jh7110-milkv-marscm.dtsi
new file mode 100644
index 00000000000..25b70af564e
--- /dev/null
+++ b/arch/riscv/dts/jh7110-milkv-marscm.dtsi
@@ -0,0 +1,159 @@
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/*
+ * Copyright (C) 2025 E Shattow <e@freeshell.de>
+ */
+
+/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+#include "jh7110-common.dtsi"
+
+/ {
+	aliases {
+		i2c1 = &i2c1;
+		i2c3 = &i2c3;
+		i2c4 = &i2c4;
+		serial3 = &uart3;
+	};
+
+	sdio_pwrseq: sdio-pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		reset-gpios = <&sysgpio 33 GPIO_ACTIVE_LOW>;
+	};
+};
+
+&gmac0 {
+	assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>;
+	assigned-clock-parents = <&aoncrg JH7110_AONCLK_GMAC0_RMII_RTX>;
+	starfive,tx-use-rgmii-clk;
+	status = "okay";
+};
+
+&i2c0 {
+	status = "okay";
+};
+
+&i2c2 {
+	status = "disabled";
+};
+
+&i2c6 {
+	status = "disabled";
+};
+
+&mmc1 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	mmc-pwrseq = <&sdio_pwrseq>;
+	non-removable;
+	status = "okay";
+
+	ap6256: wifi@1 {
+		compatible = "brcm,bcm43456-fmac", "brcm,bcm4329-fmac";
+		reg = <1>;
+		interrupt-parent = <&sysgpio>;
+		interrupts = <34 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "host-wake";
+		pinctrl-0 = <&wifi_host_wake_irq>;
+		pinctrl-names = "default";
+	};
+};
+
+&pcie0 {
+	status = "okay";
+};
+
+&phy0 {
+	rx-internal-delay-ps = <1500>;
+	tx-internal-delay-ps = <1500>;
+	motorcomm,rx-clk-drv-microamp = <3970>;
+	motorcomm,rx-data-drv-microamp = <2910>;
+	motorcomm,tx-clk-10-inverted;
+	motorcomm,tx-clk-100-inverted;
+	motorcomm,tx-clk-1000-inverted;
+	motorcomm,tx-clk-adj-enabled;
+};
+
+&pwm {
+	status = "okay";
+};
+
+&spi0 {
+	status = "okay";
+};
+
+&sysgpio {
+	uart1_pins: uart1-0 {
+		tx-pins {
+			pinmux = <GPIOMUX(16, GPOUT_SYS_UART1_TX,
+					      GPOEN_ENABLE,
+					      GPI_NONE)>;
+			bias-disable;
+			drive-strength = <12>;
+			input-disable;
+			input-schmitt-disable;
+		};
+
+		rx-pins {
+			pinmux = <GPIOMUX(17, GPOUT_LOW,
+					      GPOEN_DISABLE,
+					      GPI_SYS_UART1_RX)>;
+			bias-pull-up;
+			input-enable;
+			input-schmitt-enable;
+		};
+
+		cts-pins {
+			pinmux = <GPIOMUX(3, GPOUT_LOW,
+					     GPOEN_DISABLE,
+					     GPI_SYS_UART1_CTS)>;
+			bias-disable;
+			input-enable;
+			input-schmitt-enable;
+		};
+
+		rts-pins {
+			pinmux = <GPIOMUX(2, GPOUT_SYS_UART1_RTS,
+					     GPOEN_ENABLE,
+					     GPI_NONE)>;
+			bias-disable;
+			input-disable;
+			input-schmitt-disable;
+		};
+	};
+
+	usb0_pins: usb0-0 {
+		vbus-pins {
+			pinmux = <GPIOMUX(25, GPOUT_SYS_USB_DRIVE_VBUS,
+					      GPOEN_ENABLE,
+					      GPI_NONE)>;
+			bias-disable;
+			input-disable;
+			input-schmitt-disable;
+			slew-rate = <0>;
+		};
+	};
+
+	wifi_host_wake_irq: wifi-host-wake-irq-0 {
+		wake-pins {
+			pinmux = <GPIOMUX(34, GPOUT_LOW,
+					      GPOEN_DISABLE,
+					      GPI_NONE)>;
+			input-enable;
+		};
+	};
+};
+
+&uart1 {
+	uart-has-rtscts;
+	pinctrl-0 = <&uart1_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&usb0 {
+	dr_mode = "host";
+	pinctrl-names = "default";
+	pinctrl-0 = <&usb0_pins>;
+	status = "okay";
+};
-- 
2.50.0

[RFC v1 2/4] board: starfive: visionfive2: Add Milk-V Mars CM and Mars CM Lite selection by product_id

[E Shattow]

Add identifier for Milk-V Mars CM to dts selection callback in SPL, and
to fdtfile environment variable default value selection in payload.

Signed-off-by: E Shattow <e@freeshell.de>
---
 board/starfive/visionfive2/spl.c                  | 8 ++++++++
 board/starfive/visionfive2/starfive_visionfive2.c | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c
index 420a8cf8d91..5047292a0fa 100644
--- a/board/starfive/visionfive2/spl.c
+++ b/board/starfive/visionfive2/spl.c
@@ -123,6 +123,14 @@ int board_fit_config_name_match(const char *name)
 	} else if (!strcmp(name, "starfive/jh7110-milkv-mars") &&
 		    !strncmp(get_product_id_from_eeprom(), "MARS", 4)) {
 		return 0;
+	} else if (!strcmp(name, "starfive/jh7110-milkv-marscm-emmc") &&
+		    !strncmp(get_product_id_from_eeprom(), "MARC", 4) &&
+		    get_mmc_size_from_eeprom()) {
+		return 0;
+	} else if (!strcmp(name, "starfive/jh7110-milkv-marscm-lite") &&
+		    !strncmp(get_product_id_from_eeprom(), "MARC", 4) &&
+		    !get_mmc_size_from_eeprom()) {
+		return 0;
 	} else if (!strcmp(name, "starfive/jh7110-pine64-star64") &&
 		    !strncmp(get_product_id_from_eeprom(), "STAR64", 6)) {
 		return 0;
diff --git a/board/starfive/visionfive2/starfive_visionfive2.c b/board/starfive/visionfive2/starfive_visionfive2.c
index 6271974b9c7..6c39fd4af35 100644
--- a/board/starfive/visionfive2/starfive_visionfive2.c
+++ b/board/starfive/visionfive2/starfive_visionfive2.c
@@ -57,6 +57,12 @@ static void set_fdtfile(void)
 		fdtfile = "starfive/jh7110-deepcomputing-fml13v01.dtb";
 	} else if (!strncmp(get_product_id_from_eeprom(), "MARS", 4)) {
 		fdtfile = "starfive/jh7110-milkv-mars.dtb";
+	} else if (!strncmp(get_product_id_from_eeprom(), "MARC", 4)) {
+		if (get_mmc_size_from_eeprom()) {
+			fdtfile = "starfive/jh7110-milkv-marscm-emmc.dtb";
+		} else {
+			fdtfile = "starfive/jh7110-milkv-marscm-lite.dtb";
+		}
 	} else if (!strncmp(get_product_id_from_eeprom(), "STAR64", 6)) {
 		fdtfile = "starfive/jh7110-pine64-star64.dtb";
 	} else if (!strncmp(get_product_id_from_eeprom(), "VF7110A", 7)) {
-- 
2.50.0

[RFC v1 3/4] riscv: dts: Add placeholder files for pending upstream Milk-V Mars CM and Mars CM Lite

[E Shattow]

Create placeholder files for Milk-V Mars CM and Mars CM Lite in
dts/upstream to placate the build system. Required when building on dts
that have not yet landed in devicetree-rebasing, adopted as dtsi includes.

These files are empty and should be superseded when devicetree-rebasing
release candidate for Linux 6.18 is sync'ed.

Signed-off-by: E Shattow <e@freeshell.de>
---
 dts/upstream/src/riscv/starfive/jh7110-milkv-marscm-emmc.dts | 0
 dts/upstream/src/riscv/starfive/jh7110-milkv-marscm-lite.dts | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 dts/upstream/src/riscv/starfive/jh7110-milkv-marscm-emmc.dts
 create mode 100644 dts/upstream/src/riscv/starfive/jh7110-milkv-marscm-lite.dts

diff --git a/dts/upstream/src/riscv/starfive/jh7110-milkv-marscm-emmc.dts b/dts/upstream/src/riscv/starfive/jh7110-milkv-marscm-emmc.dts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/dts/upstream/src/riscv/starfive/jh7110-milkv-marscm-lite.dts b/dts/upstream/src/riscv/starfive/jh7110-milkv-marscm-lite.dts
new file mode 100644
index 00000000000..e69de29bb2d
-- 
2.50.0

[RFC v1 4/4] configs: starfive: Add Milk-V Mars CM and Mars CM Lite to visionfive2

[E Shattow]

Add Milk-V Mars CM and Mars CM Lite to visionfive2.

These boards were previously supported and then removed in the transition
to OF_UPSTREAM. The dts have landed in the for-next queue so let's add the
boards again.

Signed-off-by: E Shattow <e@freeshell.de>
---
 configs/starfive_visionfive2_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/starfive_visionfive2_defconfig b/configs/starfive_visionfive2_defconfig
index 34ebf3b605b..fa83ecfa10f 100644
--- a/configs/starfive_visionfive2_defconfig
+++ b/configs/starfive_visionfive2_defconfig
@@ -79,7 +79,7 @@ CONFIG_CMD_WGET=y
 CONFIG_CMD_BOOTSTAGE=y
 CONFIG_OF_BOARD=y
 CONFIG_DEVICE_TREE_INCLUDES="starfive-visionfive2-u-boot.dtsi"
-CONFIG_OF_LIST="starfive/jh7110-deepcomputing-fml13v01 starfive/jh7110-milkv-mars starfive/jh7110-pine64-star64 starfive/jh7110-starfive-visionfive-2-v1.2a starfive/jh7110-starfive-visionfive-2-v1.3b"
+CONFIG_OF_LIST="starfive/jh7110-deepcomputing-fml13v01 starfive/jh7110-milkv-mars starfive/jh7110-milkv-marscm-emmc starfive/jh7110-milkv-marscm-lite starfive/jh7110-pine64-star64 starfive/jh7110-starfive-visionfive-2-v1.2a starfive/jh7110-starfive-visionfive-2-v1.3b"
 CONFIG_MULTI_DTB_FIT=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-- 
2.50.0

Re: [RFC v1 0/4] Add upstream boards Milk-V Mars CM and Mars CM Lite

[E Shattow]

On 9/24/25 22:32, E Shattow wrote:
> Milk-V Mars CM and Mars CM Lite SoM's were formerly supported v2024.07 to
> v2025.01 and then absent since the OF_UPSTREAM transition of starfive
> visionfive2 multi-board support. Upstream patches are now queued up for the
> next merge window to Linux v6.18, so let's re-introduce support for these
> boards.
> 
> Sorting of OF_LIST is kept consistent with `LANG=C sort`, and callbacks in
> SPL for dts selection are ordered the same. Logic for setting fdtfile env
> variable corresponds with the sorting of OF_LIST and not the representative
> EEPROM value comparisons.
> 
> This series does violate some norms as it modifies the dts/upstream tree,
> and generally is introducing as upstream something which is not quite yet
> stable or release candidate in upstream devicetree-rebasing. RFC patches
> sent this way for review would benefit from not modifying dts/upstream
> tree at all but here it is done with empty files to pacify the build
> system. Actual dts content is simply copied to arch/$ARCH/dts as automatic
> inclusion dtsi. This pretends that if merged, then when upstream changes
> appear in devicetree-rebasing it would be only this updated content which
> can easily be reverted and empty placeholder files in dts/upstream be
> merged with less tedious conflict resolution.
> 
> For development with a local Linux source tree, the dtsi files for
> automatic inclusion may simply have a 1-liner include to the location of
> the corresponding dts file from that Linux source tree.
> 
> Open to comments about how best to encourage early review of series like
> this (notable is StarFive VisionFive2 Lite new product recently posted)
> when there is a hard dependency on both the OF_LIST of a multi-board
> target as starfive visionfive2 is and the dts which may not yet be
> available from dts/upstream devicetree-rebasing.
> 
> E Shattow (4):
>   riscv: dts: starfive: Add Milk-V Mars CM and Mars CM Lite from
>     upstream Linux for-next
>   board: starfive: visionfive2: Add Milk-V Mars CM and Mars CM Lite
>     selection by product_id
>   riscv: dts: Add placeholder files for pending upstream Milk-V Mars CM
>     and Mars CM Lite
>   configs: starfive: Add Milk-V Mars CM and Mars CM Lite to visionfive2
> 
>  .../dts/jh7110-milkv-marscm-emmc-u-boot.dtsi  |  12 ++
>  .../dts/jh7110-milkv-marscm-lite-u-boot.dtsi  |  25 +++
>  arch/riscv/dts/jh7110-milkv-marscm.dtsi       | 159 ++++++++++++++++++
>  board/starfive/visionfive2/spl.c              |   8 +
>  .../visionfive2/starfive_visionfive2.c        |   6 +
>  configs/starfive_visionfive2_defconfig        |   2 +-
>  .../starfive/jh7110-milkv-marscm-emmc.dts     |   0
>  .../starfive/jh7110-milkv-marscm-lite.dts     |   0
>  8 files changed, 211 insertions(+), 1 deletion(-)
>  create mode 100644 arch/riscv/dts/jh7110-milkv-marscm-emmc-u-boot.dtsi
>  create mode 100644 arch/riscv/dts/jh7110-milkv-marscm-lite-u-boot.dtsi
>  create mode 100644 arch/riscv/dts/jh7110-milkv-marscm.dtsi
>  create mode 100644 dts/upstream/src/riscv/starfive/jh7110-milkv-marscm-emmc.dts
>  create mode 100644 dts/upstream/src/riscv/starfive/jh7110-milkv-marscm-lite.dts
> 
> 
> base-commit: e482fdbbca935de32400054eb532de45b1cc01cb

The upstream dts series (Linux commit 8c0650e0cef28 "Merge tag
'riscv-dt-for-v6.18' of
https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into
soc/dt") has been merged.

I will send an updated series when devicetree-rebasing 6.18-rc1 is
available to U-Boot.

Meanwhile I'm still wanting to know if there's a better way to fake-out
the U-Boot build system that avoids touching `dts/upstream/src` and have
it pretend that some missing dts (where specified in OF_LIST) is
equivalent to an empty dts file, so that the automatic inclusion
workflow can still amend that. This is for development and review
purposes during the duration when I'd like to submit _something_ for
review while waiting for upstream instead of, say "wait a month and try
again later".

From comments on IRC it was suggested to avoid OF_LIST and OF_UPSTREAM
then switch back to OF_UPSTREAM when devicetree-rebasing is available to
U-Boot with the needed data. Likewise the concept that "upstream" means
stable or release candidate only is reinforced and that what I'm asking
for is a bad idea. The counterpoint I have to that is it does not
actually test or give feedback to the build process which uses the
OF_UPSTREAM selection, so is invalid if what you're trying to do is get
a review on something that's surely going to be upstream by the time the
review feedback is collected and at which time the RFC is ready to move
forward as a patch (for final review).

I look at Hal's patch [1] sent one month ago and think well, this is
more difficult than it should be for a vendor to be "upstream first" to
get review feedback on an RFC, how can we make it better?

1:
https://lore.kernel.org/u-boot/ZQ2PR01MB13079882F31D06E973973C1AE6002@ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn/

-E