* Bump to 4.18, removing the obvious, fixing build problems, put some on waiting. * Pin 4.18 to DEV, rollback 4.14 to NEXT, adjust configs, remove one deprecated patch from NEXT and add board-h3-address-some-stability-issues.patch * Adjust few boards in development to new reality, removing it from NEXT for now * Adjust few board configs * Board config adjustement * Adjust few boards configs * Port NeoCore2 and Neo21.1 to 4.14.y * Adjust board config * Adjust board config
102 lines
1.9 KiB
Diff
102 lines
1.9 KiB
Diff
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
|
|
index ba4d6b1..d71a8b8
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
|
|
@@ -43,15 +43,17 @@
|
|
/dts-v1/;
|
|
|
|
#include "sun50i-h5.dtsi"
|
|
-
|
|
#include <dt-bindings/gpio/gpio.h>
|
|
+#include <dt-bindings/input/input.h>
|
|
+#include <dt-bindings/pinctrl/sun4i-a10.h>
|
|
|
|
/ {
|
|
- model = "OrangePi Zero Plus2";
|
|
+ model = "Xunlong Orange Pi Zero Plus2";
|
|
compatible = "xunlong,orangepi-zero-plus2", "allwinner,sun50i-h5";
|
|
|
|
aliases {
|
|
serial0 = &uart0;
|
|
+ ethernet1 = &brcmf;
|
|
};
|
|
|
|
chosen {
|
|
@@ -112,6 +132,39 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&de {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&ehci0 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&ohci0 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&spi0 {
|
|
+ /* Disable SPI NOR by default: it optional on Orange Pi Zero boards */
|
|
+ status = "disabled";
|
|
+
|
|
+ flash@0 {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+ compatible = "mxicy,mx25l1606e", "winbond,w25q128";
|
|
+ reg = <0>;
|
|
+ spi-max-frequency = <40000000>;
|
|
+ };
|
|
+};
|
|
+
|
|
+&hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&mixer0 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&r_pio {
|
|
wifi_wake: wifi_wake@0 {
|
|
pins = "PL7";
|
|
@@ -120,8 +177,35 @@
|
|
};
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&tcon0 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&r_i2c {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_pins_a>;
|
|
status = "okay";
|
|
};
|
|
+
|
|
+&usb_otg {
|
|
+ dr_mode = "peripheral";
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&usbphy {
|
|
+ /*
|
|
+ * USB Type-A port VBUS is always on. However, MicroUSB VBUS can only
|
|
+ * power up the board; when it's used as OTG port, this VBUS is
|
|
+ * always off even if the board is powered via GPIO pins.
|
|
+ */
|
|
+ usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
|
|
+ status = "okay";
|
|
+};
|
|
\ No newline at end of file
|