| Message ID | IA1PR20MB4953267AE83D7E6FED7C06ADBBD5A@IA1PR20MB4953.namprd20.prod.outlook.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add Huashan Pi board support | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
On 18/10/2023 13:31, Inochi Amaoto wrote: > As CV180x and CV181x have the identical layouts, it is OK to use the > cv1800b basic device tree for the whole series. > > Signed-off-by: Inochi Amaoto <inochiama@outlook.com> > --- > arch/riscv/boot/dts/sophgo/{cv1800b.dtsi => cv18xx.dtsi} | 0 > 1 file changed, 0 insertions(+), 0 deletions(-) > rename arch/riscv/boot/dts/sophgo/{cv1800b.dtsi => cv18xx.dtsi} (100%) > If nothing breaks by this commit, means the file is not used, so how did it end up in the kernel? Best regards, Krzysztof
>On 18/10/2023 13:31, Inochi Amaoto wrote: >> As CV180x and CV181x have the identical layouts, it is OK to use the >> cv1800b basic device tree for the whole series. >> >> Signed-off-by: Inochi Amaoto <inochiama@outlook.com> >> --- >> arch/riscv/boot/dts/sophgo/{cv1800b.dtsi => cv18xx.dtsi} | 0 >> 1 file changed, 0 insertions(+), 0 deletions(-) >> rename arch/riscv/boot/dts/sophgo/{cv1800b.dtsi => cv18xx.dtsi} (100%) >> > >If nothing breaks by this commit, means the file is not used, so how did >it end up in the kernel? > This commit breaks the including file cv1800b-milkv-duo.dts, which is fixed in the next patch. For cv1800b, it only needs to set compatible strings. The cv1800b and cv1812h have identical layout. I use this commit to avoid wired output provided by git and make the change more clear. > >Best regards, >Krzysztof > >
On 18/10/2023 14:37, Inochi Amaoto wrote: >> On 18/10/2023 13:31, Inochi Amaoto wrote: >>> As CV180x and CV181x have the identical layouts, it is OK to use the >>> cv1800b basic device tree for the whole series. >>> >>> Signed-off-by: Inochi Amaoto <inochiama@outlook.com> >>> --- >>> arch/riscv/boot/dts/sophgo/{cv1800b.dtsi => cv18xx.dtsi} | 0 >>> 1 file changed, 0 insertions(+), 0 deletions(-) >>> rename arch/riscv/boot/dts/sophgo/{cv1800b.dtsi => cv18xx.dtsi} (100%) >>> >> >> If nothing breaks by this commit, means the file is not used, so how did >> it end up in the kernel? >> > > This commit breaks the including file cv1800b-milkv-duo.dts, which is > fixed in the next patch. For cv1800b, it only needs to set compatible > strings. The cv1800b and cv1812h have identical layout. You must preserve bisectability. > > I use this commit to avoid wired output provided by git and make the > change more clear. Don't do this. Previous patch was ok and readable. I don't understand how this split helps (except breaking bisectability). Best regards, Krzysztof
diff --git a/arch/riscv/boot/dts/sophgo/cv1800b.dtsi b/arch/riscv/boot/dts/sophgo/cv18xx.dtsi
similarity index 100%
rename from arch/riscv/boot/dts/sophgo/cv1800b.dtsi
rename to arch/riscv/boot/dts/sophgo/cv18xx.dtsi
As CV180x and CV181x have the identical layouts, it is OK to use the cv1800b basic device tree for the whole series. Signed-off-by: Inochi Amaoto <inochiama@outlook.com> --- arch/riscv/boot/dts/sophgo/{cv1800b.dtsi => cv18xx.dtsi} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename arch/riscv/boot/dts/sophgo/{cv1800b.dtsi => cv18xx.dtsi} (100%) -- 2.42.0