CVS commit: src/sys/external/gpl2/dts/dist/arch/riscv/boot/dts

["Nick Hudson" <skrll%netbsd.org@localhost>]

Module Name:    src
Committed By:   skrll
Date:           Sun Jan 18 18:51:32 UTC 2026

Modified Files:
        src/sys/external/gpl2/dts/dist/arch/riscv/boot/dts/sophgo:
            cv1812h-huashan-pi.dts cv18xx.dtsi sg2042-milkv-pioneer.dts
            sg2042.dtsi
        src/sys/external/gpl2/dts/dist/arch/riscv/boot/dts/starfive:
            jh7110-common.dtsi jh7110-pinfunc.h
        src/sys/external/gpl2/dts/dist/arch/riscv/boot/dts/thead:
            th1520-beaglev-ahead.dts th1520-lichee-module-4a.dtsi
            th1520-lichee-pi-4a.dts th1520.dtsi

Log Message:
Fix merge botches


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
    src/sys/external/gpl2/dts/dist/arch/riscv/boot/dts/sophgo/cv1812h-huashan-pi.dts \
    src/sys/external/gpl2/dts/dist/arch/riscv/boot/dts/sophgo/cv18xx.dtsi
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/gpl2/dts/dist/arch/riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dts \
    src/sys/external/gpl2/dts/dist/arch/riscv/boot/dts/sophgo/sg2042.dtsi
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/gpl2/dts/dist/arch/riscv/boot/dts/starfive/jh7110-common.dtsi \
    src/sys/external/gpl2/dts/dist/arch/riscv/boot/dts/starfive/jh7110-pinfunc.h
cvs rdiff -u -r1.1 -r1.2 \
    src/sys/external/gpl2/dts/dist/arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts \
    src/sys/external/gpl2/dts/dist/arch/riscv/boot/dts/thead/th1520-lichee-module-4a.dtsi \
    src/sys/external/gpl2/dts/dist/arch/riscv/boot/dts/thead/th1520-lichee-pi-4a.dts
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/gpl2/dts/dist/arch/riscv/boot/dts/thead/th1520.dtsi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.