fcb85f1767
- merging C2 and Meson family on the source level, C2 is still making own kernels, but sources, patches and configs are the same - merged boot scripts for meson family. support for non existing legacy kernel was dropped from boot scripts, added UUID support, armbianEnv.txt - Meson default remain on 4.14.y, NEXT moved to 4.17.y and DEV remains on master - remove deprecated patches, remove wrong permissions in patches - tested on C2, K2 and Le Potate. USB troubles are still present and common, while K2 and Lepotato might have boot/reboot troubles on 4.16+ - boards configuration cleanup - moving K2 to the supported list. It's the same level of support as Le Potato
78 lines
1.6 KiB
Diff
78 lines
1.6 KiB
Diff
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
|
|
index 9697a7a..baaa3ba 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
|
|
@@ -46,6 +46,7 @@
|
|
|
|
#include "meson-gxbb.dtsi"
|
|
#include <dt-bindings/gpio/gpio.h>
|
|
+#include <dt-bindings/input/input.h>
|
|
|
|
/ {
|
|
compatible = "friendlyarm,nanopi-k2", "amlogic,meson-gxbb";
|
|
@@ -74,6 +75,19 @@
|
|
};
|
|
};
|
|
|
|
+ gpio-keys-polled {
|
|
+ compatible = "gpio-keys-polled";
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ poll-interval = <100>;
|
|
+
|
|
+ button@0 {
|
|
+ label = "reset";
|
|
+ linux,code = <KEY_RESTART>;
|
|
+ gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>;
|
|
+ };
|
|
+ };
|
|
+
|
|
vdd_5v: regulator-vdd-5v {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "VDD_5V";
|
|
@@ -141,6 +155,25 @@
|
|
compatible = "mmc-pwrseq-emmc";
|
|
reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
|
|
};
|
|
+
|
|
+ hdmi-connector {
|
|
+ compatible = "hdmi-connector";
|
|
+ type = "a";
|
|
+
|
|
+ port {
|
|
+ hdmi_connector_in: endpoint {
|
|
+ remote-endpoint = <&hdmi_tx_tmds_out>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
+};
|
|
+
|
|
+&cec_AO {
|
|
+ status = "okay";
|
|
+ pinctrl-0 = <&ao_cec_pins>;
|
|
+ pinctrl-names = "default";
|
|
+ hdmi-phandle = <&hdmi_tx>;
|
|
};
|
|
|
|
ðmac {
|
|
@@ -169,6 +202,18 @@
|
|
};
|
|
};
|
|
|
|
+&hdmi_tx {
|
|
+ status = "okay";
|
|
+ pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
|
|
+ pinctrl-names = "default";
|
|
+};
|
|
+
|
|
+&hdmi_tx_tmds_port {
|
|
+ hdmi_tx_tmds_out: endpoint {
|
|
+ remote-endpoint = <&hdmi_connector_in>;
|
|
+ };
|
|
+};
|
|
+
|
|
&ir {
|
|
status = "okay";
|
|
pinctrl-0 = <&remote_input_ao_pins>;
|