* Bumping EDGE kernel to 5.14.y Meson64: - removing Odroid reboot shutdown patch since its probably not needed anymore Rockchip64: - removing Rockpi S. No interest to maintain this any further - removing PBP suspend. Doesn’t align. Need inspection if some other way was mainstreamed - temporally removing Orangepi R1 * Re-adding rockpis, pbp suspend, HFLPS170 wifi and cleanup * Removing deprecated patch, fixing ap6256 wifi * Re-enable Opi R1 plus, untest * Add and fix Radxa Zero
49 lines
928 B
Diff
49 lines
928 B
Diff
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
|
|
index 4df29a6..cf59d3f 100644
|
|
--- a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
|
|
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
|
|
@@ -59,6 +63,8 @@
|
|
|
|
leds {
|
|
compatible = "gpio-leds";
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&leds_npi>, <&leds_r_npi>;
|
|
|
|
status {
|
|
label = "nanopi:blue:status";
|
|
@@ -76,6 +82,8 @@
|
|
r_gpio_keys {
|
|
compatible = "gpio-keys";
|
|
input-name = "k1";
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&sw_r_npi>;
|
|
|
|
k1 {
|
|
label = "k1";
|
|
@@ -100,6 +136,25 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&pio {
|
|
+ leds_npi: led_pins {
|
|
+ pins = "PA10";
|
|
+ function = "gpio_out";
|
|
+ };
|
|
+};
|
|
+
|
|
+&r_pio {
|
|
+ leds_r_npi: led_pins {
|
|
+ pins = "PL10";
|
|
+ function = "gpio_out";
|
|
+ };
|
|
+
|
|
+ sw_r_npi: key_pins {
|
|
+ pins = "PL3";
|
|
+ function = "gpio_in";
|
|
+ };
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_pa_pins>;
|