Skip to contentSkip to conversation

riscv: dts: starfive: add framework dts

PATCH Superseded Sandie Cao 5 participants 6 messages Sep 24, 2024 – Sep 25, 2024 1 message not in the archive

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Sandie Cao

author
#0 lore raw

PATCH v2 3/3 riscv: dts: starfive: add framework dts

Add framework dts to support RISC-V Framework Laptop 13 Mainboard.

---
 arch/riscv/boot/dts/starfive/Makefile         |  1 +
 .../boot/dts/starfive/jh7110-framework.dts    | 34 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 arch/riscv/boot/dts/starfive/jh7110-framework.dts
arch/riscv/boot/dts/starfive/Makefile +1 -0
index 7a163a7d6ba3..3746f7122834 100644
@@ -8,6 +8,7 @@ DTC_FLAGS_jh7110-starfive-visionfive-2-v1.3b := -@
 dtb-$(CONFIG_ARCH_STARFIVE) += jh7100-beaglev-starlight.dtb
 dtb-$(CONFIG_ARCH_STARFIVE) += jh7100-starfive-visionfive-v1.dtb
 
+dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-framework.dtb
 dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-milkv-mars.dtb
 dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-pine64-star64.dtb
 dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-v1.2a.dtb
arch/riscv/boot/dts/starfive/jh7110-framework.dts new file +34 -0
new file mode 100644
index 000000000000..ff12c24ebab3
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/*
+ * Copyright (C) 2022 StarFive Technology Co., Ltd.
+ * Copyright (C) 2022 Emil Renner Berthing <[email protected]>
+ */
+
+/dts-v1/;
+#include "jh7110-common.dtsi"
+
+/ {
+	model = "Framework FRANME0000";
+	compatible = "deepcomputing,fm7110", "starfive,jh7110";
+};
+
+&gmac0 {
+	status = "disabled";
+};
+
+&gmac1 {
+	status = "disabled";
+};
+
+&usb0 {
+	dr_mode = "host";
+	status = "okay";
+};
+
+&pwmdac {
+	status = "disabled";
+};
+
+&pcie0 {
+	status = "disabled";
+};
Signature · 1 line
2.34.1
#1 lore raw
Quoted 8 lines · Sandie Cao

Add framework dts to support RISC-V Framework Laptop 13 Mainboard.

---
 arch/riscv/boot/dts/starfive/Makefile         |  1 +
 .../boot/dts/starfive/jh7110-framework.dts    | 34 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 arch/riscv/boot/dts/starfive/jh7110-framework.dts

Your threading is entirely broken making applying process more difficult.

Quoted 42 lines
arch/riscv/boot/dts/starfive/Makefile +1 -0
index 7a163a7d6ba3..3746f7122834 100644
@@ -8,6 +8,7 @@ DTC_FLAGS_jh7110-starfive-visionfive-2-v1.3b := -@
 dtb-$(CONFIG_ARCH_STARFIVE) += jh7100-beaglev-starlight.dtb
 dtb-$(CONFIG_ARCH_STARFIVE) += jh7100-starfive-visionfive-v1.dtb
 
+dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-framework.dtb
 dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-milkv-mars.dtb
 dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-pine64-star64.dtb
 dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-v1.2a.dtb
arch/riscv/boot/dts/starfive/jh7110-framework.dts new file +23 -0
new file mode 100644
index 000000000000..ff12c24ebab3
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/*
+ * Copyright (C) 2022 StarFive Technology Co., Ltd.
+ * Copyright (C) 2022 Emil Renner Berthing <[email protected]>
+ */
+
+/dts-v1/;
+#include "jh7110-common.dtsi"
+
+/ {
+	model = "Framework FRANME0000";
+	compatible = "deepcomputing,fm7110", "starfive,jh7110";
+};
+
+&gmac0 {
+	status = "disabled";
+};
+
+&gmac1 {
+	status = "disabled";
+};
+
+&usb0 {

arch/riscv/boot/dts/starfive/jh7110-framework.dts line 33

Quoted 10 lines
arch/riscv/boot/dts/starfive/jh7110-framework.dts new file +10 -0
+	dr_mode = "host";
+	status = "okay";
+};
+
+&pwmdac {
+	status = "disabled";
+};
+
+&pcie0 {
+	status = "disabled";

Why PCIE0 is enabled in the DTSI in the first place? The same questions about MACs.

Best regards,
Krzysztof

A message that is not in the archive (sent off-list or not yet received): 407ce3d77416bb2522b7906b0df3d5adf02c27ee.5065befe.6789.4275.a840.52c113c23eb9@feishu.cn

#3 lore raw
Quoted 24 lines · 曹珊珊

Hi Krzysztof,

Thanks for your time.

A: jh7110-common.dtsi is also used by other boards. Likes: milkv-mars, pine64-star64. So I can only disable them in jh7110-framework.dts. Or I need to create a new common.dtsi.

Q: Why PCIE0 is enabled in the DTSI in the first place? The same questions about MACs.

Regards,
Sandie

Quoted 8 lines · Sandie Cao

Add framework dts to support RISC-V Framework Laptop 13 Mainboard.

---
  arch/riscv/boot/dts/starfive/Makefile         |  1 + .../boot/dts/starfive/jh7110-framework.dts    | 34 +++++++++++++++++++

  2 files changed, 35 insertions(+)

  create mode 100644 arch/riscv/boot/dts/starfive/jh7110-framework.dts

Quoted 1 line

Your threading is entirely broken making applying process more difficult.

So I am talking with myself?

...

Quoted 11 lines

arch/riscv/boot/dts/starfive/jh7110-framework.dts line 33

Quoted 5 lines

+        status = "disabled";

arch/riscv/boot/dts/starfive/jh7110-framework.dts new file +4 -0
+};
+
+&pcie0 {
+        status = "disabled";

Why PCIE0 is enabled in the DTSI in the first place? The same questions about MACs.

Best regards,
Krzysztof

And sending myself regards?

Sorry, no clue what's going on here.

Best regards,
Krzysztof

#4 lore raw
In reply to Sandie Cao
Quoted 10 lines · Sandie Cao
arch/riscv/boot/dts/starfive/jh7110-framework.dts new file +3 -0
new file mode 100644
index 000000000000..ff12c24ebab3
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/*
+ * Copyright (C) 2022 StarFive Technology Co., Ltd.

arch/riscv/boot/dts/starfive/jh7110-framework.dts line 13

Quoted 10 lines
arch/riscv/boot/dts/starfive/jh7110-framework.dts new file +10 -0
+ * Copyright (C) 2022 Emil Renner Berthing <[email protected]>
+ */
+
+/dts-v1/;
+#include "jh7110-common.dtsi"
+
+/ {
+	model = "Framework FRANME0000";
+	compatible = "deepcomputing,fm7110", "starfive,jh7110";
+};

Nitpicking: property "compatible" should go first.

See Documentation/devicetree/bindings/dts-coding-style.rst

Signature · 1 line
Rafał Miłecki
maintainer
#5 lore raw
Quoted 24 lines · Rafał Miłecki
Quoted 10 lines · Sandie Cao
arch/riscv/boot/dts/starfive/jh7110-framework.dts new file +3 -0
new file mode 100644
index 000000000000..ff12c24ebab3
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/*
+ * Copyright (C) 2022 StarFive Technology Co., Ltd.

arch/riscv/boot/dts/starfive/jh7110-framework.dts line 13

Quoted 10 lines
arch/riscv/boot/dts/starfive/jh7110-framework.dts new file +10 -0
+ * Copyright (C) 2022 Emil Renner Berthing <[email protected]>
+ */
+
+/dts-v1/;
+#include "jh7110-common.dtsi"
+
+/ {
+	model = "Framework FRANME0000";
+	compatible = "deepcomputing,fm7110", "starfive,jh7110";
+};

Nitpicking: property "compatible" should go first.

Quoted 1 line

See Documentation/devicetree/bindings/dts-coding-style.rst

I think "model" usually goes before compatible, I wouldn't change it here.

#6 lore raw
In reply to Sandie Cao
Quoted 9 lines · Sandie Cao

Add framework dts to support RISC-V Framework Laptop 13 Mainboard.

---
 arch/riscv/boot/dts/starfive/Makefile         |  1 +
 .../boot/dts/starfive/jh7110-framework.dts    | 34 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 arch/riscv/boot/dts/starfive/jh7110-framework.dts

My bot found new DTB warnings on the .dts files added or changed in this series.

Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings are fixed by another series. Ultimately, it is up to the platform maintainer whether these warnings are acceptable or not. No need to reply unless the platform maintainer has comments.

If you already ran DT checks and didn't see these error(s), then make sure dt-schema is up to date:

  pip3 install dtschema --upgrade

New warnings running 'make CHECK_DTBS=y starfive/jh7110-framework.dtb' for [email protected]:

arch/riscv/boot/dts/starfive/jh7110-framework.dtb: /: compatible: 'oneOf' conditional failed, one must be fixed:

	'deepcomputing,fm7110' is not one of ['beagle,beaglev-starlight-jh7100-r0', 'starfive,visionfive-v1']
	'deepcomputing,fm7110' is not one of ['milkv,mars', 'pine64,star64', 'starfive,visionfive-2-v1.2a', 'starfive,visionfive-2-v1.3b']
	'starfive,jh7100' was expected
	from schema $id: http://devicetree.org/schemas/riscv/starfive.yaml#

arch/riscv/boot/dts/starfive/jh7110-framework.dtb: /: failed to match any schema with compatible: ['deepcomputing,fm7110', 'starfive,jh7110']