mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 05:18:55 +00:00
a57ce78b37
* 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
139 lines
2.3 KiB
Diff
139 lines
2.3 KiB
Diff
diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
|
|
index 10da56e..7d2f879
|
|
--- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
|
|
+++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
|
|
@@ -1,5 +1,6 @@
|
|
/*
|
|
* Copyright (C) 2017 Marcus Cooper <codekipper@gmail.com>
|
|
+ * Copyright (C) 2018 Armbian
|
|
*
|
|
* 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
|
|
@@ -52,18 +53,27 @@
|
|
compatible = "roofull,beelink-x2", "allwinner,sun8i-h3";
|
|
|
|
aliases {
|
|
+ ethernet0 = &emac;
|
|
serial0 = &uart0;
|
|
- /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
|
|
- ethernet1 = &sdiowifi;
|
|
};
|
|
|
|
chosen {
|
|
stdout-path = "serial0:115200n8";
|
|
};
|
|
|
|
+ connector {
|
|
+ compatible = "hdmi-connector";
|
|
+ type = "a";
|
|
+
|
|
+ port {
|
|
+ hdmi_con_in: endpoint {
|
|
+ remote-endpoint = <&hdmi_out_con>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
leds {
|
|
compatible = "gpio-leds";
|
|
-
|
|
blue {
|
|
label = "beelink-x2:blue:pwr";
|
|
gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
|
|
@@ -76,15 +86,9 @@
|
|
};
|
|
};
|
|
|
|
- wifi_pwrseq: wifi_pwrseq {
|
|
- compatible = "mmc-pwrseq-simple";
|
|
- reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
|
|
- };
|
|
-
|
|
sound_spdif {
|
|
compatible = "simple-audio-card";
|
|
simple-audio-card,name = "On-board SPDIF";
|
|
-
|
|
simple-audio-card,cpu {
|
|
sound-dai = <&spdif>;
|
|
};
|
|
@@ -100,6 +104,19 @@
|
|
};
|
|
};
|
|
|
|
+&codec {
|
|
+ allwinner,audio-routing =
|
|
+ "Line Out", "LINEOUT",
|
|
+ "MIC1", "Mic",
|
|
+ "Mic", "MBIAS";
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&de {
|
|
+ status = "okay";
|
|
+
|
|
+};
|
|
+
|
|
&ehci0 {
|
|
status = "okay";
|
|
};
|
|
@@ -108,12 +125,45 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&ehci2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&ehci3 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&emac {
|
|
+ phy-handle = <&int_mii_phy>;
|
|
+ phy-mode = "mii";
|
|
+ allwinner,leds-active-low;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&hdmi_out {
|
|
+ hdmi_out_con: endpoint {
|
|
+ remote-endpoint = <&hdmi_con_in>;
|
|
+ };
|
|
+};
|
|
+
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&ir {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&ir_pins_a>;
|
|
status = "okay";
|
|
};
|
|
|
|
+&mixer0 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mmc0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
|
|
@@ -164,6 +214,14 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&tcon0 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&spdif {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&spdif_tx_pins_a>;
|