| Message ID | 20230221024645.127922-20-hal.feng@starfivetech.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Conor Dooley |
| Headers | show |
| Series | Basic clock, reset & device tree support for StarFive JH7110 RISC-V SoC | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/tree_selection | fail | Failed to apply to next/pending-fixes or riscv/for-next |
On Tue, 21 Feb 2023 at 03:47, Hal Feng <hal.feng@starfivetech.com> wrote: > From: Emil Renner Berthing <kernel@esmil.dk> > > Add a minimal device tree for StarFive JH7110 VisionFive 2 board > which has version A and version B. Support booting and basic > clock/reset/pinctrl/uart drivers. > > Acked-by: Conor Dooley <conor.dooley@microchip.com> > Signed-off-by: Emil Renner Berthing <kernel@esmil.dk> > Co-developed-by: Jianlong Huang <jianlong.huang@starfivetech.com> > Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com> > Co-developed-by: Hal Feng <hal.feng@starfivetech.com> > Signed-off-by: Hal Feng <hal.feng@starfivetech.com> > --- > arch/riscv/boot/dts/starfive/Makefile | 6 +- > .../jh7110-starfive-visionfive-2-v1.2a.dts | 13 ++ > .../jh7110-starfive-visionfive-2-v1.3b.dts | 13 ++ > .../jh7110-starfive-visionfive-2.dtsi | 215 ++++++++++++++++++ > 4 files changed, 246 insertions(+), 1 deletion(-) > create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.2a.dts > create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts > create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > > diff --git a/arch/riscv/boot/dts/starfive/Makefile b/arch/riscv/boot/dts/starfive/Makefile > index 039c143cba33..cd73519b907b 100644 > --- a/arch/riscv/boot/dts/starfive/Makefile > +++ b/arch/riscv/boot/dts/starfive/Makefile > @@ -1,2 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0 > -dtb-$(CONFIG_SOC_STARFIVE) += jh7100-beaglev-starlight.dtb jh7100-starfive-visionfive-v1.dtb > +dtb-$(CONFIG_SOC_STARFIVE) += jh7100-beaglev-starlight.dtb > +dtb-$(CONFIG_SOC_STARFIVE) += jh7100-starfive-visionfive-v1.dtb > + > +dtb-$(CONFIG_SOC_STARFIVE) += jh7110-starfive-visionfive-2-v1.2a.dtb > +dtb-$(CONFIG_SOC_STARFIVE) += jh7110-starfive-visionfive-2-v1.3b.dtb > diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.2a.dts b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.2a.dts > new file mode 100644 > index 000000000000..4af3300f3cf3 > --- /dev/null > +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.2a.dts > @@ -0,0 +1,13 @@ > +// SPDX-License-Identifier: GPL-2.0 OR MIT > +/* > + * Copyright (C) 2022 StarFive Technology Co., Ltd. > + * Copyright (C) 2022 Emil Renner Berthing <kernel@esmil.dk> > + */ > + > +/dts-v1/; > +#include "jh7110-starfive-visionfive-2.dtsi" > + > +/ { > + model = "StarFive VisionFive 2 v1.2A"; > + compatible = "starfive,visionfive-2-v1.2a", "starfive,jh7110"; > +}; > diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts > new file mode 100644 > index 000000000000..9230cc3d8946 > --- /dev/null > +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts > @@ -0,0 +1,13 @@ > +// SPDX-License-Identifier: GPL-2.0 OR MIT > +/* > + * Copyright (C) 2022 StarFive Technology Co., Ltd. > + * Copyright (C) 2022 Emil Renner Berthing <kernel@esmil.dk> > + */ > + > +/dts-v1/; > +#include "jh7110-starfive-visionfive-2.dtsi" > + > +/ { > + model = "StarFive VisionFive 2 v1.3B"; > + compatible = "starfive,visionfive-2-v1.3b", "starfive,jh7110"; > +}; > diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > new file mode 100644 > index 000000000000..c2aa8946a0f1 > --- /dev/null > +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > @@ -0,0 +1,215 @@ > +// SPDX-License-Identifier: GPL-2.0 OR MIT > +/* > + * Copyright (C) 2022 StarFive Technology Co., Ltd. > + * Copyright (C) 2022 Emil Renner Berthing <kernel@esmil.dk> > + */ > + > +/dts-v1/; > +#include "jh7110.dtsi" > +#include "jh7110-pinfunc.h" > +#include <dt-bindings/gpio/gpio.h> > + > +/ { > + aliases { > + serial0 = &uart0; > + i2c0 = &i2c0; > + i2c2 = &i2c2; > + i2c5 = &i2c5; > + i2c6 = &i2c6; Let's keep these sorted alphabetically. > + }; > + > + chosen { > + stdout-path = "serial0:115200n8"; > + }; > + > + cpus { > + timebase-frequency = <4000000>; > + }; > + > + memory@40000000 { > + device_type = "memory"; > + reg = <0x0 0x40000000 0x1 0x0>; > + }; > + > + gpio-restart { > + compatible = "gpio-restart"; > + gpios = <&sysgpio 35 GPIO_ACTIVE_HIGH>; > + priority = <224>; > + }; > +}; > + > +&osc { > + clock-frequency = <24000000>; > +}; > + > +&rtc_osc { > + clock-frequency = <32768>; > +}; > + > +&gmac0_rmii_refin { > + clock-frequency = <50000000>; > +}; > + > +&gmac0_rgmii_rxin { > + clock-frequency = <125000000>; > +}; > + > +&gmac1_rmii_refin { > + clock-frequency = <50000000>; > +}; > + > +&gmac1_rgmii_rxin { > + clock-frequency = <125000000>; > +}; > + > +&i2stx_bclk_ext { > + clock-frequency = <12288000>; > +}; > + > +&i2stx_lrck_ext { > + clock-frequency = <192000>; > +}; > + > +&i2srx_bclk_ext { > + clock-frequency = <12288000>; > +}; > + > +&i2srx_lrck_ext { > + clock-frequency = <192000>; > +}; > + > +&tdm_ext { > + clock-frequency = <49152000>; > +}; > + > +&mclk_ext { > + clock-frequency = <12288000>; > +}; > + > +&uart0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart0_pins>; > + status = "okay"; > +}; > + > +&i2c0 { > + clock-frequency = <100000>; > + i2c-sda-hold-time-ns = <300>; > + i2c-sda-falling-time-ns = <510>; > + i2c-scl-falling-time-ns = <510>; > + pinctrl-names = "default"; > + pinctrl-0 = <&i2c0_pins>; > + status = "okay"; > +}; > + > +&i2c2 { > + clock-frequency = <100000>; > + i2c-sda-hold-time-ns = <300>; > + i2c-sda-falling-time-ns = <510>; > + i2c-scl-falling-time-ns = <510>; > + pinctrl-names = "default"; > + pinctrl-0 = <&i2c2_pins>; > + status = "okay"; > +}; > + > +&i2c5 { > + clock-frequency = <100000>; > + i2c-sda-hold-time-ns = <300>; > + i2c-sda-falling-time-ns = <510>; > + i2c-scl-falling-time-ns = <510>; > + pinctrl-names = "default"; > + pinctrl-0 = <&i2c5_pins>; > + status = "okay"; > +}; > + > +&i2c6 { > + clock-frequency = <100000>; > + i2c-sda-hold-time-ns = <300>; > + i2c-sda-falling-time-ns = <510>; > + i2c-scl-falling-time-ns = <510>; > + pinctrl-names = "default"; > + pinctrl-0 = <&i2c6_pins>; > + status = "okay"; > +}; > + > +&sysgpio { > + uart0_pins: uart0-0 { > + tx-pins { > + pinmux = <GPIOMUX(5, GPOUT_SYS_UART0_TX, > + GPOEN_ENABLE, > + GPI_NONE)>; > + bias-disable; > + drive-strength = <12>; > + input-disable; > + input-schmitt-disable; > + slew-rate = <0>; > + }; > + > + rx-pins { > + pinmux = <GPIOMUX(6, GPOUT_LOW, > + GPOEN_DISABLE, > + GPI_SYS_UART0_RX)>; > + bias-disable; /* external pull-up */ > + drive-strength = <2>; > + input-enable; > + input-schmitt-enable; > + slew-rate = <0>; > + }; > + }; > + > + i2c0_pins: i2c0-0 { > + i2c-pins { > + pinmux = <GPIOMUX(57, GPOUT_LOW, > + GPOEN_SYS_I2C0_CLK, > + GPI_SYS_I2C0_CLK)>, > + <GPIOMUX(58, GPOUT_LOW, > + GPOEN_SYS_I2C0_DATA, > + GPI_SYS_I2C0_DATA)>; > + bias-disable; /* external pull-up */ > + input-enable; > + input-schmitt-enable; > + }; > + }; > + > + i2c2_pins: i2c2-0 { > + i2c-pins { > + pinmux = <GPIOMUX(3, GPOUT_LOW, > + GPOEN_SYS_I2C2_CLK, > + GPI_SYS_I2C2_CLK)>, > + <GPIOMUX(2, GPOUT_LOW, > + GPOEN_SYS_I2C2_DATA, > + GPI_SYS_I2C2_DATA)>; > + bias-disable; /* external pull-up */ > + input-enable; > + input-schmitt-enable; > + }; > + }; > + > + i2c5_pins: i2c5-0 { > + i2c-pins { > + pinmux = <GPIOMUX(19, GPOUT_LOW, > + GPOEN_SYS_I2C5_CLK, > + GPI_SYS_I2C5_CLK)>, > + <GPIOMUX(20, GPOUT_LOW, > + GPOEN_SYS_I2C5_DATA, > + GPI_SYS_I2C5_DATA)>; > + bias-disable; /* external pull-up */ > + input-enable; > + input-schmitt-enable; > + }; > + }; > + > + i2c6_pins: i2c6-0 { > + i2c-pins { > + pinmux = <GPIOMUX(16, GPOUT_LOW, > + GPOEN_SYS_I2C6_CLK, > + GPI_SYS_I2C6_CLK)>, > + <GPIOMUX(17, GPOUT_LOW, > + GPOEN_SYS_I2C6_DATA, > + GPI_SYS_I2C6_DATA)>; > + bias-disable; /* external pull-up */ > + input-enable; > + input-schmitt-enable; > + }; > + }; > +}; It would be great to have some sort of order to this file so it's obvious where to add new nodes. I suggest we do - root node - external clocks - other node references in alphabetical order You're almost there with this patch except the uart0 node is out of place. /Emil > 2.38.1 >
On Tue, 21 Feb 2023 16:03:08 +0100, Emil Renner Berthing wrote: > On Tue, 21 Feb 2023 at 03:47, Hal Feng <hal.feng@starfivetech.com> wrote: >> From: Emil Renner Berthing <kernel@esmil.dk> >> >> Add a minimal device tree for StarFive JH7110 VisionFive 2 board >> which has version A and version B. Support booting and basic >> clock/reset/pinctrl/uart drivers. >> >> Acked-by: Conor Dooley <conor.dooley@microchip.com> >> Signed-off-by: Emil Renner Berthing <kernel@esmil.dk> >> Co-developed-by: Jianlong Huang <jianlong.huang@starfivetech.com> >> Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com> >> Co-developed-by: Hal Feng <hal.feng@starfivetech.com> >> Signed-off-by: Hal Feng <hal.feng@starfivetech.com> >> --- >> arch/riscv/boot/dts/starfive/Makefile | 6 +- >> .../jh7110-starfive-visionfive-2-v1.2a.dts | 13 ++ >> .../jh7110-starfive-visionfive-2-v1.3b.dts | 13 ++ >> .../jh7110-starfive-visionfive-2.dtsi | 215 ++++++++++++++++++ >> 4 files changed, 246 insertions(+), 1 deletion(-) >> create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.2a.dts >> create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts >> create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi >> >> diff --git a/arch/riscv/boot/dts/starfive/Makefile b/arch/riscv/boot/dts/starfive/Makefile >> index 039c143cba33..cd73519b907b 100644 >> --- a/arch/riscv/boot/dts/starfive/Makefile >> +++ b/arch/riscv/boot/dts/starfive/Makefile >> @@ -1,2 +1,6 @@ >> # SPDX-License-Identifier: GPL-2.0 >> -dtb-$(CONFIG_SOC_STARFIVE) += jh7100-beaglev-starlight.dtb jh7100-starfive-visionfive-v1.dtb >> +dtb-$(CONFIG_SOC_STARFIVE) += jh7100-beaglev-starlight.dtb >> +dtb-$(CONFIG_SOC_STARFIVE) += jh7100-starfive-visionfive-v1.dtb >> + >> +dtb-$(CONFIG_SOC_STARFIVE) += jh7110-starfive-visionfive-2-v1.2a.dtb >> +dtb-$(CONFIG_SOC_STARFIVE) += jh7110-starfive-visionfive-2-v1.3b.dtb >> diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.2a.dts b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.2a.dts >> new file mode 100644 >> index 000000000000..4af3300f3cf3 >> --- /dev/null >> +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.2a.dts >> @@ -0,0 +1,13 @@ >> +// SPDX-License-Identifier: GPL-2.0 OR MIT >> +/* >> + * Copyright (C) 2022 StarFive Technology Co., Ltd. >> + * Copyright (C) 2022 Emil Renner Berthing <kernel@esmil.dk> >> + */ >> + >> +/dts-v1/; >> +#include "jh7110-starfive-visionfive-2.dtsi" >> + >> +/ { >> + model = "StarFive VisionFive 2 v1.2A"; >> + compatible = "starfive,visionfive-2-v1.2a", "starfive,jh7110"; >> +}; >> diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts >> new file mode 100644 >> index 000000000000..9230cc3d8946 >> --- /dev/null >> +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts >> @@ -0,0 +1,13 @@ >> +// SPDX-License-Identifier: GPL-2.0 OR MIT >> +/* >> + * Copyright (C) 2022 StarFive Technology Co., Ltd. >> + * Copyright (C) 2022 Emil Renner Berthing <kernel@esmil.dk> >> + */ >> + >> +/dts-v1/; >> +#include "jh7110-starfive-visionfive-2.dtsi" >> + >> +/ { >> + model = "StarFive VisionFive 2 v1.3B"; >> + compatible = "starfive,visionfive-2-v1.3b", "starfive,jh7110"; >> +}; >> diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi >> new file mode 100644 >> index 000000000000..c2aa8946a0f1 >> --- /dev/null >> +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi >> @@ -0,0 +1,215 @@ >> +// SPDX-License-Identifier: GPL-2.0 OR MIT >> +/* >> + * Copyright (C) 2022 StarFive Technology Co., Ltd. >> + * Copyright (C) 2022 Emil Renner Berthing <kernel@esmil.dk> >> + */ >> + >> +/dts-v1/; >> +#include "jh7110.dtsi" >> +#include "jh7110-pinfunc.h" >> +#include <dt-bindings/gpio/gpio.h> >> + >> +/ { >> + aliases { >> + serial0 = &uart0; >> + i2c0 = &i2c0; >> + i2c2 = &i2c2; >> + i2c5 = &i2c5; >> + i2c6 = &i2c6; > > Let's keep these sorted alphabetically. OK, will fix it. > >> + }; >> + >> + chosen { >> + stdout-path = "serial0:115200n8"; >> + }; >> + >> + cpus { >> + timebase-frequency = <4000000>; >> + }; >> + >> + memory@40000000 { >> + device_type = "memory"; >> + reg = <0x0 0x40000000 0x1 0x0>; >> + }; >> + >> + gpio-restart { >> + compatible = "gpio-restart"; >> + gpios = <&sysgpio 35 GPIO_ACTIVE_HIGH>; >> + priority = <224>; >> + }; >> +}; >> + >> +&osc { >> + clock-frequency = <24000000>; >> +}; >> + >> +&rtc_osc { >> + clock-frequency = <32768>; >> +}; >> + >> +&gmac0_rmii_refin { >> + clock-frequency = <50000000>; >> +}; >> + >> +&gmac0_rgmii_rxin { >> + clock-frequency = <125000000>; >> +}; >> + >> +&gmac1_rmii_refin { >> + clock-frequency = <50000000>; >> +}; >> + >> +&gmac1_rgmii_rxin { >> + clock-frequency = <125000000>; >> +}; >> + >> +&i2stx_bclk_ext { >> + clock-frequency = <12288000>; >> +}; >> + >> +&i2stx_lrck_ext { >> + clock-frequency = <192000>; >> +}; >> + >> +&i2srx_bclk_ext { >> + clock-frequency = <12288000>; >> +}; >> + >> +&i2srx_lrck_ext { >> + clock-frequency = <192000>; >> +}; >> + >> +&tdm_ext { >> + clock-frequency = <49152000>; >> +}; >> + >> +&mclk_ext { >> + clock-frequency = <12288000>; >> +}; >> + >> +&uart0 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&uart0_pins>; >> + status = "okay"; >> +}; >> + >> +&i2c0 { >> + clock-frequency = <100000>; >> + i2c-sda-hold-time-ns = <300>; >> + i2c-sda-falling-time-ns = <510>; >> + i2c-scl-falling-time-ns = <510>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&i2c0_pins>; >> + status = "okay"; >> +}; >> + >> +&i2c2 { >> + clock-frequency = <100000>; >> + i2c-sda-hold-time-ns = <300>; >> + i2c-sda-falling-time-ns = <510>; >> + i2c-scl-falling-time-ns = <510>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&i2c2_pins>; >> + status = "okay"; >> +}; >> + >> +&i2c5 { >> + clock-frequency = <100000>; >> + i2c-sda-hold-time-ns = <300>; >> + i2c-sda-falling-time-ns = <510>; >> + i2c-scl-falling-time-ns = <510>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&i2c5_pins>; >> + status = "okay"; >> +}; >> + >> +&i2c6 { >> + clock-frequency = <100000>; >> + i2c-sda-hold-time-ns = <300>; >> + i2c-sda-falling-time-ns = <510>; >> + i2c-scl-falling-time-ns = <510>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&i2c6_pins>; >> + status = "okay"; >> +}; >> + >> +&sysgpio { >> + uart0_pins: uart0-0 { >> + tx-pins { >> + pinmux = <GPIOMUX(5, GPOUT_SYS_UART0_TX, >> + GPOEN_ENABLE, >> + GPI_NONE)>; >> + bias-disable; >> + drive-strength = <12>; >> + input-disable; >> + input-schmitt-disable; >> + slew-rate = <0>; >> + }; >> + >> + rx-pins { >> + pinmux = <GPIOMUX(6, GPOUT_LOW, >> + GPOEN_DISABLE, >> + GPI_SYS_UART0_RX)>; >> + bias-disable; /* external pull-up */ >> + drive-strength = <2>; >> + input-enable; >> + input-schmitt-enable; >> + slew-rate = <0>; >> + }; >> + }; >> + >> + i2c0_pins: i2c0-0 { >> + i2c-pins { >> + pinmux = <GPIOMUX(57, GPOUT_LOW, >> + GPOEN_SYS_I2C0_CLK, >> + GPI_SYS_I2C0_CLK)>, >> + <GPIOMUX(58, GPOUT_LOW, >> + GPOEN_SYS_I2C0_DATA, >> + GPI_SYS_I2C0_DATA)>; >> + bias-disable; /* external pull-up */ >> + input-enable; >> + input-schmitt-enable; >> + }; >> + }; >> + >> + i2c2_pins: i2c2-0 { >> + i2c-pins { >> + pinmux = <GPIOMUX(3, GPOUT_LOW, >> + GPOEN_SYS_I2C2_CLK, >> + GPI_SYS_I2C2_CLK)>, >> + <GPIOMUX(2, GPOUT_LOW, >> + GPOEN_SYS_I2C2_DATA, >> + GPI_SYS_I2C2_DATA)>; >> + bias-disable; /* external pull-up */ >> + input-enable; >> + input-schmitt-enable; >> + }; >> + }; >> + >> + i2c5_pins: i2c5-0 { >> + i2c-pins { >> + pinmux = <GPIOMUX(19, GPOUT_LOW, >> + GPOEN_SYS_I2C5_CLK, >> + GPI_SYS_I2C5_CLK)>, >> + <GPIOMUX(20, GPOUT_LOW, >> + GPOEN_SYS_I2C5_DATA, >> + GPI_SYS_I2C5_DATA)>; >> + bias-disable; /* external pull-up */ >> + input-enable; >> + input-schmitt-enable; >> + }; >> + }; >> + >> + i2c6_pins: i2c6-0 { >> + i2c-pins { >> + pinmux = <GPIOMUX(16, GPOUT_LOW, >> + GPOEN_SYS_I2C6_CLK, >> + GPI_SYS_I2C6_CLK)>, >> + <GPIOMUX(17, GPOUT_LOW, >> + GPOEN_SYS_I2C6_DATA, >> + GPI_SYS_I2C6_DATA)>; >> + bias-disable; /* external pull-up */ >> + input-enable; >> + input-schmitt-enable; >> + }; >> + }; >> +}; > > It would be great to have some sort of order to this file so it's > obvious where to add new nodes. I suggest we do > - root node > - external clocks > - other node references in alphabetical order > > You're almost there with this patch except the uart0 node is out of place. Will fix accordingly. Thanks for your suggestions. Best regards, Hal
On Thu, Feb 23, 2023 at 04:50:20PM +0800, Hal Feng wrote: > On Tue, 21 Feb 2023 16:03:08 +0100, Emil Renner Berthing wrote: > > On Tue, 21 Feb 2023 at 03:47, Hal Feng <hal.feng@starfivetech.com> wrote: > >> From: Emil Renner Berthing <kernel@esmil.dk> > >> > >> Add a minimal device tree for StarFive JH7110 VisionFive 2 board > >> which has version A and version B. Support booting and basic > >> clock/reset/pinctrl/uart drivers. > >> > >> Acked-by: Conor Dooley <conor.dooley@microchip.com> > >> Signed-off-by: Emil Renner Berthing <kernel@esmil.dk> > >> Co-developed-by: Jianlong Huang <jianlong.huang@starfivetech.com> > >> Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com> > >> Co-developed-by: Hal Feng <hal.feng@starfivetech.com> > >> Signed-off-by: Hal Feng <hal.feng@starfivetech.com> > >> --- > >> arch/riscv/boot/dts/starfive/Makefile | 6 +- > >> .../jh7110-starfive-visionfive-2-v1.2a.dts | 13 ++ > >> .../jh7110-starfive-visionfive-2-v1.3b.dts | 13 ++ > >> .../jh7110-starfive-visionfive-2.dtsi | 215 ++++++++++++++++++ > >> 4 files changed, 246 insertions(+), 1 deletion(-) > >> create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.2a.dts > >> create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts > >> create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > >> > >> diff --git a/arch/riscv/boot/dts/starfive/Makefile b/arch/riscv/boot/dts/starfive/Makefile > >> index 039c143cba33..cd73519b907b 100644 > >> --- a/arch/riscv/boot/dts/starfive/Makefile > >> +++ b/arch/riscv/boot/dts/starfive/Makefile > >> @@ -1,2 +1,6 @@ > >> # SPDX-License-Identifier: GPL-2.0 > >> -dtb-$(CONFIG_SOC_STARFIVE) += jh7100-beaglev-starlight.dtb jh7100-starfive-visionfive-v1.dtb > >> +dtb-$(CONFIG_SOC_STARFIVE) += jh7100-beaglev-starlight.dtb > >> +dtb-$(CONFIG_SOC_STARFIVE) += jh7100-starfive-visionfive-v1.dtb > >> + > >> +dtb-$(CONFIG_SOC_STARFIVE) += jh7110-starfive-visionfive-2-v1.2a.dtb > >> +dtb-$(CONFIG_SOC_STARFIVE) += jh7110-starfive-visionfive-2-v1.3b.dtb If you could rebase on top of v6.3-rc1 for the next version & use ARCH_ not SOC_ here that'd be great. > >> +/ { > >> + aliases { > >> + serial0 = &uart0; > >> + i2c0 = &i2c0; > >> + i2c2 = &i2c2; > >> + i2c5 = &i2c5; > >> + i2c6 = &i2c6; > > > > Let's keep these sorted alphabetically. > > OK, will fix it. > > > It would be great to have some sort of order to this file so it's > > obvious where to add new nodes. I suggest we do > > - root node > > - external clocks > > - other node references in alphabetical order > > > > You're almost there with this patch except the uart0 node is out of place. > > Will fix accordingly. Thanks for your suggestions. With Emil's suggestions implemented: Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Thanks, Conor.
On Mon, Feb 27, 2023 at 06:12:40PM +0000, Conor Dooley wrote: > On Thu, Feb 23, 2023 at 04:50:20PM +0800, Hal Feng wrote: > > On Tue, 21 Feb 2023 16:03:08 +0100, Emil Renner Berthing wrote: > > > On Tue, 21 Feb 2023 at 03:47, Hal Feng <hal.feng@starfivetech.com> wrote: > > >> From: Emil Renner Berthing <kernel@esmil.dk> > > >> > > >> Add a minimal device tree for StarFive JH7110 VisionFive 2 board > > >> which has version A and version B. Support booting and basic > > >> clock/reset/pinctrl/uart drivers. > > >> > > >> Acked-by: Conor Dooley <conor.dooley@microchip.com> > > >> Signed-off-by: Emil Renner Berthing <kernel@esmil.dk> > > >> Co-developed-by: Jianlong Huang <jianlong.huang@starfivetech.com> > > >> Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com> > > >> Co-developed-by: Hal Feng <hal.feng@starfivetech.com> > > >> Signed-off-by: Hal Feng <hal.feng@starfivetech.com> > > >> --- > > >> arch/riscv/boot/dts/starfive/Makefile | 6 +- > > >> .../jh7110-starfive-visionfive-2-v1.2a.dts | 13 ++ > > >> .../jh7110-starfive-visionfive-2-v1.3b.dts | 13 ++ > > >> .../jh7110-starfive-visionfive-2.dtsi | 215 ++++++++++++++++++ > > >> 4 files changed, 246 insertions(+), 1 deletion(-) > > >> create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.2a.dts > > >> create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts > > >> create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > > >> > > >> diff --git a/arch/riscv/boot/dts/starfive/Makefile b/arch/riscv/boot/dts/starfive/Makefile > > >> index 039c143cba33..cd73519b907b 100644 > > >> --- a/arch/riscv/boot/dts/starfive/Makefile > > >> +++ b/arch/riscv/boot/dts/starfive/Makefile > > >> @@ -1,2 +1,6 @@ > > >> # SPDX-License-Identifier: GPL-2.0 > > >> -dtb-$(CONFIG_SOC_STARFIVE) += jh7100-beaglev-starlight.dtb jh7100-starfive-visionfive-v1.dtb > > >> +dtb-$(CONFIG_SOC_STARFIVE) += jh7100-beaglev-starlight.dtb > > >> +dtb-$(CONFIG_SOC_STARFIVE) += jh7100-starfive-visionfive-v1.dtb > > >> + > > >> +dtb-$(CONFIG_SOC_STARFIVE) += jh7110-starfive-visionfive-2-v1.2a.dtb > > >> +dtb-$(CONFIG_SOC_STARFIVE) += jh7110-starfive-visionfive-2-v1.3b.dtb > > If you could rebase on top of v6.3-rc1 for the next version & use ARCH_ > not SOC_ here that'd be great. > > > >> +/ { > > >> + aliases { > > >> + serial0 = &uart0; > > >> + i2c0 = &i2c0; > > >> + i2c2 = &i2c2; > > >> + i2c5 = &i2c5; > > >> + i2c6 = &i2c6; > > > > > > Let's keep these sorted alphabetically. > > > > OK, will fix it. > > > > > > It would be great to have some sort of order to this file so it's > > > obvious where to add new nodes. I suggest we do > > > - root node > > > - external clocks > > > - other node references in alphabetical order > > > > > > You're almost there with this patch except the uart0 node is out of place. > > > > Will fix accordingly. Thanks for your suggestions. > > With Emil's suggestions implemented: > Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Actually, there's one thing that I don't think was (explicitly?) mentioned, could you sort the external clocks alphanumerically too? Cheers, Conor.
On Mon, 27 Feb 2023 20:00:33 +0000, Conor Dooley wrote: > On Mon, Feb 27, 2023 at 06:12:40PM +0000, Conor Dooley wrote: >> On Thu, Feb 23, 2023 at 04:50:20PM +0800, Hal Feng wrote: >> > On Tue, 21 Feb 2023 16:03:08 +0100, Emil Renner Berthing wrote: >> > > On Tue, 21 Feb 2023 at 03:47, Hal Feng <hal.feng@starfivetech.com> wrote: >> > >> From: Emil Renner Berthing <kernel@esmil.dk> >> > >> >> > >> Add a minimal device tree for StarFive JH7110 VisionFive 2 board >> > >> which has version A and version B. Support booting and basic >> > >> clock/reset/pinctrl/uart drivers. >> > >> >> > >> Acked-by: Conor Dooley <conor.dooley@microchip.com> >> > >> Signed-off-by: Emil Renner Berthing <kernel@esmil.dk> >> > >> Co-developed-by: Jianlong Huang <jianlong.huang@starfivetech.com> >> > >> Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com> >> > >> Co-developed-by: Hal Feng <hal.feng@starfivetech.com> >> > >> Signed-off-by: Hal Feng <hal.feng@starfivetech.com> >> > >> --- >> > >> arch/riscv/boot/dts/starfive/Makefile | 6 +- >> > >> .../jh7110-starfive-visionfive-2-v1.2a.dts | 13 ++ >> > >> .../jh7110-starfive-visionfive-2-v1.3b.dts | 13 ++ >> > >> .../jh7110-starfive-visionfive-2.dtsi | 215 ++++++++++++++++++ >> > >> 4 files changed, 246 insertions(+), 1 deletion(-) >> > >> create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.2a.dts >> > >> create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts >> > >> create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi >> > >> >> > >> diff --git a/arch/riscv/boot/dts/starfive/Makefile b/arch/riscv/boot/dts/starfive/Makefile >> > >> index 039c143cba33..cd73519b907b 100644 >> > >> --- a/arch/riscv/boot/dts/starfive/Makefile >> > >> +++ b/arch/riscv/boot/dts/starfive/Makefile >> > >> @@ -1,2 +1,6 @@ >> > >> # SPDX-License-Identifier: GPL-2.0 >> > >> -dtb-$(CONFIG_SOC_STARFIVE) += jh7100-beaglev-starlight.dtb jh7100-starfive-visionfive-v1.dtb >> > >> +dtb-$(CONFIG_SOC_STARFIVE) += jh7100-beaglev-starlight.dtb >> > >> +dtb-$(CONFIG_SOC_STARFIVE) += jh7100-starfive-visionfive-v1.dtb >> > >> + >> > >> +dtb-$(CONFIG_SOC_STARFIVE) += jh7110-starfive-visionfive-2-v1.2a.dtb >> > >> +dtb-$(CONFIG_SOC_STARFIVE) += jh7110-starfive-visionfive-2-v1.3b.dtb >> >> If you could rebase on top of v6.3-rc1 for the next version & use ARCH_ >> not SOC_ here that'd be great. I will use the ARCH_ symbol instead and tell the other people from StarFive to do so. >> >> > >> +/ { >> > >> + aliases { >> > >> + serial0 = &uart0; >> > >> + i2c0 = &i2c0; >> > >> + i2c2 = &i2c2; >> > >> + i2c5 = &i2c5; >> > >> + i2c6 = &i2c6; >> > > >> > > Let's keep these sorted alphabetically. >> > >> > OK, will fix it. >> > >> >> > > It would be great to have some sort of order to this file so it's >> > > obvious where to add new nodes. I suggest we do >> > > - root node >> > > - external clocks >> > > - other node references in alphabetical order >> > > >> > > You're almost there with this patch except the uart0 node is out of place. >> > >> > Will fix accordingly. Thanks for your suggestions. >> >> With Emil's suggestions implemented: >> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> > > Actually, there's one thing that I don't think was (explicitly?) mentioned, > could you sort the external clocks alphanumerically too? OK. I will sort them in the next version. Thanks. Best regards, Hal
diff --git a/arch/riscv/boot/dts/starfive/Makefile b/arch/riscv/boot/dts/starfive/Makefile index 039c143cba33..cd73519b907b 100644 --- a/arch/riscv/boot/dts/starfive/Makefile +++ b/arch/riscv/boot/dts/starfive/Makefile @@ -1,2 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_SOC_STARFIVE) += jh7100-beaglev-starlight.dtb jh7100-starfive-visionfive-v1.dtb +dtb-$(CONFIG_SOC_STARFIVE) += jh7100-beaglev-starlight.dtb +dtb-$(CONFIG_SOC_STARFIVE) += jh7100-starfive-visionfive-v1.dtb + +dtb-$(CONFIG_SOC_STARFIVE) += jh7110-starfive-visionfive-2-v1.2a.dtb +dtb-$(CONFIG_SOC_STARFIVE) += jh7110-starfive-visionfive-2-v1.3b.dtb diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.2a.dts b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.2a.dts new file mode 100644 index 000000000000..4af3300f3cf3 --- /dev/null +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.2a.dts @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2022 StarFive Technology Co., Ltd. + * Copyright (C) 2022 Emil Renner Berthing <kernel@esmil.dk> + */ + +/dts-v1/; +#include "jh7110-starfive-visionfive-2.dtsi" + +/ { + model = "StarFive VisionFive 2 v1.2A"; + compatible = "starfive,visionfive-2-v1.2a", "starfive,jh7110"; +}; diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts new file mode 100644 index 000000000000..9230cc3d8946 --- /dev/null +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2022 StarFive Technology Co., Ltd. + * Copyright (C) 2022 Emil Renner Berthing <kernel@esmil.dk> + */ + +/dts-v1/; +#include "jh7110-starfive-visionfive-2.dtsi" + +/ { + model = "StarFive VisionFive 2 v1.3B"; + compatible = "starfive,visionfive-2-v1.3b", "starfive,jh7110"; +}; diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi new file mode 100644 index 000000000000..c2aa8946a0f1 --- /dev/null +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi @@ -0,0 +1,215 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2022 StarFive Technology Co., Ltd. + * Copyright (C) 2022 Emil Renner Berthing <kernel@esmil.dk> + */ + +/dts-v1/; +#include "jh7110.dtsi" +#include "jh7110-pinfunc.h" +#include <dt-bindings/gpio/gpio.h> + +/ { + aliases { + serial0 = &uart0; + i2c0 = &i2c0; + i2c2 = &i2c2; + i2c5 = &i2c5; + i2c6 = &i2c6; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + cpus { + timebase-frequency = <4000000>; + }; + + memory@40000000 { + device_type = "memory"; + reg = <0x0 0x40000000 0x1 0x0>; + }; + + gpio-restart { + compatible = "gpio-restart"; + gpios = <&sysgpio 35 GPIO_ACTIVE_HIGH>; + priority = <224>; + }; +}; + +&osc { + clock-frequency = <24000000>; +}; + +&rtc_osc { + clock-frequency = <32768>; +}; + +&gmac0_rmii_refin { + clock-frequency = <50000000>; +}; + +&gmac0_rgmii_rxin { + clock-frequency = <125000000>; +}; + +&gmac1_rmii_refin { + clock-frequency = <50000000>; +}; + +&gmac1_rgmii_rxin { + clock-frequency = <125000000>; +}; + +&i2stx_bclk_ext { + clock-frequency = <12288000>; +}; + +&i2stx_lrck_ext { + clock-frequency = <192000>; +}; + +&i2srx_bclk_ext { + clock-frequency = <12288000>; +}; + +&i2srx_lrck_ext { + clock-frequency = <192000>; +}; + +&tdm_ext { + clock-frequency = <49152000>; +}; + +&mclk_ext { + clock-frequency = <12288000>; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins>; + status = "okay"; +}; + +&i2c0 { + clock-frequency = <100000>; + i2c-sda-hold-time-ns = <300>; + i2c-sda-falling-time-ns = <510>; + i2c-scl-falling-time-ns = <510>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; + status = "okay"; +}; + +&i2c2 { + clock-frequency = <100000>; + i2c-sda-hold-time-ns = <300>; + i2c-sda-falling-time-ns = <510>; + i2c-scl-falling-time-ns = <510>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c2_pins>; + status = "okay"; +}; + +&i2c5 { + clock-frequency = <100000>; + i2c-sda-hold-time-ns = <300>; + i2c-sda-falling-time-ns = <510>; + i2c-scl-falling-time-ns = <510>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c5_pins>; + status = "okay"; +}; + +&i2c6 { + clock-frequency = <100000>; + i2c-sda-hold-time-ns = <300>; + i2c-sda-falling-time-ns = <510>; + i2c-scl-falling-time-ns = <510>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c6_pins>; + status = "okay"; +}; + +&sysgpio { + uart0_pins: uart0-0 { + tx-pins { + pinmux = <GPIOMUX(5, GPOUT_SYS_UART0_TX, + GPOEN_ENABLE, + GPI_NONE)>; + bias-disable; + drive-strength = <12>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; + + rx-pins { + pinmux = <GPIOMUX(6, GPOUT_LOW, + GPOEN_DISABLE, + GPI_SYS_UART0_RX)>; + bias-disable; /* external pull-up */ + drive-strength = <2>; + input-enable; + input-schmitt-enable; + slew-rate = <0>; + }; + }; + + i2c0_pins: i2c0-0 { + i2c-pins { + pinmux = <GPIOMUX(57, GPOUT_LOW, + GPOEN_SYS_I2C0_CLK, + GPI_SYS_I2C0_CLK)>, + <GPIOMUX(58, GPOUT_LOW, + GPOEN_SYS_I2C0_DATA, + GPI_SYS_I2C0_DATA)>; + bias-disable; /* external pull-up */ + input-enable; + input-schmitt-enable; + }; + }; + + i2c2_pins: i2c2-0 { + i2c-pins { + pinmux = <GPIOMUX(3, GPOUT_LOW, + GPOEN_SYS_I2C2_CLK, + GPI_SYS_I2C2_CLK)>, + <GPIOMUX(2, GPOUT_LOW, + GPOEN_SYS_I2C2_DATA, + GPI_SYS_I2C2_DATA)>; + bias-disable; /* external pull-up */ + input-enable; + input-schmitt-enable; + }; + }; + + i2c5_pins: i2c5-0 { + i2c-pins { + pinmux = <GPIOMUX(19, GPOUT_LOW, + GPOEN_SYS_I2C5_CLK, + GPI_SYS_I2C5_CLK)>, + <GPIOMUX(20, GPOUT_LOW, + GPOEN_SYS_I2C5_DATA, + GPI_SYS_I2C5_DATA)>; + bias-disable; /* external pull-up */ + input-enable; + input-schmitt-enable; + }; + }; + + i2c6_pins: i2c6-0 { + i2c-pins { + pinmux = <GPIOMUX(16, GPOUT_LOW, + GPOEN_SYS_I2C6_CLK, + GPI_SYS_I2C6_CLK)>, + <GPIOMUX(17, GPOUT_LOW, + GPOEN_SYS_I2C6_DATA, + GPI_SYS_I2C6_DATA)>; + bias-disable; /* external pull-up */ + input-enable; + input-schmitt-enable; + }; + }; +};