CVS commit: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts
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
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
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/arch/arm64/boot/dts/amlogic
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
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
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/arch/arm/boot/dts
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
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
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:
