| Message ID | 20240924080650.1345485-4-sandie.cao@deepcomputing.io (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | Add Framework FRANME0000 dts | expand |
On 24/09/2024 10:06, Sandie Cao wrote: > Add framework dts to support RISC-V Framework Laptop 13 Mainboard. > > Signed-off-by: Sandie Cao <sandie.cao@deepcomputing.io> > --- > 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. > > diff --git a/arch/riscv/boot/dts/starfive/Makefile b/arch/riscv/boot/dts/starfive/Makefile > index 7a163a7d6ba3..3746f7122834 100644 > --- a/arch/riscv/boot/dts/starfive/Makefile > +++ b/arch/riscv/boot/dts/starfive/Makefile > @@ -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 > diff --git a/arch/riscv/boot/dts/starfive/jh7110-framework.dts b/arch/riscv/boot/dts/starfive/jh7110-framework.dts > new file mode 100644 > index 000000000000..ff12c24ebab3 > --- /dev/null > +++ b/arch/riscv/boot/dts/starfive/jh7110-framework.dts > @@ -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 <kernel@esmil.dk> > + */ > + > +/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"; Why PCIE0 is enabled in the DTSI in the first place? The same questions about MACs. Best regards, Krzysztof
On 2024-09-24 10:06, Sandie Cao wrote: > diff --git a/arch/riscv/boot/dts/starfive/jh7110-framework.dts > b/arch/riscv/boot/dts/starfive/jh7110-framework.dts > new file mode 100644 > index 000000000000..ff12c24ebab3 > --- /dev/null > +++ b/arch/riscv/boot/dts/starfive/jh7110-framework.dts > @@ -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 <kernel@esmil.dk> > + */ > + > +/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
On Tue, Sep 24, 2024 at 11:55:44AM +0200, Rafał Miłecki wrote: > On 2024-09-24 10:06, Sandie Cao wrote: > > diff --git a/arch/riscv/boot/dts/starfive/jh7110-framework.dts > > b/arch/riscv/boot/dts/starfive/jh7110-framework.dts > > new file mode 100644 > > index 000000000000..ff12c24ebab3 > > --- /dev/null > > +++ b/arch/riscv/boot/dts/starfive/jh7110-framework.dts > > @@ -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 <kernel@esmil.dk> > > + */ > > + > > +/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 I think "model" usually goes before compatible, I wouldn't change it here.
On 24/09/2024 10:52, 曹珊珊 wrote: > 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 > > On 24/09/2024 10:06, Sandie Cao wrote: >> Add framework dts to support RISC-V Framework Laptop 13 Mainboard. >> >> Signed-off-by: Sandie Cao <sandie.cao@deepcomputing.io> >> --- >> 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. So I am talking with myself? ... >> + status = "disabled"; >> +}; >> + >> +&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
On Tue, 24 Sep 2024 16:06:50 +0800, Sandie Cao wrote: > Add framework dts to support RISC-V Framework Laptop 13 Mainboard. > > Signed-off-by: Sandie Cao <sandie.cao@deepcomputing.io> > --- > 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 20240924080650.1345485-4-sandie.cao@deepcomputing.io: 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']
diff --git a/arch/riscv/boot/dts/starfive/Makefile b/arch/riscv/boot/dts/starfive/Makefile index 7a163a7d6ba3..3746f7122834 100644 --- a/arch/riscv/boot/dts/starfive/Makefile +++ b/arch/riscv/boot/dts/starfive/Makefile @@ -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 diff --git a/arch/riscv/boot/dts/starfive/jh7110-framework.dts b/arch/riscv/boot/dts/starfive/jh7110-framework.dts new file mode 100644 index 000000000000..ff12c24ebab3 --- /dev/null +++ b/arch/riscv/boot/dts/starfive/jh7110-framework.dts @@ -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 <kernel@esmil.dk> + */ + +/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"; +};
Add framework dts to support RISC-V Framework Laptop 13 Mainboard. Signed-off-by: Sandie Cao <sandie.cao@deepcomputing.io> --- 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