Add support for StarFive VisionFive 2 Lite board
Subsystems (7)
cover Add support for StarFive VisionFive 2 Lite board
VisionFive 2 Lite is a mini SBC based on the StarFive JH7110S industrial SoC which can run at -40~85 degrees centigrade and up to 1.25GHz.
Board features:
- JH7110S SoC
- 4/8 GiB LPDDR4 DRAM
- AXP15060 PMIC
- 40 pin GPIO header
- 1x USB 3.0 host port
- 3x USB 2.0 host port
- 1x M.2 M-Key (size: 2242)
- 1x MicroSD slot (optional non-removable 64GiB eMMC)
- 1x QSPI Flash
- 1x I2C EEPROM
- 1x 1Gbps Ethernet port
- SDIO-based Wi-Fi & UART-based Bluetooth
- 1x HDMI port
- 1x 2-lane DSI
- 1x 2-lane CSI
VisionFive 2 Lite schematics: https://doc-en.rvspace.org/VisionFive2Lite/PDF/VF2_LITE_V1.10_TF_20250818_SCH.pdf
VisionFive 2 Lite Quick Start Guide: https://doc-en.rvspace.org/VisionFive2Lite/VisionFive2LiteQSG/index.html
More documents: https://doc-en.rvspace.org/Doc_Center/visionfive_2_lite.html
Changes since RFC:
- Add jh7110s compatible to the generic cpufreq driver.
- Fix the dtbs_check error by adding the missing "enable-gpios" property in jh7110 pcie dt-bindings.
- Rebase on the latest mainline.
- Add VisionFive 2 Lite eMMC board device tree and add a common board dtsi for VisionFive 2 Lite variants.
- Add usb switch pin configuration (GPIO62).
- Improve the commit messages.
History:
RFC: https://lore.kernel.org/all/[email protected]/
Hal Feng (7):
cpufreq: dt-platdev: Add JH7110S SOC to the allowlist
dt-bindings: PCI: starfive,jh7110-pcie: Add enable-gpios property
dt-bindings: riscv: Add StarFive JH7110S SoC and VisionFive 2 Lite
board
riscv: dts: starfive: jh7110-common: Move out some nodes to the board
dts
riscv: dts: starfive: Add common board dtsi for VisionFive 2 Lite
variants
riscv: dts: starfive: Add VisionFive 2 Lite board device tree
riscv: dts: starfive: Add VisionFive 2 Lite eMMC board device tree
.../bindings/pci/starfive,jh7110-pcie.yaml | 4 + .../devicetree/bindings/riscv/starfive.yaml | 6 + arch/riscv/boot/dts/starfive/Makefile | 3 + .../boot/dts/starfive/jh7110-common.dtsi | 19 --- .../jh7110-deepcomputing-fml13v01.dts | 46 ++++++ .../boot/dts/starfive/jh7110-milkv-mars.dts | 46 ++++++ .../dts/starfive/jh7110-milkv-marscm-emmc.dts | 9 ++ .../dts/starfive/jh7110-milkv-marscm-lite.dts | 1 + .../dts/starfive/jh7110-milkv-marscm.dtsi | 32 ++++ .../dts/starfive/jh7110-pine64-star64.dts | 46 ++++++ .../jh7110-starfive-visionfive-2.dtsi | 43 ++++++ arch/riscv/boot/dts/starfive/jh7110.dtsi | 16 -- ...h7110s-starfive-visionfive-2-lite-emmc.dts | 22 +++ .../jh7110s-starfive-visionfive-2-lite.dts | 20 +++ .../jh7110s-starfive-visionfive-2-lite.dtsi | 145 ++++++++++++++++++ drivers/cpufreq/cpufreq-dt-platdev.c | 1 + 16 files changed, 424 insertions(+), 35 deletions(-) create mode 100644 arch/riscv/boot/dts/starfive/jh7110s-starfive-visionfive-2-lite-emmc.dts create mode 100644 arch/riscv/boot/dts/starfive/jh7110s-starfive-visionfive-2-lite.dts create mode 100644 arch/riscv/boot/dts/starfive/jh7110s-starfive-visionfive-2-lite.dtsi
base-commit: 3a8660878839faadb4f1a6dd72c3179c1df56787
Signature · 7 lines
2.43.2 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH 1/7 cpufreq: dt-platdev: Add JH7110S SOC to the allowlist
Add the compatible strings for supporting the generic cpufreq driver on the StarFive JH7110S SoC.
--- drivers/cpufreq/cpufreq-dt-platdev.c | 1 + 1 file changed, 1 insertion(+)
drivers/cpufreq/cpufreq-dt-platdev.c +1 -0
@@ -87,6 +87,7 @@ static const struct of_device_id allowlist[] __initconst = { { .compatible = "st-ericsson,u9540", }, { .compatible = "starfive,jh7110", }, + { .compatible = "starfive,jh7110s", }, { .compatible = "ti,omap2", }, { .compatible = "ti,omap4", },
Signature · 1 line
2.43.2
Re: [PATCH v1 1/7] cpufreq: dt-platdev: Add JH7110S SOC to the allowlist
Quoted 4 lines · Hal Feng
Add the compatible strings for supporting the generic cpufreq driver on the StarFive JH7110S SoC.
Signed-off-by Hal Feng <[email protected]>
Quoted 16 lines
--- drivers/cpufreq/cpufreq-dt-platdev.c | 1 + 1 file changed, 1 insertion(+)drivers/cpufreq/cpufreq-dt-platdev.c +1
-0@@ -87,6 +87,7 @@ static const struct of_device_id allowlist[] __initconst = { { .compatible = "st-ericsson,u9540", }, { .compatible = "starfive,jh7110", }, + { .compatible = "starfive,jh7110s", }, { .compatible = "ti,omap2", }, { .compatible = "ti,omap4", },
Re: [PATCH v1 1/7] cpufreq: dt-platdev: Add JH7110S SOC to the allowlist
In reply to Hal FengQuoted 13 lines · Hal Feng
Add the compatible strings for supporting the generic cpufreq driver on the StarFive JH7110S SoC.
Signed-off-by Hal Feng <[email protected]>--- drivers/cpufreq/cpufreq-dt-platdev.c | 1 + 1 file changed, 1 insertion(+)drivers/cpufreq/cpufreq-dt-platdev.c +0
-0
drivers/cpufreq/cpufreq-dt-platdev.c static const struct of_device_id allowlist[] __initconst = { · line 93
Quoted 7 lines
drivers/cpufreq/cpufreq-dt-platdev.c +1
-0@@ -87,6 +87,7 @@ static const struct of_device_id allowlist[] __initconst = { { .compatible = "st-ericsson,u9540", }, { .compatible = "starfive,jh7110", }, + { .compatible = "starfive,jh7110s", }, { .compatible = "ti,omap2", }, { .compatible = "ti,omap4", },
Applied. Thanks.
Signature · 1 line
viresh
PATCH 2/7 dt-bindings: PCI: starfive,jh7110-pcie: Add enable-gpios property
In reply to Hal FengAdd enable-gpios property for controlling the PCI bus device power. This property had been supported in the driver but not added in the dt-bindings.
--- .../devicetree/bindings/pci/starfive,jh7110-pcie.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/pci/starfive,jh7110-pcie.yaml +4 -0
@@ -60,6 +60,10 @@ properties: description: The phandle to System Register Controller syscon node. + enable-gpios: + description: GPIO used to enable the PCI bus device power + maxItems: 1 + perst-gpios: description: GPIO controlled connection to PERST# signal maxItems: 1
Signature · 7 lines
2.43.2 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v1 2/7] dt-bindings: PCI: starfive,jh7110-pcie: Add enable-gpios property
Quoted 15 lines · Hal Feng
Add enable-gpios property for controlling the PCI bus device power. This property had been supported in the driver but not added in the dt-bindings.
Fixes 22fe32239770 ("dt-bindings: PCI: Add StarFive JH7110 PCIe controller")Signed-off-by Hal Feng <[email protected]>--- .../devicetree/bindings/pci/starfive,jh7110-pcie.yaml | 4 ++++ 1 file changed, 4 insertions(+)Documentation/devicetree/bindings/pci/starfive,jh7110-pcie.yaml +0
-0
Documentation/devicetree/bindings/pci/starfive,jh7110-pcie.yaml properties: · line 66
Quoted 7 lines
Documentation/devicetree/bindings/pci/starfive,jh7110-pcie.yaml +4
-0@@ -60,6 +60,10 @@ properties: description: The phandle to System Register Controller syscon node. + enable-gpios: + description: GPIO used to enable the PCI bus device power + maxItems: 1 +
Shouldn't we try to keep the entries alphabetically ordered?
Otherwise looks good.
Best regards
Heinrich
Quoted 3 lines
Documentation/devicetree/bindings/pci/starfive,jh7110-pcie.yaml +0
-0perst-gpios: description: GPIO controlled connection to PERST# signal maxItems: 1
Re: [PATCH v1 2/7] dt-bindings: PCI: starfive,jh7110-pcie: Add enable-gpios property
Quoted 11 lines · Heinrich Schuchardt
Quoted 10 lines · Hal Feng
Add enable-gpios property for controlling the PCI bus device power. This property had been supported in the driver but not added in the dt-bindings.
Fixes 22fe32239770 ("dt-bindings: PCI: Add StarFive JH7110 PCIe controller")Signed-off-by Hal Feng <[email protected]>--- .../devicetree/bindings/pci/starfive,jh7110-pcie.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Quoted 13 lines
Documentation/devicetree/bindings/pci/starfive,jh7110-pcie.yaml properties: · line 65
Quoted 11 lines
Documentation/devicetree/bindings/pci/starfive,jh7110-pcie.yaml +4
-0@@ -60,6 +60,10 @@ properties: description: The phandle to System Register Controller syscon node. + enable-gpios: + description: GPIO used to enable the PCI bus device power + maxItems: 1 +Shouldn't we try to keep the entries alphabetically ordered?
Grouping the two gpios together also has some value. I don't think it's particularly important which way it is done.
pw-bot: not-applicable
Quoted 12 lines
Otherwise looks good.
Best regards
Heinrich
Quoted 3 lines
Documentation/devicetree/bindings/pci/starfive,jh7110-pcie.yaml +0
-0perst-gpios: description: GPIO controlled connection to PERST# signal maxItems: 1
PATCH 3/7 dt-bindings: riscv: Add StarFive JH7110S SoC and VisionFive 2 Lite board
In reply to Hal FengAdd device tree bindings for the StarFive JH7110S SoC and the VisionFive 2 Lite board equipped with it.
JH7110S SoC is an industrial SoC which can run at -40~85 degrees centigrade and up to 1.25GHz. Its CPU cores and peripherals are the same as those of the JH7110 SoC.
VisionFive 2 Lite boards have SD card version (default) and eMMC version, which are called "VisionFive 2 Lite" and "VisionFive 2 Lite eMMC" respectively.
--- Documentation/devicetree/bindings/riscv/starfive.yaml | 6 ++++++ 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/riscv/starfive.yaml +6 -0
@@ -35,6 +35,12 @@ properties: - starfive,visionfive-2-v1.3b - const: starfive,jh7110 + - items: + - enum: + - starfive,visionfive-2-lite + - starfive,visionfive-2-lite-emmc + - const: starfive,jh7110s + additionalProperties: true ...
Signature · 7 lines
2.43.2 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v1 3/7] dt-bindings: riscv: Add StarFive JH7110S SoC and VisionFive 2 Lite board
Quoted 7 lines · Hal Feng
Add device tree bindings for the StarFive JH7110S SoC and the VisionFive 2 Lite board equipped with it.
JH7110S SoC is an industrial SoC which can run at -40~85 degrees centigrade and up to 1.25GHz. Its CPU cores and peripherals are the same as those of the JH7110 SoC.
Quoted 5 lines
VisionFive 2 Lite boards have SD card version (default) and eMMC version, which are called "VisionFive 2 Lite" and "VisionFive 2 Lite eMMC" respectively.
Signed-off-by Hal Feng <[email protected]>
Quoted 21 lines
--- Documentation/devicetree/bindings/riscv/starfive.yaml | 6 ++++++ 1 file changed, 6 insertions(+)Documentation/devicetree/bindings/riscv/starfive.yaml +6
-0@@ -35,6 +35,12 @@ properties: - starfive,visionfive-2-v1.3b - const: starfive,jh7110 + - items: + - enum: + - starfive,visionfive-2-lite + - starfive,visionfive-2-lite-emmc + - const: starfive,jh7110s + additionalProperties: true
Conor Dooley
maintainerRe: [PATCH v1 3/7] dt-bindings: riscv: Add StarFive JH7110S SoC and VisionFive 2 Lite board
In reply to Hal FengQuoted 7 lines · Hal Feng
Add device tree bindings for the StarFive JH7110S SoC and the VisionFive 2 Lite board equipped with it.
JH7110S SoC is an industrial SoC which can run at -40~85 degrees centigrade and up to 1.25GHz. Its CPU cores and peripherals are the same as those of the JH7110 SoC.
Quoted 5 lines
VisionFive 2 Lite boards have SD card version (default) and eMMC version, which are called "VisionFive 2 Lite" and "VisionFive 2 Lite eMMC" respectively.
Signed-off-by Hal Feng <[email protected]>
Since this is content for my tree,
pw-bot: not-applicable
Quoted 29 lines
--- Documentation/devicetree/bindings/riscv/starfive.yaml | 6 ++++++ 1 file changed, 6 insertions(+)Documentation/devicetree/bindings/riscv/starfive.yaml +6
-0@@ -35,6 +35,12 @@ properties: - starfive,visionfive-2-v1.3b - const: starfive,jh7110 + - items: + - enum: + - starfive,visionfive-2-lite + - starfive,visionfive-2-lite-emmc + - const: starfive,jh7110s + additionalProperties: trueSignature · 7 lines
2.43.2 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH 4/7 riscv: dts: starfive: jh7110-common: Move out some nodes to the board dts
In reply to Hal FengSome node in this file are not used by the upcoming VisionFive 2 Lite board. Move them to the board dts to prepare for adding the new VisionFive 2 Lite device tree.
--- .../boot/dts/starfive/jh7110-common.dtsi | 19 -------- .../jh7110-deepcomputing-fml13v01.dts | 46 +++++++++++++++++++ .../boot/dts/starfive/jh7110-milkv-mars.dts | 46 +++++++++++++++++++ .../dts/starfive/jh7110-milkv-marscm-emmc.dts | 9 ++++ .../dts/starfive/jh7110-milkv-marscm-lite.dts | 1 + .../dts/starfive/jh7110-milkv-marscm.dtsi | 32 +++++++++++++ .../dts/starfive/jh7110-pine64-star64.dts | 46 +++++++++++++++++++ .../jh7110-starfive-visionfive-2.dtsi | 43 +++++++++++++++++ arch/riscv/boot/dts/starfive/jh7110.dtsi | 16 ------- 9 files changed, 223 insertions(+), 35 deletions(-)
arch/riscv/boot/dts/starfive/jh7110-common.dtsi +0 -19
@@ -281,14 +281,8 @@ &mmc0 { assigned-clock-rates = <50000000>; bus-width = <8>; bootph-pre-ram; - cap-mmc-highspeed; - mmc-ddr-1_8v; - mmc-hs200-1_8v; - cap-mmc-hw-reset; pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; - vmmc-supply = <&vcc_3v3>; - vqmmc-supply = <&emmc_vdd>; status = "okay"; };
@@ -298,8 +292,6 @@ &mmc1 { assigned-clock-rates = <50000000>; bus-width = <4>; bootph-pre-ram; - cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; - disable-wp; cap-sd-highspeed; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>;
@@ -444,17 +436,6 @@ GPOEN_SYS_I2C6_DATA, }; mmc0_pins: mmc0-0 { - rst-pins { - pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, - GPOEN_ENABLE, - GPI_NONE)>; - bias-pull-up; - drive-strength = <12>; - input-disable; - input-schmitt-disable; - slew-rate = <0>; - }; - mmc-pins { pinmux = <PINMUX(PAD_SD0_CLK, 0)>, <PINMUX(PAD_SD0_CMD, 0)>,
arch/riscv/boot/dts/starfive/jh7110-deepcomputing-fml13v01.dts +46 -0
52 lines not on this page · raw message
arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts +46 -0
58 lines not on this page · raw message
arch/riscv/boot/dts/starfive/jh7110-milkv-marscm-emmc.dts +9 -0
@@ -10,3 +10,12 @@ / { model = "Milk-V Mars CM"; compatible = "milkv,marscm-emmc", "starfive,jh7110"; }; + +&mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&emmc_vdd>; +};
arch/riscv/boot/dts/starfive/jh7110-milkv-marscm-lite.dts +1 -0
@@ -14,6 +14,7 @@ / { &mmc0 { bus-width = <4>; cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; }; &mmc0_pins {
arch/riscv/boot/dts/starfive/jh7110-milkv-marscm.dtsi +32 -0
@@ -21,6 +21,25 @@ sdio_pwrseq: sdio-pwrseq { }; }; +&cpu_opp { + opp-375000000 { + opp-hz = /bits/ 64 <375000000>; + opp-microvolt = <800000>; + }; + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <800000>; + }; + opp-750000000 { + opp-hz = /bits/ 64 <750000000>; + opp-microvolt = <800000>; + }; + opp-1500000000 { + opp-hz = /bits/ 64 <1500000000>; + opp-microvolt = <1040000>; + }; +}; + &gmac0 { assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>; assigned-clock-parents = <&aoncrg JH7110_AONCLK_GMAC0_RMII_RTX>;
@@ -40,6 +59,19 @@ &i2c6 { status = "disabled"; }; +&mmc0_pins { + rst-pins { + pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, + GPOEN_ENABLE, + GPI_NONE)>; + bias-pull-up; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; +}; + &mmc1 { #address-cells = <1>; #size-cells = <0>;
arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts +46 -0
58 lines not on this page · raw message
arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +43 -0
58 lines not on this page · raw message
arch/riscv/boot/dts/starfive/jh7110.dtsi +0 -16
@@ -205,22 +205,6 @@ core4 { cpu_opp: opp-table-0 { compatible = "operating-points-v2"; opp-shared; - opp-375000000 { - opp-hz = /bits/ 64 <375000000>; - opp-microvolt = <800000>; - }; - opp-500000000 { - opp-hz = /bits/ 64 <500000000>; - opp-microvolt = <800000>; - }; - opp-750000000 { - opp-hz = /bits/ 64 <750000000>; - opp-microvolt = <800000>; - }; - opp-1500000000 { - opp-hz = /bits/ 64 <1500000000>; - opp-microvolt = <1040000>; - }; }; thermal-zones {
Signature · 7 lines
2.43.2 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Conor Dooley
maintainerRe: [PATCH v1 4/7] riscv: dts: starfive: jh7110-common: Move out some nodes to the board dts
Emil,
Quoted 3 lines · Hal Feng
Some node in this file are not used by the upcoming VisionFive 2 Lite board. Move them to the board dts to prepare for adding the new VisionFive 2 Lite device tree.
I definitely want your input as to whether these jh7110s devices should share the same common file as the devices using the regular jh7110.
Cheers,
Conor.
Quoted 424 lines
Reviewed-by E Shattow <[email protected]>Signed-off-by Hal Feng <[email protected]>--- .../boot/dts/starfive/jh7110-common.dtsi | 19 -------- .../jh7110-deepcomputing-fml13v01.dts | 46 +++++++++++++++++++ .../boot/dts/starfive/jh7110-milkv-mars.dts | 46 +++++++++++++++++++ .../dts/starfive/jh7110-milkv-marscm-emmc.dts | 9 ++++ .../dts/starfive/jh7110-milkv-marscm-lite.dts | 1 + .../dts/starfive/jh7110-milkv-marscm.dtsi | 32 +++++++++++++ .../dts/starfive/jh7110-pine64-star64.dts | 46 +++++++++++++++++++ .../jh7110-starfive-visionfive-2.dtsi | 43 +++++++++++++++++ arch/riscv/boot/dts/starfive/jh7110.dtsi | 16 ------- 9 files changed, 223 insertions(+), 35 deletions(-)arch/riscv/boot/dts/starfive/jh7110-common.dtsi +0
-19@@ -281,14 +281,8 @@ &mmc0 { assigned-clock-rates = <50000000>; bus-width = <8>; bootph-pre-ram; - cap-mmc-highspeed; - mmc-ddr-1_8v; - mmc-hs200-1_8v; - cap-mmc-hw-reset; pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; - vmmc-supply = <&vcc_3v3>; - vqmmc-supply = <&emmc_vdd>; status = "okay"; };@@ -298,8 +292,6 @@ &mmc1 { assigned-clock-rates = <50000000>; bus-width = <4>; bootph-pre-ram; - cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; - disable-wp; cap-sd-highspeed; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>;@@ -444,17 +436,6 @@ GPOEN_SYS_I2C6_DATA, }; mmc0_pins: mmc0-0 { - rst-pins { - pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, - GPOEN_ENABLE, - GPI_NONE)>; - bias-pull-up; - drive-strength = <12>; - input-disable; - input-schmitt-disable; - slew-rate = <0>; - }; - mmc-pins { pinmux = <PINMUX(PAD_SD0_CLK, 0)>, <PINMUX(PAD_SD0_CMD, 0)>,arch/riscv/boot/dts/starfive/jh7110-deepcomputing-fml13v01.dts +46
-0@@ -11,6 +11,52 @@ / { compatible = "deepcomputing,fml13v01", "starfive,jh7110"; }; +&cpu_opp { + opp-375000000 { + opp-hz = /bits/ 64 <375000000>; + opp-microvolt = <800000>; + }; + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <800000>; + }; + opp-750000000 { + opp-hz = /bits/ 64 <750000000>; + opp-microvolt = <800000>; + }; + opp-1500000000 { + opp-hz = /bits/ 64 <1500000000>; + opp-microvolt = <1040000>; + }; +}; + +&mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&emmc_vdd>; +}; + +&mmc0_pins { + rst-pins { + pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, + GPOEN_ENABLE, + GPI_NONE)>; + bias-pull-up; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; +}; + +&mmc1 { + cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; +}; + &pcie1 { perst-gpios = <&sysgpio 21 GPIO_ACTIVE_LOW>; phys = <&pciephy1>;arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts +46
-0@@ -11,6 +11,25 @@ / { compatible = "milkv,mars", "starfive,jh7110"; }; +&cpu_opp { + opp-375000000 { + opp-hz = /bits/ 64 <375000000>; + opp-microvolt = <800000>; + }; + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <800000>; + }; + opp-750000000 { + opp-hz = /bits/ 64 <750000000>; + opp-microvolt = <800000>; + }; + opp-1500000000 { + opp-hz = /bits/ 64 <1500000000>; + opp-microvolt = <1040000>; + }; +}; + &gmac0 { assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>; assigned-clock-parents = <&aoncrg JH7110_AONCLK_GMAC0_RMII_RTX>;@@ -22,6 +41,33 @@ &i2c0 { status = "okay"; }; +&mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&emmc_vdd>; +}; + +&mmc0_pins { + rst-pins { + pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, + GPOEN_ENABLE, + GPI_NONE)>; + bias-pull-up; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; +}; + +&mmc1 { + cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; +}; + &pcie0 { status = "okay"; };arch/riscv/boot/dts/starfive/jh7110-milkv-marscm-emmc.dts +9
-0@@ -10,3 +10,12 @@ / { model = "Milk-V Mars CM"; compatible = "milkv,marscm-emmc", "starfive,jh7110"; }; + +&mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&emmc_vdd>; +};arch/riscv/boot/dts/starfive/jh7110-milkv-marscm-lite.dts +1
-0@@ -14,6 +14,7 @@ / { &mmc0 { bus-width = <4>; cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; }; &mmc0_pins {arch/riscv/boot/dts/starfive/jh7110-milkv-marscm.dtsi +32
-0@@ -21,6 +21,25 @@ sdio_pwrseq: sdio-pwrseq { }; }; +&cpu_opp { + opp-375000000 { + opp-hz = /bits/ 64 <375000000>; + opp-microvolt = <800000>; + }; + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <800000>; + }; + opp-750000000 { + opp-hz = /bits/ 64 <750000000>; + opp-microvolt = <800000>; + }; + opp-1500000000 { + opp-hz = /bits/ 64 <1500000000>; + opp-microvolt = <1040000>; + }; +}; + &gmac0 { assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>; assigned-clock-parents = <&aoncrg JH7110_AONCLK_GMAC0_RMII_RTX>;@@ -40,6 +59,19 @@ &i2c6 { status = "disabled"; }; +&mmc0_pins { + rst-pins { + pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, + GPOEN_ENABLE, + GPI_NONE)>; + bias-pull-up; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; +}; + &mmc1 { #address-cells = <1>; #size-cells = <0>;arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts +46
-0@@ -14,6 +14,25 @@ aliases { }; }; +&cpu_opp { + opp-375000000 { + opp-hz = /bits/ 64 <375000000>; + opp-microvolt = <800000>; + }; + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <800000>; + }; + opp-750000000 { + opp-hz = /bits/ 64 <750000000>; + opp-microvolt = <800000>; + }; + opp-1500000000 { + opp-hz = /bits/ 64 <1500000000>; + opp-microvolt = <1040000>; + }; +}; + &gmac0 { starfive,tx-use-rgmii-clk; assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>;@@ -44,6 +63,33 @@ &i2c0 { status = "okay"; }; +&mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&emmc_vdd>; +}; + +&mmc0_pins { + rst-pins { + pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, + GPOEN_ENABLE, + GPI_NONE)>; + bias-pull-up; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; +}; + +&mmc1 { + cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; +}; + &pcie1 { status = "okay"; };arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +43
-0@@ -13,6 +13,25 @@ aliases { }; }; +&cpu_opp { + opp-375000000 { + opp-hz = /bits/ 64 <375000000>; + opp-microvolt = <800000>; + }; + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <800000>; + }; + opp-750000000 { + opp-hz = /bits/ 64 <750000000>; + opp-microvolt = <800000>; + }; + opp-1500000000 { + opp-hz = /bits/ 64 <1500000000>; + opp-microvolt = <1040000>; + }; +}; + &gmac0 { status = "okay"; };@@ -38,9 +57,33 @@ &i2c0 { }; &mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&emmc_vdd>; non-removable; }; +&mmc0_pins { + rst-pins { + pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, + GPOEN_ENABLE, + GPI_NONE)>; + bias-pull-up; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; +}; + +&mmc1 { + cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; +}; + &pcie0 { status = "okay"; };arch/riscv/boot/dts/starfive/jh7110.dtsi +0
-16@@ -205,22 +205,6 @@ core4 { cpu_opp: opp-table-0 { compatible = "operating-points-v2"; opp-shared; - opp-375000000 { - opp-hz = /bits/ 64 <375000000>; - opp-microvolt = <800000>; - }; - opp-500000000 { - opp-hz = /bits/ 64 <500000000>; - opp-microvolt = <800000>; - }; - opp-750000000 { - opp-hz = /bits/ 64 <750000000>; - opp-microvolt = <800000>; - }; - opp-1500000000 { - opp-hz = /bits/ 64 <1500000000>; - opp-microvolt = <1040000>; - }; }; thermal-zones {Signature · 7 lines
2.43.2 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v1 4/7] riscv: dts: starfive: jh7110-common: Move out some nodes to the board dts
In reply to Hal FengQuoted 409 lines · Hal Feng
Some node in this file are not used by the upcoming VisionFive 2 Lite board. Move them to the board dts to prepare for adding the new VisionFive 2 Lite device tree.
Reviewed-by E Shattow <[email protected]>Signed-off-by Hal Feng <[email protected]>--- .../boot/dts/starfive/jh7110-common.dtsi | 19 -------- .../jh7110-deepcomputing-fml13v01.dts | 46 +++++++++++++++++++ .../boot/dts/starfive/jh7110-milkv-mars.dts | 46 +++++++++++++++++++ .../dts/starfive/jh7110-milkv-marscm-emmc.dts | 9 ++++ .../dts/starfive/jh7110-milkv-marscm-lite.dts | 1 + .../dts/starfive/jh7110-milkv-marscm.dtsi | 32 +++++++++++++ .../dts/starfive/jh7110-pine64-star64.dts | 46 +++++++++++++++++++ .../jh7110-starfive-visionfive-2.dtsi | 43 +++++++++++++++++ arch/riscv/boot/dts/starfive/jh7110.dtsi | 16 ------- 9 files changed, 223 insertions(+), 35 deletions(-)arch/riscv/boot/dts/starfive/jh7110-common.dtsi +0
-19@@ -281,14 +281,8 @@ &mmc0 { assigned-clock-rates = <50000000>; bus-width = <8>; bootph-pre-ram; - cap-mmc-highspeed; - mmc-ddr-1_8v; - mmc-hs200-1_8v; - cap-mmc-hw-reset; pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; - vmmc-supply = <&vcc_3v3>; - vqmmc-supply = <&emmc_vdd>; status = "okay"; };@@ -298,8 +292,6 @@ &mmc1 { assigned-clock-rates = <50000000>; bus-width = <4>; bootph-pre-ram; - cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; - disable-wp; cap-sd-highspeed; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>;@@ -444,17 +436,6 @@ GPOEN_SYS_I2C6_DATA, }; mmc0_pins: mmc0-0 { - rst-pins { - pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, - GPOEN_ENABLE, - GPI_NONE)>; - bias-pull-up; - drive-strength = <12>; - input-disable; - input-schmitt-disable; - slew-rate = <0>; - }; - mmc-pins { pinmux = <PINMUX(PAD_SD0_CLK, 0)>, <PINMUX(PAD_SD0_CMD, 0)>,arch/riscv/boot/dts/starfive/jh7110-deepcomputing-fml13v01.dts +46
-0@@ -11,6 +11,52 @@ / { compatible = "deepcomputing,fml13v01", "starfive,jh7110"; }; +&cpu_opp { + opp-375000000 { + opp-hz = /bits/ 64 <375000000>; + opp-microvolt = <800000>; + }; + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <800000>; + }; + opp-750000000 { + opp-hz = /bits/ 64 <750000000>; + opp-microvolt = <800000>; + }; + opp-1500000000 { + opp-hz = /bits/ 64 <1500000000>; + opp-microvolt = <1040000>; + }; +}; + +&mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&emmc_vdd>; +}; + +&mmc0_pins { + rst-pins { + pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, + GPOEN_ENABLE, + GPI_NONE)>; + bias-pull-up; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; +}; + +&mmc1 { + cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; +}; + &pcie1 { perst-gpios = <&sysgpio 21 GPIO_ACTIVE_LOW>; phys = <&pciephy1>;arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts +46
-0@@ -11,6 +11,25 @@ / { compatible = "milkv,mars", "starfive,jh7110"; }; +&cpu_opp { + opp-375000000 { + opp-hz = /bits/ 64 <375000000>; + opp-microvolt = <800000>; + }; + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <800000>; + }; + opp-750000000 { + opp-hz = /bits/ 64 <750000000>; + opp-microvolt = <800000>; + }; + opp-1500000000 { + opp-hz = /bits/ 64 <1500000000>; + opp-microvolt = <1040000>; + }; +}; + &gmac0 { assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>; assigned-clock-parents = <&aoncrg JH7110_AONCLK_GMAC0_RMII_RTX>;@@ -22,6 +41,33 @@ &i2c0 { status = "okay"; }; +&mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&emmc_vdd>; +}; + +&mmc0_pins { + rst-pins { + pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, + GPOEN_ENABLE, + GPI_NONE)>; + bias-pull-up; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; +}; + +&mmc1 { + cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; +}; + &pcie0 { status = "okay"; };arch/riscv/boot/dts/starfive/jh7110-milkv-marscm-emmc.dts +9
-0@@ -10,3 +10,12 @@ / { model = "Milk-V Mars CM"; compatible = "milkv,marscm-emmc", "starfive,jh7110"; }; + +&mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&emmc_vdd>; +};arch/riscv/boot/dts/starfive/jh7110-milkv-marscm-lite.dts +1
-0@@ -14,6 +14,7 @@ / { &mmc0 { bus-width = <4>; cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; }; &mmc0_pins {arch/riscv/boot/dts/starfive/jh7110-milkv-marscm.dtsi +32
-0@@ -21,6 +21,25 @@ sdio_pwrseq: sdio-pwrseq { }; }; +&cpu_opp { + opp-375000000 { + opp-hz = /bits/ 64 <375000000>; + opp-microvolt = <800000>; + }; + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <800000>; + }; + opp-750000000 { + opp-hz = /bits/ 64 <750000000>; + opp-microvolt = <800000>; + }; + opp-1500000000 { + opp-hz = /bits/ 64 <1500000000>; + opp-microvolt = <1040000>; + }; +}; + &gmac0 { assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>; assigned-clock-parents = <&aoncrg JH7110_AONCLK_GMAC0_RMII_RTX>;@@ -40,6 +59,19 @@ &i2c6 { status = "disabled"; }; +&mmc0_pins { + rst-pins { + pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, + GPOEN_ENABLE, + GPI_NONE)>; + bias-pull-up; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; +}; + &mmc1 { #address-cells = <1>; #size-cells = <0>;arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts +46
-0@@ -14,6 +14,25 @@ aliases { }; }; +&cpu_opp { + opp-375000000 { + opp-hz = /bits/ 64 <375000000>; + opp-microvolt = <800000>; + }; + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <800000>; + }; + opp-750000000 { + opp-hz = /bits/ 64 <750000000>; + opp-microvolt = <800000>; + }; + opp-1500000000 { + opp-hz = /bits/ 64 <1500000000>; + opp-microvolt = <1040000>; + }; +}; + &gmac0 { starfive,tx-use-rgmii-clk; assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>;@@ -44,6 +63,33 @@ &i2c0 { status = "okay"; }; +&mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&emmc_vdd>; +}; + +&mmc0_pins { + rst-pins { + pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, + GPOEN_ENABLE, + GPI_NONE)>; + bias-pull-up; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; +}; + +&mmc1 { + cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; +}; + &pcie1 { status = "okay"; };arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +43
-0@@ -13,6 +13,25 @@ aliases { }; }; +&cpu_opp { + opp-375000000 { + opp-hz = /bits/ 64 <375000000>; + opp-microvolt = <800000>; + }; + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <800000>; + }; + opp-750000000 { + opp-hz = /bits/ 64 <750000000>; + opp-microvolt = <800000>; + }; + opp-1500000000 { + opp-hz = /bits/ 64 <1500000000>; + opp-microvolt = <1040000>; + }; +}; + &gmac0 { status = "okay"; };@@ -38,9 +57,33 @@ &i2c0 { }; &mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&emmc_vdd>; non-removable; }; +&mmc0_pins { + rst-pins { + pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, + GPOEN_ENABLE, + GPI_NONE)>; + bias-pull-up; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; +}; + +&mmc1 { + cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; +}; + &pcie0 { status = "okay"; };arch/riscv/boot/dts/starfive/jh7110.dtsi +0
-9@@ -205,22 +205,6 @@ core4 { cpu_opp: opp-table-0 { compatible = "operating-points-v2"; opp-shared; - opp-375000000 { - opp-hz = /bits/ 64 <375000000>; - opp-microvolt = <800000>; - }; - opp-500000000 { - opp-hz = /bits/ 64 <500000000>; - opp-microvolt = <800000>; - }; - opp-750000000 {
arch/riscv/boot/dts/starfive/jh7110.dtsi core4 { · line 210
Quoted 10 lines
arch/riscv/boot/dts/starfive/jh7110.dtsi +0
-7- opp-hz = /bits/ 64 <750000000>; - opp-microvolt = <800000>; - }; - opp-1500000000 { - opp-hz = /bits/ 64 <1500000000>; - opp-microvolt = <1040000>; - }; }; thermal-zones {
Emil, for your consideration:
jh711x.dtsi (formerly jh7110.dtsi)
jh711x-common.dtsi (formerly jh7110-common.dtsi, cut opp table and paste to jh7110-common.dtsi, cut out mmc definitions pasted elsewhere either to "mmc{0,1}-card, mmc{0,1}-emmc, mmc{0,1}-sdio" dtsi snippets or duplicated to board files)
jh7110-common.dtsi (includes jh711x-common.dtsi, adds opp table)
jh7110s-common.dtsi (includes jh711x-common.dtsi, adds opp table)
This makes sense to me having two additional dtsi files of the CPU operating power points (on what is apparently binned silicon) to maintain for supporting 8+ boards. The decision to split or not split out the mmc/sdio configuration into common dtsi snippets is less clear to me, but we do have examples now of all the uses (card, eMMC, SDIO) on each of the ports mmc0 mmc1 so it might have some benefit; for sure keeping these assumptions about mmc0 mmc1 functionality in the one '-common.dtsi' is an obstacle to adding sdio module configurations.
-E
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
RE: [PATCH v1 4/7] riscv: dts: starfive: jh7110-common: Move out some nodes to the board dts
Quoted 446 lines · E Shattow
Quoted 143 lines · Hal Feng
Some node in this file are not used by the upcoming VisionFive 2 Lite board. Move them to the board dts to prepare for adding the new VisionFive 2 Lite device tree.
Reviewed-by E Shattow <[email protected]>Signed-off-by Hal Feng <[email protected]>--- .../boot/dts/starfive/jh7110-common.dtsi | 19 -------- .../jh7110-deepcomputing-fml13v01.dts | 46 +++++++++++++++++++ .../boot/dts/starfive/jh7110-milkv-mars.dts | 46 +++++++++++++++++++ .../dts/starfive/jh7110-milkv-marscm-emmc.dts | 9 ++++ .../dts/starfive/jh7110-milkv-marscm-lite.dts | 1 + .../dts/starfive/jh7110-milkv-marscm.dtsi | 32 +++++++++++++ .../dts/starfive/jh7110-pine64-star64.dts | 46 +++++++++++++++++++ .../jh7110-starfive-visionfive-2.dtsi | 43 +++++++++++++++++ arch/riscv/boot/dts/starfive/jh7110.dtsi | 16 ------- 9 files changed, 223 insertions(+), 35 deletions(-)arch/riscv/boot/dts/starfive/jh7110-common.dtsi +0
-19@@ -281,14 +281,8 @@ &mmc0 { assigned-clock-rates = <50000000>; bus-width = <8>; bootph-pre-ram; - cap-mmc-highspeed; - mmc-ddr-1_8v; - mmc-hs200-1_8v; - cap-mmc-hw-reset; pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; - vmmc-supply = <&vcc_3v3>; - vqmmc-supply = <&emmc_vdd>; status = "okay"; };@@ -298,8 +292,6 @@ &mmc1 { assigned-clock-rates = <50000000>; bus-width = <4>; bootph-pre-ram; - cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; - disable-wp; cap-sd-highspeed; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>;@@ -444,17 +436,6 @@ GPOEN_SYS_I2C6_DATA, }; mmc0_pins: mmc0-0 { - rst-pins { - pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, - GPOEN_ENABLE, - GPI_NONE)>; - bias-pull-up; - drive-strength = <12>; - input-disable; - input-schmitt-disable; - slew-rate = <0>; - }; - mmc-pins { pinmux = <PINMUX(PAD_SD0_CLK, 0)>, <PINMUX(PAD_SD0_CMD, 0)>,diff --git
a/arch/riscv/boot/dts/starfive/jh7110-deepcomputing-fml13v01.dtsb/arch/riscv/boot/dts/starfive/jh7110-deepcomputing-fml13v01.dtsindexf2857d021d68..7535d62201f1100644arch/riscv/boot/dts/starfive/jh7110-deepcomputing-fml13v01.dts +46
-0@@ -11,6 +11,52 @@ / { compatible = "deepcomputing,fml13v01", "starfive,jh7110"; }; +&cpu_opp { + opp-375000000 { + opp-hz = /bits/ 64 <375000000>; + opp-microvolt = <800000>; + }; + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <800000>; + }; + opp-750000000 { + opp-hz = /bits/ 64 <750000000>; + opp-microvolt = <800000>; + }; + opp-1500000000 { + opp-hz = /bits/ 64 <1500000000>; + opp-microvolt = <1040000>; + }; +}; + +&mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&emmc_vdd>; +}; + +&mmc0_pins { + rst-pins { + pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, + GPOEN_ENABLE, + GPI_NONE)>; + bias-pull-up; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; +}; + +&mmc1 { + cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; +}; + &pcie1 { perst-gpios = <&sysgpio 21 GPIO_ACTIVE_LOW>; phys = <&pciephy1>;arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts +12
-0@@ -11,6 +11,25 @@ / { compatible = "milkv,mars", "starfive,jh7110"; }; +&cpu_opp { + opp-375000000 { + opp-hz = /bits/ 64 <375000000>; + opp-microvolt = <800000>; + }; + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <800000>; + }; + opp-750000000 { + opp-hz = /bits/ 64 <750000000>; + opp-microvolt = <800000>;arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts / { · line 34
Quoted 10 lines
arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts +7
-0+ }; + opp-1500000000 { + opp-hz = /bits/ 64 <1500000000>; + opp-microvolt = <1040000>; + }; +}; + &gmac0 { assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>; assigned-clock-parents = <&aoncrg
JH7110_AONCLK_GMAC0_RMII_RTX>; @@Quoted 85 lines
arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts +27
-1-22,6 +41,33 @@ &i2c0 { status = "okay"; }; +&mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&emmc_vdd>; +}; + +&mmc0_pins { + rst-pins { + pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, + GPOEN_ENABLE, + GPI_NONE)>; + bias-pull-up; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; +}; + +&mmc1 { + cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; +}; + &pcie0 { status = "okay"; };arch/riscv/boot/dts/starfive/jh7110-milkv-marscm-emmc.dts +9
-0@@ -10,3 +10,12 @@ / { model = "Milk-V Mars CM"; compatible = "milkv,marscm-emmc", "starfive,jh7110"; }; + +&mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&emmc_vdd>; +};arch/riscv/boot/dts/starfive/jh7110-milkv-marscm-lite.dts +1
-0@@ -14,6 +14,7 @@ / { &mmc0 { bus-width = <4>; cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; }; &mmc0_pins {arch/riscv/boot/dts/starfive/jh7110-milkv-marscm.dtsi +12
-0@@ -21,6 +21,25 @@ sdio_pwrseq: sdio-pwrseq { }; }; +&cpu_opp { + opp-375000000 { + opp-hz = /bits/ 64 <375000000>; + opp-microvolt = <800000>; + }; + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <800000>; + }; + opp-750000000 { + opp-hz = /bits/ 64 <750000000>; + opp-microvolt = <800000>;arch/riscv/boot/dts/starfive/jh7110-milkv-marscm.dtsi sdio_pwrseq: sdio-pwrseq { · line 45
Quoted 10 lines
arch/riscv/boot/dts/starfive/jh7110-milkv-marscm.dtsi +7
-0+ }; + opp-1500000000 { + opp-hz = /bits/ 64 <1500000000>; + opp-microvolt = <1040000>; + }; +}; + &gmac0 { assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>; assigned-clock-parents = <&aoncrg
JH7110_AONCLK_GMAC0_RMII_RTX>; @@Quoted 41 lines
-40,6 +59,19 @@ &i2c6 {
arch/riscv/boot/dts/starfive/jh7110-milkv-marscm.dtsi +13
-0status = "disabled"; }; +&mmc0_pins { + rst-pins { + pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, + GPOEN_ENABLE, + GPI_NONE)>; + bias-pull-up; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; +}; + &mmc1 { #address-cells = <1>; #size-cells = <0>;arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts +12
-0@@ -14,6 +14,25 @@ aliases { }; }; +&cpu_opp { + opp-375000000 { + opp-hz = /bits/ 64 <375000000>; + opp-microvolt = <800000>; + }; + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <800000>; + }; + opp-750000000 { + opp-hz = /bits/ 64 <750000000>; + opp-microvolt = <800000>;arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts aliases { · line 38
Quoted 10 lines
arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts +7
-0+ }; + opp-1500000000 { + opp-hz = /bits/ 64 <1500000000>; + opp-microvolt = <1040000>; + }; +}; + &gmac0 { starfive,tx-use-rgmii-clk; assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>; @@ -44,6 +63,33
Quoted 118 lines
@@ &i2c0 {
arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts +27
-0status = "okay"; }; +&mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&emmc_vdd>; +}; + +&mmc0_pins { + rst-pins { + pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, + GPOEN_ENABLE, + GPI_NONE)>; + bias-pull-up; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; +}; + +&mmc1 { + cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; +}; + &pcie1 { status = "okay"; };diff --git
a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsib/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsiindex5f14afb2c24d..9cd79fe30d19100644arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +43
-0@@ -13,6 +13,25 @@ aliases { }; }; +&cpu_opp { + opp-375000000 { + opp-hz = /bits/ 64 <375000000>; + opp-microvolt = <800000>; + }; + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <800000>; + }; + opp-750000000 { + opp-hz = /bits/ 64 <750000000>; + opp-microvolt = <800000>; + }; + opp-1500000000 { + opp-hz = /bits/ 64 <1500000000>; + opp-microvolt = <1040000>; + }; +}; + &gmac0 { status = "okay"; };@@ -38,9 +57,33 @@ &i2c0 { }; &mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&emmc_vdd>; non-removable; }; +&mmc0_pins { + rst-pins { + pinmux = <GPIOMUX(62, GPOUT_SYS_SDIO0_RST, + GPOEN_ENABLE, + GPI_NONE)>; + bias-pull-up; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; +}; + +&mmc1 { + cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; +}; + &pcie0 { status = "okay"; };arch/riscv/boot/dts/starfive/jh7110.dtsi +0
-9@@ -205,22 +205,6 @@ core4 { cpu_opp: opp-table-0 { compatible = "operating-points-v2"; opp-shared; - opp-375000000 { - opp-hz = /bits/ 64 <375000000>; - opp-microvolt = <800000>; - }; - opp-500000000 { - opp-hz = /bits/ 64 <500000000>; - opp-microvolt = <800000>; - }; - opp-750000000 {arch/riscv/boot/dts/starfive/jh7110.dtsi core4 { · line 210
Quoted 10 lines
arch/riscv/boot/dts/starfive/jh7110.dtsi +0
-7- opp-hz = /bits/ 64 <750000000>; - opp-microvolt = <800000>; - }; - opp-1500000000 { - opp-hz = /bits/ 64 <1500000000>; - opp-microvolt = <1040000>; - }; }; thermal-zones {Emil, for your consideration:
jh711x.dtsi(formerlyjh7110.dtsi)
jh711x-common.dtsi(formerlyjh7110-common.dtsi, cut opp table and paste tojh7110-common.dtsi, cut out mmc definitions pasted elsewhere either to "mmc{0,1}-card, mmc{0,1}-emmc, mmc{0,1}-sdio" dtsi snippets or duplicated to board files)
jh7110-common.dtsi(includesjh711x-common.dtsi, adds opp table)
jh7110s-common.dtsi(includesjh711x-common.dtsi, adds opp table)
Quoted 8 lines
This makes sense to me having two additional dtsi files of the CPU operating power points (on what is apparently binned silicon) to maintain for supporting 8+ boards. The decision to split or not split out the mmc/sdio configuration into common dtsi snippets is less clear to me, but we do have examples now of all the uses (card, eMMC, SDIO) on each of the ports mmc0 mmc1 so it might have some benefit; for sure keeping these assumptions about mmc0 mmc1 functionality in the one '
-common.dtsi' is an obstacle to adding sdio module configurations.
I agree with this suggestion. If there is no objection, I will send a new version for review.
Best regards,
Hal
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH 5/7 riscv: dts: starfive: Add common board dtsi for VisionFive 2 Lite variants
In reply to Hal FengAdd a common board dtsi for use by VisionFive 2 Lite and VisionFive 2 Lite eMMC.
--- .../jh7110s-starfive-visionfive-2-lite.dtsi | 145 ++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 arch/riscv/boot/dts/starfive/jh7110s-starfive-visionfive-2-lite.dtsi
arch/riscv/boot/dts/starfive/jh7110s-starfive-visionfive-2-lite.dtsi new file +145 -0
@@ -0,0 +1,145 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2025 StarFive Technology Co., Ltd. + * Copyright (C) 2025 Hal Feng <[email protected]> + */ + +/dts-v1/; +#include "jh7110-common.dtsi" + +&cpu_opp { + opp-312500000 { + opp-hz = /bits/ 64 <312500000>; + opp-microvolt = <800000>; + }; + opp-417000000 { + opp-hz = /bits/ 64 <417000000>; + opp-microvolt = <800000>; + }; + opp-625000000 { + opp-hz = /bits/ 64 <625000000>; + opp-microvolt = <800000>; + }; + opp-1250000000 { + opp-hz = /bits/ 64 <1250000000>; + opp-microvolt = <1000000>; + }; +}; + +&gmac0 { + starfive,tx-use-rgmii-clk; + assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>; + assigned-clock-parents = <&aoncrg JH7110_AONCLK_GMAC0_RMII_RTX>; + status = "okay"; +}; + +&i2c0 { + status = "okay"; +}; + +&mmc1 { + max-frequency = <50000000>; + keep-power-in-suspend; + non-removable; +}; + +&pcie1 { + enable-gpios = <&sysgpio 27 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&phy0 { + motorcomm,tx-clk-adj-enabled; + 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>; +}; + +&pwm { + status = "okay"; +}; + +&spi0 { + status = "okay"; +}; + +&syscrg { + assigned-clock-rates = <0>, <0>, <0>, <0>, <500000000>, <1250000000>; +}; + +&sysgpio { + uart1_pins: uart1-0 { + tx-pins { + pinmux = <GPIOMUX(22, GPOUT_SYS_UART1_TX, + GPOEN_ENABLE, + GPI_NONE)>; + bias-disable; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; + + rx-pins { + pinmux = <GPIOMUX(23, GPOUT_LOW, + GPOEN_DISABLE, + GPI_SYS_UART1_RX)>; + bias-pull-up; + drive-strength = <2>; + input-enable; + input-schmitt-enable; + slew-rate = <0>; + }; + + cts-pins { + pinmux = <GPIOMUX(24, GPOUT_LOW, + GPOEN_DISABLE, + GPI_SYS_UART1_CTS)>; + input-enable; + }; + + rts-pins { + pinmux = <GPIOMUX(25, GPOUT_SYS_UART1_RTS, + GPOEN_ENABLE, + GPI_NONE)>; + input-enable; + }; + }; + + usb0_pins: usb0-0 { + power-pins { + pinmux = <GPIOMUX(26, GPOUT_HIGH, + GPOEN_ENABLE, + GPI_NONE)>; + input-disable; + }; + + switch-pins { + pinmux = <GPIOMUX(62, GPOUT_LOW, + GPOEN_ENABLE, + GPI_NONE)>; + input-disable; + }; + }; +}; + +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&uart1_pins>; + status = "okay"; +}; + +&usb0 { + dr_mode = "host"; + pinctrl-names = "default"; + pinctrl-0 = <&usb0_pins>; + status = "okay"; +}; + +&usb_cdns3 { + phys = <&usbphy0>, <&pciephy0>; + phy-names = "cdns3,usb2-phy", "cdns3,usb3-phy"; +};
Signature · 7 lines
2.43.2 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH 6/7 riscv: dts: starfive: Add VisionFive 2 Lite board device tree
In reply to Hal FengVisionFive 2 Lite is a mini SBC based on the StarFive JH7110S SoC.
Board features:
- JH7110S SoC
- 4/8 GiB LPDDR4 DRAM
- AXP15060 PMIC
- 40 pin GPIO header
- 1x USB 3.0 host port
- 3x USB 2.0 host port
- 1x M.2 M-Key (size: 2242)
- 1x MicroSD slot (optional non-removable 64GiB eMMC)
- 1x QSPI Flash
- 1x I2C EEPROM
- 1x 1Gbps Ethernet port
- SDIO-based Wi-Fi & UART-based Bluetooth
- 1x HDMI port
- 1x 2-lane DSI
- 1x 2-lane CSI
VisionFive 2 Lite schematics: https://doc-en.rvspace.org/VisionFive2Lite/PDF/VF2_LITE_V1.10_TF_20250818_SCH.pdf
VisionFive 2 Lite Quick Start Guide: https://doc-en.rvspace.org/VisionFive2Lite/VisionFive2LiteQSG/index.html
More documents: https://doc-en.rvspace.org/Doc_Center/visionfive_2_lite.html
--- arch/riscv/boot/dts/starfive/Makefile | 2 ++ .../jh7110s-starfive-visionfive-2-lite.dts | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 arch/riscv/boot/dts/starfive/jh7110s-starfive-visionfive-2-lite.dts
arch/riscv/boot/dts/starfive/Makefile +2 -0
@@ -15,3 +15,5 @@ dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-milkv-marscm-lite.dtb dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-pine64-star64.dtb dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-v1.2a.dtb dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-v1.3b.dtb + +dtb-$(CONFIG_ARCH_STARFIVE) += jh7110s-starfive-visionfive-2-lite.dtb
arch/riscv/boot/dts/starfive/jh7110s-starfive-visionfive-2-lite.dts new file +20 -0
@@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2025 StarFive Technology Co., Ltd. + * Copyright (C) 2025 Hal Feng <[email protected]> + */ + +/dts-v1/; +#include "jh7110s-starfive-visionfive-2-lite.dtsi" + +/ { + model = "StarFive VisionFive 2 Lite"; + compatible = "starfive,visionfive-2-lite", "starfive,jh7110s"; +}; + +&mmc0 { + bus-width = <4>; + cd-gpios = <&sysgpio 41 GPIO_ACTIVE_HIGH>; + disable-wp; + cap-sd-highspeed; +};
Signature · 7 lines
2.43.2 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH 7/7 riscv: dts: starfive: Add VisionFive 2 Lite eMMC board device tree
In reply to Hal FengVisionFive 2 Lite eMMC board uses a non-removable onboard 64GiB eMMC instead of the MicroSD slot.
--- arch/riscv/boot/dts/starfive/Makefile | 1 + ...h7110s-starfive-visionfive-2-lite-emmc.dts | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 arch/riscv/boot/dts/starfive/jh7110s-starfive-visionfive-2-lite-emmc.dts
arch/riscv/boot/dts/starfive/Makefile +1 -0
@@ -17,3 +17,4 @@ dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-v1.2a.dtb dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-v1.3b.dtb dtb-$(CONFIG_ARCH_STARFIVE) += jh7110s-starfive-visionfive-2-lite.dtb +dtb-$(CONFIG_ARCH_STARFIVE) += jh7110s-starfive-visionfive-2-lite-emmc.dtb
arch/riscv/boot/dts/starfive/jh7110s-starfive-visionfive-2-lite-emmc.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2025 StarFive Technology Co., Ltd. + * Copyright (C) 2025 Hal Feng <[email protected]> + */ + +/dts-v1/; +#include "jh7110s-starfive-visionfive-2-lite.dtsi" + +/ { + model = "StarFive VisionFive 2 Lite eMMC"; + compatible = "starfive,visionfive-2-lite-emmc", "starfive,jh7110s"; +}; + +&mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&emmc_vdd>; +};
Signature · 7 lines
2.43.2 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv