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

2020-02-22 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sat Feb 22 09:54:27 UTC 2020

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts:
bcm2835-rpi-zero-w.dts

Log Message:
Define pinctrl-names for sdhci to fix it. From Harold Gutch and discussed
on port-arm.

http://mail-index.netbsd.org/port-arm/2020/02/13/msg006497.html


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts

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

Modified files:

Index: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
diff -u src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts:1.1.1.4 src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts:1.2
--- src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts:1.1.1.4	Fri Jan  3 14:33:09 2020
+++ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts	Sat Feb 22 09:54:27 2020
@@ -112,6 +112,7 @@
  {
 	#address-cells = <1>;
 	#size-cells = <0>;
+	pinctrl-names = "default";
 	pinctrl-0 = <_gpio34 _gpio43>;
 	bus-width = <4>;
 	mmc-pwrseq = <_pwrseq>;

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

2020-01-03 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Fri Jan  3 16:29:42 UTC 2020

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner:
sun50i-h6-pine-h64.dts

Log Message:
Fix merge botch (uwb3 is no more. it is now dwc3)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts

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

Modified files:

Index: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
diff -u src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.6 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.7
--- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.6	Fri Jan  3 15:04:33 2020
+++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts	Fri Jan  3 16:29:42 2020
@@ -280,10 +280,6 @@
 	status = "okay";
 };
 
- {
-	status = "okay";
-};
-
  {
 	phy-supply = <_usb_vbus>;
 	status = "okay";

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

2020-01-03 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Fri Jan  3 15:40:38 UTC 2020

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: bcm2835-common.dtsi

Log Message:
Fix merge botch


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi

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

Modified files:

Index: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi:1.2 src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi:1.3
--- src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi:1.2	Fri Jan  3 15:04:33 2020
+++ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi	Fri Jan  3 15:40:38 2020
@@ -74,14 +74,14 @@
 			compatible = "brcm,bcm2835-pixelvalve0";
 			reg = <0x7e206000 0x100>;
 			interrupts = <2 13>; /* pwa0 */
-			status = "disabled"
+			status = "disabled";
 		};
 
 		pixelvalve@7e207000 {
 			compatible = "brcm,bcm2835-pixelvalve1";
 			reg = <0x7e207000 0x100>;
 			interrupts = <2 14>; /* pwa1 */
-			status = "disabled"
+			status = "disabled";
 		};
 
 		thermal: thermal@7e212000 {
@@ -106,7 +106,7 @@
 			compatible = "brcm,bcm2835-pixelvalve2";
 			reg = <0x7e807000 0x100>;
 			interrupts = <2 10>; /* pixelvalve */
-			status = "disabled"
+			status = "disabled";
 		};
 
 		hdmi: hdmi@7e902000 {

CVS commit: src/sys/external/gpl2/dts/dist

2020-01-03 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Fri Jan  3 15:04:34 UTC 2020

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: bcm2835-common.dtsi
bcm2835-rpi.dtsi bcm283x.dtsi sun8i-a23-ippo-q8h-v1.2.dts
sun8i-a23-ippo-q8h-v5.dts sun8i-a33-et-q8-v1.6.dts
sun8i-a33-ippo-q8h-v1.2.dts
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:
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/input:
linux-event-codes.h
src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl:
stm32-pinfunc.h
Removed Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: at91-kizbox2.dts
imx6ul-phytec-pcl063.dtsi imx6ul-phytec-peb-eval-01.dtsi
imx6ul-phytec-phyboard-segin-full.dts
imx6ul-phytec-phyboard-segin.dtsi rk3288-fennec.dts
src/sys/external/gpl2/dts/dist/include/dt-bindings/clock:
xlnx,zynqmp-clk.h

Log Message:
Merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/at91-kizbox2.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/rk3288-fennec.dts
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6ul-phytec-pcl063.dtsi \

src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6ul-phytec-peb-eval-01.dtsi 
\

src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6ul-phytec-phyboard-segin-full.dts
 \

src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6ul-phytec-phyboard-segin.dtsi
cvs rdiff -u -r1.4 -r1.5 \

src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts
cvs rdiff -u -r1.2 -r1.3 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
cvs rdiff -u -r1.5 -r1.6 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
cvs rdiff -u -r1.6 -r1.7 \
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/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.5 -r1.6 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi
cvs rdiff -u -r1.3 -r1.4 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/clock/xlnx,zynqmp-clk.h
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h

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

Modified files:

Index: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi:1.1.1.1 src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi:1.2
--- src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi:1.1.1.1	Fri Jan  3 14:33:15 2020
+++ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi	Fri Jan  3 15:04:33 2020
@@ -74,12 +74,14 @@
 			compatible = "brcm,bcm2835-pixelvalve0";
 			reg = <0x7e206000 0x100>;
 			interrupts = <2 13>; /* pwa0 */
+			status = "disabled"
 		};
 
 		pixelvalve@7e207000 {
 			compatible = "brcm,bcm2835-pixelvalve1";
 			reg = <0x7e207000 0x100>;
 			interrupts = <2 14>; /* pwa1 */
+			status = "disabled"
 		};
 
 		thermal: thermal@7e212000 {
@@ -104,6 +106,7 @@
 			compatible = "brcm,bcm2835-pixelvalve2";
 			reg = <0x7e807000 0x100>;
 			interrupts = <2 10>; /* pixelvalve */
+			status = "disabled"
 		};
 
 		hdmi: hdmi@7e902000 {
@@ -125,11 +128,17 @@

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

2019-04-19 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Fri Apr 19 19:46:46 UTC 2019

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic:
meson-gxl.dtsi

Log Message:
Add the clock inputs of the clock controllers, from
https://github.com/torvalds/linux/commit/16361ff23e20d2f967456fab9971152331b65117


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi

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

Modified files:

Index: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi:1.1.1.7 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi:1.2
--- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi:1.1.1.7	Tue Jan 22 14:57:03 2019
+++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi	Fri Apr 19 19:46:46 2019
@@ -239,6 +239,8 @@
 
 _AO {
 	compatible = "amlogic,meson-gxl-aoclkc", "amlogic,meson-gx-aoclkc";
+	clocks = <>, < CLKID_CLK81>;
+	clock-names = "xtal", "mpeg-clk";
 };
 
 _intc {
@@ -263,6 +265,8 @@
 	clkc: clock-controller {
 		compatible = "amlogic,gxl-clkc";
 		#clock-cells = <1>;
+		clocks = <>;
+		clock-names = "xtal";
 	};
 };

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

2019-03-06 Thread Jonathan A. Kollasch 
Module Name:src
Committed By:   jakllsch
Date:   Wed Mar  6 19:09:36 UTC 2019

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner:
sun50i-h5-nanopi-neo-plus2.dts

Log Message:
Fix GPIO line for NanoPi NEO Plus2 status LED.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts

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

Modified files:

Index: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
diff -u src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts:1.1.1.2 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts:1.2
--- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts:1.1.1.2	Sat Apr 28 18:25:53 2018
+++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts	Wed Mar  6 19:09:36 2019
@@ -71,8 +71,8 @@
 		};
 
 		status {
-			label = "nanopi:red:status";
-			gpios = < 0 20 GPIO_ACTIVE_HIGH>;
+			label = "nanopi:blue:status";
+			gpios = < 0 10 GPIO_ACTIVE_HIGH>;
 		};
 	};

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

2019-03-02 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sat Mar  2 12:25:15 UTC 2019

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic:
meson-gx.dtsi

Log Message:
Fix IRQ trigger type for macirq, from upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gx.dtsi

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

Modified files:

Index: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gx.dtsi:1.1.1.6 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gx.dtsi:1.2
--- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gx.dtsi:1.1.1.6	Tue Jan 22 14:57:03 2019
+++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gx.dtsi	Sat Mar  2 12:25:15 2019
@@ -462,7 +462,7 @@
 			compatible = "amlogic,meson-gx-dwmac", "amlogic,meson-gxbb-dwmac", "snps,dwmac";
 			reg = <0x0 0xc941 0x0 0x1
 			   0x0 0xc8834540 0x0 0x4>;
-			interrupts = ;
+			interrupts = ;
 			interrupt-names = "macirq";
 			status = "disabled";
 		};

CVS commit: src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl

2019-01-26 Thread Robert Elz 
Module Name:src
Committed By:   kre
Date:   Sun Jan 27 05:07:46 UTC 2019

Modified Files:
src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl:
stm32-pinfunc.h

Log Message:
Fix merge botch


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h

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

Modified files:

Index: src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h
diff -u src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h:1.2 src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h:1.3
--- src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h:1.2	Sun Jan 27 02:08:43 2019
+++ src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h	Sun Jan 27 05:07:46 2019
@@ -1,10 +1,4 @@
-/*	$NetBSD: stm32-pinfunc.h,v 1.2 2019/01/27 02:08:43 pgoyette Exp $	*/
-
-/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/*
- * Copyright (C) STMicroelectronics 2017 - All Rights Reserved
- * Author: Torgue Alexandre  for STMicroelectronics.
- */
+/*	$NetBSD: stm32-pinfunc.h,v 1.3 2019/01/27 05:07:46 kre Exp $	*/
 
 /* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
 /*

CVS commit: src/sys/external/gpl2/dts/dist

2019-01-22 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Tue Jan 22 15:13:23 UTC 2019

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: bcm283x.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner:
sun50i-h6-pine-h64.dts sun50i-h6.dtsi
src/sys/external/gpl2/dts/dist/include/dt-bindings/input:
linux-event-codes.h
Removed Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts:
exynos4412-tmu-sensor-conf.dtsi exynos5420-tmu-sensor-conf.dtsi
mt7623n-rfb-nand.dts mt7623n-rfb.dtsi
socfpga_cyclone5_de0_sockit.dts tegra20-colibri-512.dtsi
tegra20-iris-512.dts
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/exynos:
exynos5433-tmu-g3d-sensor-conf.dtsi exynos5433-tmu-sensor-conf.dtsi
exynos7-tmu-sensor-conf.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/xilinx:
zynqmp-ep108-clk.dtsi zynqmp-ep108.dts
src/sys/external/gpl2/dts/dist/include/dt-bindings/clock: exynos5440.h

Log Message:
Merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
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/exynos4412-tmu-sensor-conf.dtsi
 \

src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi
 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/mt7623n-rfb.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/tegra20-iris-512.dts
cvs rdiff -u -r1.1.1.3 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/mt7623n-rfb-nand.dts \

src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts
 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/tegra20-colibri-512.dtsi
cvs rdiff -u -r1.3 -r1.4 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
cvs rdiff -u -r1.1.1.2 -r0 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi
 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi
 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi
cvs rdiff -u -r1.1.1.3 -r0 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi 
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/clock/exynos5440.h
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h

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

Modified files:

Index: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.5 src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.6
--- src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.5	Wed Aug 22 13:16:41 2018
+++ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi	Tue Jan 22 15:13:22 2019
@@ -66,6 +66,12 @@
 			clock-frequency = <100>;
 		};
 
+		txp@7e004000 {
+			compatible = "brcm,bcm2835-txp";
+			reg = <0x7e004000 0x20>;
+			interrupts = <1 11>;
+		};
+
 		dma: dma@7e007000 {
 			compatible = "brcm,bcm2835-dma";
 			reg = <0x7e007000 0xf00>;

Index: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
diff -u src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.3 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.4
--- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.3	Wed Jun 27 16:32:14 2018
+++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts	Tue Jan 22 15:13:22 2019
@@ -23,6 +23,25 @@
 		stdout-path = "serial0:115200n8";
 	};
 
+	leds {
+		compatible = "gpio-leds";
+
+		heartbeat {
+			label = "pine-h64:green:heartbeat";
+			gpios = <_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
+		};
+
+		link {
+			label = "pine-h64:white:link";
+			gpios = <_pio 0 3 GPIO_ACTIVE_HIGH>; /* PL3 */
+		};
+
+		status {
+			label = "pine-h64:blue:status";
+			gpios = <_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
+		};
+	};
+
 	reg_gmac_3v3: gmac-3v3 {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc-gmac-3v3";
@@ -33,20 +52,6 @@
 		enable-active-high;
 	};
 
-	reg_vcc3v3: vcc3v3 {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc3v3";
-		regulator-min-microvolt = <330>;
-		regulator-max-microvolt = <330>;
-	};
-
-	reg_vcc1v8: vcc1v8 {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc1v8";
-		regulator-min-microvolt =

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

2018-08-22 Thread Rin Okuyama 
Module Name:src
Committed By:   rin
Date:   Wed Aug 22 13:16:41 UTC 2018

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: bcm283x.dtsi

Log Message:
Explicitly disable v3d, pixelvalve, and hvs for bcm283x at the moment.

When these devices or hdmi are enabled, firmware turns off GPU functionality of
VideoCore, expecting OS drivers handle it appropriately:

https://github.com/raspberrypi/firmware/issues/763

This breaks userland applications using /dev/vchiq, such as omxplayer.

XXX We need enable them back when we import vc4 drm driver.

Fix PR port-evbarm/52984 and
PR port-arm/53042.

OK jmcneill, skrll


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi

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

Modified files:

Index: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.4 src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.5
--- src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.4	Wed Jun 27 16:32:14 2018
+++ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi	Wed Aug 22 13:16:41 2018
@@ -434,12 +434,14 @@
 			compatible = "brcm,bcm2835-pixelvalve0";
 			reg = <0x7e206000 0x100>;
 			interrupts = <2 13>; /* pwa0 */
+			status = "disabled";
 		};
 
 		pixelvalve@7e207000 {
 			compatible = "brcm,bcm2835-pixelvalve1";
 			reg = <0x7e207000 0x100>;
 			interrupts = <2 14>; /* pwa1 */
+			status = "disabled";
 		};
 
 		dpi: dpi@7e208000 {
@@ -537,6 +539,7 @@
 			compatible = "brcm,bcm2835-hvs";
 			reg = <0x7e40 0x6000>;
 			interrupts = <2 1>;
+			status = "disabled";
 		};
 
 		dsi1: dsi@7e70 {
@@ -591,6 +594,7 @@
 			compatible = "brcm,bcm2835-pixelvalve2";
 			reg = <0x7e807000 0x100>;
 			interrupts = <2 10>; /* pixelvalve */
+			status = "disabled";
 		};
 
 		hdmi: hdmi@7e902000 {
@@ -623,6 +627,7 @@
 			compatible = "brcm,bcm2835-v3d";
 			reg = <0x7ec0 0x1000>;
 			interrupts = <1 10>;
+			status = "disabled";
 		};
 
 		vc4: gpu {

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

2018-06-27 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Wed Jun 27 16:44:38 UTC 2018

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner:
sun50i-h6.dtsi

Log Message:
Fix merge problem.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi

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

Modified files:

Index: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi:1.3 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi:1.4
--- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi:1.3	Wed Jun 27 16:32:14 2018
+++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi	Wed Jun 27 16:44:38 2018
@@ -459,55 +459,5 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 		};
-
-		r_ccu: clock@701 {
-			compatible = "allwinner,sun50i-h6-r-ccu";
-			reg = <0x0701 0x400>;
-			clocks = <>, <>, <>,
- < CLK_PLL_PERIPH0>;
-			clock-names = "hosc", "losc", "iosc", "pll-periph";
-			#clock-cells = <1>;
-			#reset-cells = <1>;
-		};
-
-		r_intc: interrupt-controller@7021000 {
-			compatible = "allwinner,sun50i-h6-r-intc",
- "allwinner,sun6i-a31-r-intc";
-			interrupt-controller;
-			#interrupt-cells = <2>;
-			reg = <0x07021000 0x400>;
-			interrupts = ;
-		};
-
-		r_pio: pinctrl@7022000 {
-			compatible = "allwinner,sun50i-h6-r-pinctrl";
-			reg = <0x07022000 0x400>;
-			interrupts = ,
- ;
-			clocks = <_ccu 2>, <>, <>;
-			clock-names = "apb", "hosc", "losc";
-			gpio-controller;
-			#gpio-cells = <3>;
-			interrupt-controller;
-			#interrupt-cells = <3>;
-
-			r_i2c_pins: r-i2c {
-pins = "PL0", "PL1";
-function = "s_i2c";
-			};
-		};
-
-		r_i2c: i2c@7081400 {
-			compatible = "allwinner,sun6i-a31-i2c";
-			reg = <0x07081400 0x400>;
-			interrupts = ;
-			clocks = <_ccu 8>;
-			resets = <_ccu 4>;
-			pinctrl-names = "default";
-			pinctrl-0 = <_i2c_pins>;
-			status = "disabled";
-			#address-cells = <1>;
-			#size-cells = <0>;
-		};
 	};
 };

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

2018-06-27 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Wed Jun 27 16:32:14 UTC 2018

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: bcm2835-rpi.dtsi
bcm283x.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner:
sun50i-h6-pine-h64.dts sun50i-h6.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm:
vexpress-v2m-rs1.dtsi
Removed Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: exynos5440-sd5v1.dts
exynos5440-ssdk5440.dts exynos5440-tmu-sensor-conf.dtsi
exynos5440-trip-points.dtsi exynos5440.dtsi
ste-ccu8540-pinctrl.dtsi ste-ccu8540.dts ste-ccu9540.dts
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell:
berlin4ct-dmp.dts berlin4ct-stb.dts berlin4ct.dtsi

Log Message:
Merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi \
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/exynos5440-sd5v1.dts \

src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi
 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-trip-points.dtsi
cvs rdiff -u -r1.1.1.3 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-ssdk5440.dts
cvs rdiff -u -r1.1.1.5 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-ccu8540.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-ccu9540.dts
cvs rdiff -u -r1.2 -r1.3 \

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/arm/vexpress-v2m-rs1.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell/berlin4ct-stb.dts
cvs rdiff -u -r1.1.1.2 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell/berlin4ct.dtsi

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

Modified files:

Index: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi:1.3 src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi:1.4
--- src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi:1.3	Sat Apr 28 18:28:25 2018
+++ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi	Wed Jun 27 16:32:14 2018
@@ -83,12 +83,6 @@
 	bus-width = <4>;
 };
 
- {
-	pinctrl-names = "default";
-	pinctrl-0 = <_gpio40 _gpio45>;
-	status = "okay";
-};
-
  {
 	power-domains = < RPI_POWER_DOMAIN_USB>;
 };
Index: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.3 src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.4
--- src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.3	Sat Apr 28 18:28:25 2018
+++ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi	Wed Jun 27 16:32:14 2018
@@ -136,6 +136,7 @@
 		rng@7e104000 {
 			compatible = "brcm,bcm2835-rng";
 			reg = <0x7e104000 0x10>;
+			interrupts = <2 29>;
 		};
 
 		mailbox: mailbox@7e00b880 {

Index: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
diff -u src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.2 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.3
--- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.2	Wed May  2 10:06:56 2018
+++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts	Wed Jun 27 16:32:14 2018
@@ -238,6 +238,16 @@
 	};
 };
 
+_i2c {
+	status = "okay";
+
+	pcf8563: rtc@51 {
+		compatible = "nxp,pcf8563";
+		reg = <0x51>;
+		#clock-cells = <0>;
+	};
+};
+
  {
 	pinctrl-names = "default";
 	pinctrl-0 = <_ph_pins>;
Index: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi:1.2 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi:1.3
--- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi:1.2	Wed May  2 10:06:56 2018
+++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi	Wed Jun 27 16:32:14 2018
@@ -459,5 +459,55 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 		};
+
+		r_ccu:

CVS commit: src/sys/external/gpl2/dts/dist

2018-05-02 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Wed May  2 10:06:56 UTC 2018

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner:
sun50i-h6-pine-h64.dts sun50i-h6.dtsi
Added Files:
src/sys/external/gpl2/dts/dist/include/dt-bindings/clock:
sun50i-h6-r-ccu.h
src/sys/external/gpl2/dts/dist/include/dt-bindings/reset:
sun50i-h6-r-ccu.h

Log Message:
Updated Allwinner H6 dts from https://github.com/Icenowy/linux/tree/h6-init


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \

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 -r0 -r1.1 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/clock/sun50i-h6-r-ccu.h
cvs rdiff -u -r0 -r1.1 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/reset/sun50i-h6-r-ccu.h

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

Modified files:

Index: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
diff -u src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.1.1.1 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.2
--- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.1.1.1	Sat Apr 28 18:25:53 2018
+++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts	Wed May  2 10:06:56 2018
@@ -1,6 +1,7 @@
-// SPDX-License-Identifier: (GPL-2.0+ or MIT)
 /*
  * Copyright (c) 2017 Icenowy Zheng 
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ or MIT)
  */
 
 /dts-v1/;
@@ -14,12 +15,227 @@
 	compatible = "pine64,pine-h64", "allwinner,sun50i-h6";
 
 	aliases {
+		ethernet0 = 
 		serial0 = 
 	};
 
 	chosen {
 		stdout-path = "serial0:115200n8";
 	};
+
+	reg_gmac_3v3: gmac-3v3 {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc-gmac-3v3";
+		regulator-min-microvolt = <330>;
+		regulator-max-microvolt = <330>;
+		startup-delay-us = <10>;
+		gpio = < 2 16 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+	};
+
+	reg_vcc3v3: vcc3v3 {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc3v3";
+		regulator-min-microvolt = <330>;
+		regulator-max-microvolt = <330>;
+	};
+
+	reg_vcc1v8: vcc1v8 {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc1v8";
+		regulator-min-microvolt = <180>;
+		regulator-max-microvolt = <180>;
+	};
+
+	reg_usb_vbus: vbus {
+		compatible = "regulator-fixed";
+		regulator-name = "usb-vbus";
+		regulator-min-microvolt = <500>;
+		regulator-max-microvolt = <500>;
+		startup-delay-us = <10>;
+		gpio = <_pio 0 5 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+	};
+};
+
+ {
+	cpu-supply = <_dcdca>;
+};
+
+ {
+	status = "okay";
+};
+
+ {
+	status = "okay";
+};
+
+ {
+	status = "okay";
+};
+
+ {
+	pinctrl-names = "default";
+	pinctrl-0 = <_rgmii_pins>;
+	phy-mode = "rgmii";
+	phy-handle = <_rgmii_phy>;
+	phy-supply = <_gmac_3v3>;
+	allwinner,rx-delay-ps = <200>;
+	allwinner,tx-delay-ps = <200>;
+	status = "okay";
+};
+
+ {
+	ext_rgmii_phy: ethernet-phy@1 {
+		compatible = "ethernet-phy-ieee802.3-c22";
+		reg = <1>;
+	};
+};
+
+ {
+	pinctrl-names = "default";
+	pinctrl-0 = <_pins>;
+	vmmc-supply = <_vcc3v3>;
+	cd-gpios = < 5 6 GPIO_ACTIVE_LOW>;
+	status = "okay";
+};
+
+ {
+	pinctrl-names = "default";
+	pinctrl-0 = <_pins>;
+	vmmc-supply = <_vcc3v3>;
+	vqmmc-supply = <_vcc1v8>;
+	non-removable;
+	cap-mmc-hw-reset;
+	status = "okay";
+};
+
+ {
+	status = "okay";
+};
+
+ {
+	status = "okay";
+};
+
+_i2c {
+	pinctrl-names = "default";
+	pinctrl-0 = <_i2c_pins>;
+	status = "okay";
+
+	axp805: pmic@36 {
+		compatible = "x-powers,axp805";
+		reg = <0x36>;
+		interrupt-parent = <_intc>;
+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+		interrupt-controller;
+		#interrupt-cells = <1>;
+		x-powers,master-mode;
+
+		regulators {
+			reg_aldo1: aldo1 {
+regulator-always-on;
+regulator-min-microvolt = <330>;
+regulator-max-microvolt = <330>;
+regulator-name = "vcc-pl";
+			};
+
+			reg_aldo2: aldo2 {
+regulator-min-microvolt = <330>;
+regulator-max-microvolt = <330>;
+regulator-name = "vcc-ac200";
+			};
+
+			reg_aldo3: aldo3 {
+/* This regulator is connected with CLDO1 */
+regulator-always-on;
+regulator-min-microvolt = <330>;
+regulator-max-microvolt = <330>;
+regulator-name = "vcc-3v3-1";
+			};
+
+			reg_bldo1: bldo1 {
+regulator-always-on;
+regulator-min-microvolt = <180>;
+regulator-max-microvolt = <180>;
+regulator-name = "vcc-ddr-bias-pll";
+			};
+
+			reg_bldo2: bldo2 {
+regulator-always-on;
+regulator-min-microvolt = <180>;
+regulator-max-microvolt = <180>;
+regulator-name = "vcc-efuse-emmc-pcie-hdmi";
+			};
+
+			reg_bldo3:

CVS commit: src/sys/external/gpl2/dts/dist

2018-04-28 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sat Apr 28 18:28:26 UTC 2018

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: bcm2835-rpi.dtsi
bcm283x.dtsi
src/sys/external/gpl2/dts/dist/include/dt-bindings/input:
linux-event-codes.h
Removed Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts:
cloudengines-pogoplug-series-3.dts imx6qdl-microsom-ar8035.dtsi
imx6qdl-microsom.dtsi imx7d-pico.dts samsung_k3pe0e000b.dtsi
wd-mbwe.dts
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell:
armada-cp110-master.dtsi armada-cp110-slave.dtsi

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \

src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts
 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6qdl-microsom.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/wd-mbwe.dts
cvs rdiff -u -r1.1.1.2 -r0 \

src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx7d-pico.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi
cvs rdiff -u -r1.1.1.4 -r0 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h

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

Modified files:

Index: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi:1.2 src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi:1.3
--- src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi:1.2	Sun Dec 10 21:38:27 2017
+++ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi	Sat Apr 28 18:28:25 2018
@@ -18,7 +18,9 @@
 
 	soc {
 		firmware: firmware {
-			compatible = "raspberrypi,bcm2835-firmware";
+			compatible = "raspberrypi,bcm2835-firmware", "simple-bus";
+			#address-cells = <0>;
+			#size-cells = <0>;
 			mboxes = <>;
 		};
 
@@ -27,6 +29,12 @@
 			firmware = <>;
 			#power-domain-cells = <1>;
 		};
+
+		mailbox@7e00b840 {
+			compatible = "brcm,bcm2835-vchiq";
+			reg = <0x7e00b840 0xf>;
+			interrupts = <0 2>;
+		};
 	};
 };
 
Index: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.2 src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.3
--- src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.2	Sun Dec 10 21:38:27 2017
+++ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi	Sat Apr 28 18:28:25 2018
@@ -2,6 +2,7 @@
 #include 
 #include 
 #include 
+#include 
 
 /* firmware-provided startup stubs live here, where the secondary CPUs are
  * spinning.
@@ -222,6 +223,7 @@
 			gpclk2_gpio43: gpclk2_gpio43 {
 brcm,pins = <43>;
 brcm,function = ;
+brcm,pull = ;
 			};
 
 			i2c0_gpio0: i2c0_gpio0 {
@@ -251,7 +253,7 @@
 
 			jtag_gpio4: jtag_gpio4 {
 brcm,pins = <4 5 6 12 13>;
-brcm,function = ;
+brcm,function = ;
 			};
 			jtag_gpio22: jtag_gpio22 {
 brcm,pins = <22 23 24 25 26 27>;
@@ -334,10 +336,12 @@
 			uart0_ctsrts_gpio30: uart0_ctsrts_gpio30 {
 brcm,pins = <30 31>;
 brcm,function = ;
+brcm,pull = ;
 			};
 			uart0_gpio32: uart0_gpio32 {
 brcm,pins = <32 33>;
 brcm,function = ;
+brcm,pull = ;
 			};
 			uart0_gpio36: uart0_gpio36 {
 brcm,pins = <36 37>;
@@ -396,8 +400,8 @@
 
 		i2s: i2s@7e203000 {
 			compatible = "brcm,bcm2835-i2s";
-			reg = <0x7e203000 0x20>,
-			  <0x7e101098 0x02>;
+			reg = <0x7e203000 0x24>;
+			clocks = < BCM2835_CLOCK_PCM>;
 
 			dmas = < 2>,
 			   < 3>;
@@ -437,6 +441,17 @@
 			interrupts = <2 14>; /* pwa1 */
 		};
 
+		dpi: dpi@7e208000 {
+			compatible = "brcm,bcm2835-dpi";
+			reg = <0x7e208000 0x8c>;
+			clocks = < BCM2835_CLOCK_VPU>,
+ < BCM2835_CLOCK_DPI>;
+			clock-names = "core", "pixel";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+
 		dsi0: dsi@7e209000 {
 			compatible = "brcm,bcm2835-dsi0";
 			reg = <0x7e209000 0x78>;
@@ -464,7 +479,7 @@
 			status = "disabled";
 		};
 
-		aux: aux@0x7e215000 {
+		aux: aux@7e215000 {
 			compatible = "brcm,bcm2835-aux";
 			#clock-cells = <1>;
 			reg = <0x7e215000 0x8>;
@@ -654,5 +669,6 @@
 
 	usbphy: phy {
 		compatible = "usb-nop-xceiv";
+		#phy-cells = <0>;
 	};
 };

Index:

CVS commit: src/sys/external/gpl2/dts/dist

2017-11-30 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Thu Nov 30 19:42:59 UTC 2017

Modified Files:
src/sys/external/gpl2/dts/dist/include/dt-bindings/input:
linux-event-codes.h
Removed Files:
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts: .gitignore
src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl:
stm32f429-pinfunc.h stm32f746-pinfunc.h stm32h7-pinfunc.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/.gitignore
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h
cvs rdiff -u -r1.1.1.1 -r0 \

src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32f429-pinfunc.h \

src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32f746-pinfunc.h \
src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32h7-pinfunc.h

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

Modified files:

Index: src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h
diff -u src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h:1.4 src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h:1.5
--- src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h:1.4	Sat Oct 28 10:35:04 2017
+++ src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h	Thu Nov 30 19:42:58 2017
@@ -1,5 +1,6 @@
-/*	$NetBSD: linux-event-codes.h,v 1.4 2017/10/28 10:35:04 jmcneill Exp $	*/
+/*	$NetBSD: linux-event-codes.h,v 1.5 2017/11/30 19:42:58 jmcneill Exp $	*/
 
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Input event codes
  *
@@ -408,6 +409,7 @@
 #define BTN_TOOL_MOUSE		0x146
 #define BTN_TOOL_LENS		0x147
 #define BTN_TOOL_QUINTTAP	0x148	/* Five fingers on trackpad */
+#define BTN_STYLUS3		0x149
 #define BTN_TOUCH		0x14a
 #define BTN_STYLUS		0x14b
 #define BTN_STYLUS2		0x14c

CVS commit: src/sys/external/gpl2/dts/dist

2017-10-28 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sat Oct 28 10:35:04 UTC 2017

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext:
uniphier-pinctrl.dtsi uniphier-ref-daughter.dtsi
uniphier-support-card.dtsi
src/sys/external/gpl2/dts/dist/include/dt-bindings/input:
linux-event-codes.h
Removed Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: imx6ul-geam-kit.dts
imx6ul-geam.dtsi imx6ul-isiot-common.dtsi mt7623-evb.dts
rk1108-evb.dts rk1108.dtsi tegra20-whistler.dts
uniphier-sld3-ref.dts uniphier-sld3.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom:
bcm2835-rpi.dtsi bcm2837.dtsi bcm283x-rpi-smsc9514.dtsi
bcm283x-rpi-usb-host.dtsi bcm283x.dtsi ns2-clock.dtsi ns2-svk.dts
ns2-xmc.dts ns2.dtsi
src/sys/external/gpl2/dts/dist/include/dt-bindings/genpd: k2g.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6ul-geam-kit.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6ul-isiot-common.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/mt7623-evb.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/rk1108-evb.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/tegra20-whistler.dts
cvs rdiff -u -r1.1.1.2 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6ul-geam.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/rk1108.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/uniphier-sld3-ref.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/uniphier-sld3.dtsi
cvs rdiff -u -r1.3 -r0 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi
 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi
 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm283x.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm2837.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/ns2-clock.dtsi
cvs rdiff -u -r1.1.1.2 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/ns2-svk.dts \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/ns2-xmc.dts \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/ns2.dtsi
cvs rdiff -u -r1.3 -r1.4 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi
 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi
 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/genpd/k2g.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h

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

Modified files:

Index: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi:1.3 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi:1.4
--- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi:1.3	Sat Jul 29 23:09:10 2017
+++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi	Sat Oct 28 10:35:04 2017
@@ -1,141 +1 @@
-/*
- * Device Tree Source for UniPhier SoCs default pinctrl settings
- *
- * Copyright (C) 2015-2017 Socionext Inc.
- *   Author: Masahiro Yamada 
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Or, alternatively,
- *
- *  b) Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify,

CVS commit: src/sys/external/gpl2/dts/dist

2017-07-29 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sat Jul 29 23:09:10 UTC 2017

Added Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts:
sun8i-a23-ippo-q8h-v1.2.dts sun8i-a23-ippo-q8h-v5.dts
sun8i-a33-et-q8-v1.6.dts sun8i-a33-ippo-q8h-v1.2.dts
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/broadcom:
bcm2835-rpi.dtsi bcm283x-rpi-smsc9514.dtsi
bcm283x-rpi-usb-host.dtsi bcm283x.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext:
uniphier-pinctrl.dtsi uniphier-ref-daughter.dtsi
uniphier-support-card.dtsi
src/sys/external/gpl2/dts/dist/include/dt-bindings/input:
linux-event-codes.h

Log Message:
merge


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 \

src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts
cvs rdiff -u -r0 -r1.3 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi
cvs rdiff -u -r0 -r1.3 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi
 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi
 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm283x.dtsi
cvs rdiff -u -r0 -r1.3 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi
 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi
 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi
cvs rdiff -u -r0 -r1.3 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h

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

Added files:

Index: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts
diff -u /dev/null src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts:1.3
--- /dev/null	Sat Jul 29 23:09:10 2017
+++ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts	Sat Jul 29 23:09:09 2017
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015 Hans de Goede 
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include "sun8i-a23.dtsi"
+#include "sun8i-q8-common.dtsi"
+
+/ {
+	model = "Q8 A23 Tablet";
+	compatible = "allwinner,q8-a23", "allwinner,sun8i-a23";
+};
+
+ {
+	allwinner,pa-gpios = < 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */
+	allwinner,audio-routing =
+		"Headphone", "HP",
+		"Headphone", "HPCOM",
+		"Speaker", "HP",
+		"MIC1", "Mic",
+		"MIC2",

CVS commit: src/sys/external/gpl2/dts/dist

2017-07-27 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Thu Jul 27 18:27:19 UTC 2017

Removed Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts:
sun8i-a23-ippo-q8h-v1.2.dts sun8i-a23-ippo-q8h-v5.dts
sun8i-a33-et-q8-v1.6.dts sun8i-a33-ippo-q8h-v1.2.dts
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/broadcom:
bcm2835-rpi.dtsi bcm283x-rpi-smsc9514.dtsi
bcm283x-rpi-usb-host.dtsi bcm283x.dtsi vulcan-eval.dts vulcan.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext:
uniphier-pinctrl.dtsi uniphier-ref-daughter.dtsi
uniphier-support-card.dtsi
src/sys/external/gpl2/dts/dist/include/dt-bindings/clock: rk1108-cru.h
src/sys/external/gpl2/dts/dist/include/dt-bindings/input:
linux-event-codes.h

Log Message:
merge


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \

src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi
 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi
 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm283x.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/vulcan-eval.dts 
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/vulcan.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi
 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi
 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/clock/rk1108-cru.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h

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