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";
};
-&usb3 {
- status = "okay";
-};
-
&usb3phy {
phy-supply = <®_usb_vbus>;
status = "okay";
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 = <&pio 0 20 GPIO_ACTIVE_HIGH>;
+ label = "nanopi:blue:status";
+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>;
};
};
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 = <&osc24M>, <&osc32k>, <&iosc>,
- <&ccu 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 = <&r_ccu 2>, <&osc24M>, <&osc32k>;
- 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 = <&r_ccu 8>;
- resets = <&r_ccu 4>;
- pinctrl-names = "default";
- pinctrl-0 = <&r_i2c_pins>;
- status = "disabled";
- #address-cells = <1>;
- #size-cells = <0>;
- };
};
};
