Module Name: src
Committed By: jmcneill
Date: Sun Nov 7 16:57:40 UTC 2021
Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: bcm2835-common.dtsi
bcm2835-rpi-zero-w.dts bcm2835-rpi.dtsi bcm283x.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner:
sun50i-h5-nanopi-neo-plus2.dts sun50i-h6-pine-h64.dts
sun50i-h6.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic: Makefile
meson-gx.dtsi meson-gxbb.dtsi meson-gxl.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm:
vexpress-v2m-rs1.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip:
rk3328-rock64.dts
src/sys/external/gpl2/dts/dist/include/dt-bindings/clock:
sun50i-h6-r-ccu.h
src/sys/external/gpl2/dts/dist/include/dt-bindings/input:
linux-event-codes.h
src/sys/external/gpl2/dts/dist/include/dt-bindings/reset:
sun50i-h6-r-ccu.h
Added Files:
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic:
meson-g12b-odroid-n2-plus.dts
Removed Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: at91-kizboxmini.dts
atlas6-evb.dts atlas6.dtsi atlas7-evb.dts atlas7.dtsi
efm32gg-dk3750.dts efm32gg.dtsi imx6q-dhcom-som.dtsi
mt8135-pinfunc.h picoxcell-pc3x2.dtsi picoxcell-pc3x3.dtsi
picoxcell-pc7302-pc3x2.dts picoxcell-pc7302-pc3x3.dts
prima2-evb.dts prima2.dtsi ste-href-ab8505.dtsi
ste-href-tvk1281618.dtsi ste-u300.dts stm32h743-pinctrl.dtsi
stm32mp157-pinctrl.dtsi stm32mp157c.dtsi stm32mp157xaa-pinctrl.dtsi
stm32mp157xab-pinctrl.dtsi stm32mp157xac-pinctrl.dtsi
stm32mp157xad-pinctrl.dtsi tango4-common.dtsi tango4-smp8758.dtsi
tango4-vantage-1172.dts zx296702-ad1.dts zx296702.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/al: Makefile
alpine-v2-evp.dts alpine-v2.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/stingray:
stingray-sata.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/mediatek:
mt8183-pinfunc.h
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom:
apq8016-sbc-pmic-pins.dtsi apq8016-sbc-soc-pins.dtsi
apq8096-db820c-pins.dtsi apq8096-db820c-pmic-pins.dtsi
msm8992-pins.dtsi msm8994-pins.dtsi msm8994-smd-rpm.dtsi
msm8996-pins.dtsi msm8998-pins.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas:
r8a7795-es1-h3ulcb-kf.dts r8a7795-es1-h3ulcb.dts
r8a7795-es1-salvator-x.dts r8a7795-es1.dtsi r8a7795-h3ulcb-kf.dts
r8a7795-h3ulcb.dts r8a7795-salvator-x.dts r8a7795-salvator-xs.dts
r8a7795.dtsi r8a7796-m3ulcb-kf.dts r8a7796-m3ulcb.dts
r8a7796-salvator-x.dts r8a7796-salvator-xs.dts r8a7796.dtsi
r8a77965-m3nulcb-kf.dts r8a77965-m3nulcb.dts
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip:
rk3399-rock-pi-4.dts
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/xilinx:
zynqmp-clk.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/zte: Makefile
zx296718-evb.dts zx296718-pcbox.dts zx296718.dtsi
src/sys/external/gpl2/dts/dist/include/dt-bindings/clk: ti-dra7-atl.h
src/sys/external/gpl2/dts/dist/include/dt-bindings/clock:
zx296702-clock.h zx296718-clock.h
src/sys/external/gpl2/dts/dist/include/dt-bindings/soc:
zte,pm_domains.h
Log Message:
Merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/at91-kizboxmini.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/stm32mp157c.dtsi
cvs rdiff -u -r1.1.1.3 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/atlas6-evb.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/atlas6.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/atlas7-evb.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/atlas7.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/efm32gg-dk3750.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6q-dhcom-som.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts
\
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts
\
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/prima2-evb.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/prima2.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-href-tvk1281618.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/tango4-common.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/tango4-smp8758.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/tango4-vantage-1172.dts
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
cvs rdiff -u -r1.1.1.2 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/efm32gg.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/mt8135-pinfunc.h \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-href-ab8505.dtsi
cvs rdiff -u -r1.1.1.4 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/picoxcell-pc3x2.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/picoxcell-pc3x3.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-u300.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/zx296702-ad1.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/zx296702.dtsi
cvs rdiff -u -r1.1.1.7 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/stm32h743-pinctrl.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/stm32mp157xaa-pinctrl.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/stm32mp157xab-pinctrl.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/stm32mp157xac-pinctrl.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/stm32mp157xad-pinctrl.dtsi
cvs rdiff -u -r1.1.1.3 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/al/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/al/alpine-v2-evp.dts
cvs rdiff -u -r1.1.1.2 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/al/alpine-v2.dtsi
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/Makefile
cvs rdiff -u -r0 -r1.3 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gx.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi
cvs rdiff -u -r1.1.1.3 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/stingray/stingray-sata.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/mediatek/mt8183-pinfunc.h
cvs rdiff -u -r1.1.1.3 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/msm8992-pins.dtsi
cvs rdiff -u -r1.1.1.2 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/msm8994-pins.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/msm8998-pins.dtsi
cvs rdiff -u -r1.1.1.5 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi
cvs rdiff -u -r1.1.1.4 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi
cvs rdiff -u -r1.1.1.2 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts
cvs rdiff -u -r1.1.1.6 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
cvs rdiff -u -r1.1.1.7 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
cvs rdiff -u -r1.1.1.4 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
cvs rdiff -u -r1.1.1.8 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
cvs rdiff -u -r1.1.1.9 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7796.dtsi
cvs rdiff -u -r1.1.1.5 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dts
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a77965-m3nulcb.dts
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
cvs rdiff -u -r1.1.1.2 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
cvs rdiff -u -r1.1.1.2 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi
cvs rdiff -u -r1.1.1.4 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/zte/Makefile \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/zte/zx296718.dtsi
cvs rdiff -u -r1.1.1.3 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/zte/zx296718-evb.dts
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/zte/zx296718-pcbox.dts
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/clk/ti-dra7-atl.h
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/clock/sun50i-h6-r-ccu.h
cvs rdiff -u -r1.1.1.2 -r0 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/clock/zx296702-clock.h
cvs rdiff -u -r1.1.1.3 -r0 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/clock/zx296718-clock.h
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/reset/sun50i-h6-r-ccu.h
cvs rdiff -u -r1.1.1.2 -r0 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/soc/zte,pm_domains.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
