On Thu, Mar 28, 2024 at 10:28:28PM +0100, Heinrich Schuchardt wrote: > On 2/6/24 20:13, Conor Dooley wrote: > > On Wed, Jan 31, 2024 at 09:26:00PM +0800, Jisheng Zhang wrote: > > > 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 > > > > > > Add the devicetree file describing the currently supported features, > > > namely PMIC, UART, I2C, GPIO, SD card, QSPI Flash, eMMC and Ethernet. > > > > > > Signed-off-by: Jisheng Zhang <jszhang@xxxxxxxxxx> > > > > Got a dtbs_check issue in the patchwork CI: > > > > +arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dtb: gmac1-rgmii-rxin-clock: 'clock-frequency' is a required property > > + from schema $id: http://devicetree.org/schemas/clock/fixed-clock.yaml# > > +arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dtb: gmac1-rmii-refin-clock: 'clock-frequency' is a required property > > + from schema $id: http://devicetree.org/schemas/clock/fixed-clock.yaml# > > > > Can you fix that please? Also, I applied some patches the other day that > > seem to conflict quite a bit with the common board dts patch. Would you > > please do a rebase on top of that please? > > > > Cheers, > > Conor. > > > > > --- > > > arch/riscv/boot/dts/starfive/Makefile | 1 + > > > .../boot/dts/starfive/jh7110-milkv-mars.dts | 35 +++++++++++++++++++ > > > 2 files changed, 36 insertions(+) > > > create mode 100644 arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts > > > > > > diff --git a/arch/riscv/boot/dts/starfive/Makefile b/arch/riscv/boot/dts/starfive/Makefile > > > index 0141504c0f5c..2fa0cd7f31c3 100644 > > > --- a/arch/riscv/boot/dts/starfive/Makefile > > > +++ b/arch/riscv/boot/dts/starfive/Makefile > > > @@ -8,5 +8,6 @@ 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-milkv-mars.dtb > > > dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-v1.2a.dtb > > > dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-v1.3b.dtb > > > diff --git a/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts b/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts > > > new file mode 100644 > > > index 000000000000..de600e799e7d > > > --- /dev/null > > > +++ b/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts > > > @@ -0,0 +1,35 @@ > > > +// SPDX-License-Identifier: GPL-2.0 OR MIT > > > +/* > > > + * Copyright (C) 2023 Jisheng Zhang <jszhang@xxxxxxxxxx> > > > + */ > > > + > > > +/dts-v1/; > > > +#include "jh7110-visionfive2-mars-common.dtsi" > > > + > > > +/ { > > > + model = "Milk-V Mars"; > > > + compatible = "milkv,mars", "starfive,jh7110"; > > > +}; > > > + > > > +&gmac0 { > > > + starfive,tx-use-rgmii-clk; > > > + assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>; > > > + assigned-clock-parents = <&aoncrg JH7110_AONCLK_GMAC0_RMII_RTX>; > > > +}; > > > + > > > + > > > +&phy0 { > > > + motorcomm,tx-clk-adj-enabled; > > > + motorcomm,tx-clk-10-inverted; > > > + motorcomm,tx-clk-100-inverted; > > > + motorcomm,tx-clk-1000-inverted; > > > + motorcomm,rx-clk-drv-microamp = <3970>; > > > + motorcomm,rx-data-drv-microamp = <2910>; > > > + rx-internal-delay-ps = <1500>; > > > + tx-internal-delay-ps = <1500>; > > > +}; > > > + > > > +&mmc1 { > > > + disable-wp; > > Due to which difference is 'disable-wp' necessary for the Mars board and not > necessary for the VisionFive 2 board? Mars doesn't have wp pin, but dunno vf2 case since I don't have a VF2 board ;) > > > > + cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; > > On my VisionFive 2 1.2B, and 1.3A boards GPIO 41 reflects if an SD-card is > inserted (as shown in U-Boot by gpio status -a). So shouldn't this value be > moved to the common include "jh7110-visionfive2-mars-common.dtsi" and > broken-cd removed from the VisionFive2 board? I tested the CD pin and can confirm it works on Mars, but I dunno whether this works on VF2 since I have no VF2 board. Could you please check whether it works or not on VF2? > > https://doc-en.rvspace.org/VisionFive2/PDF/SCH_RV002_V1.2A_20221216.pdf > has a line > > GPIO41 | SD_SDIO0_CD_GPIO41 | Micro SD：J10 > > Best regards > > Heinrich > > > > +}; > > > -- > > > 2.43.0 >
