Skip to content

Commit 04a228a

Browse files
committed
RISC-V: add Milkv Mars board devicetree
The Milkv Mars is a development board based on the Starfive JH7110 SoC. The board features: - JH7110 SoC - 1/2/4/8 GiB LPDDR4 DRAM - AXP15060 PMIC - 40 pin GPIO header - 3x USB 3.0 host port - 1x USB 2.0 host port - 1x M.2 E-Key - 1x eMMC slot - 1x MicroSD slot - 1x QSPI Flash - 1x 1Gbps Ethernet port - 1x HDMI port - 1x 2-lane DSI and 1x 4-lane DSI - 1x 2-lane CSI I fixed up some nits Emil pointed out. This merges fixes into for-next to avoid messing around with some nodes that were removed as fixes this cycle. Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
2 parents 9abd613 + 9276bad commit 04a228a

File tree

7 files changed

+634
-684
lines changed

7 files changed

+634
-684
lines changed

Documentation/devicetree/bindings/riscv/starfive.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626

2727
- items:
2828
- enum:
29+
- milkv,mars
2930
- starfive,visionfive-2-v1.2a
3031
- starfive,visionfive-2-v1.3b
3132
- const: starfive,jh7110

arch/riscv/boot/dts/starfive/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ DTC_FLAGS_jh7110-starfive-visionfive-2-v1.3b := -@
88
dtb-$(CONFIG_ARCH_STARFIVE) += jh7100-beaglev-starlight.dtb
99
dtb-$(CONFIG_ARCH_STARFIVE) += jh7100-starfive-visionfive-v1.dtb
1010

11+
dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-milkv-mars.dtb
1112
dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-v1.2a.dtb
1213
dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-v1.3b.dtb

arch/riscv/boot/dts/starfive/jh7100.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#address-cells = <2>;
1414
#size-cells = <2>;
1515

16-
cpus {
16+
cpus: cpus {
1717
#address-cells = <1>;
1818
#size-cells = <0>;
1919

0 commit comments

Comments
 (0)