mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
3a187fa718
Also add a new kconfig symbol (CONFIG_KCMP) to the generic config, disabling the SYS_kcmp syscall (it was split from CONFIG_CHECKPOINT_RESTORE, which is disabled by default, so the previous behaviour is kept). Removed (upstreamed) patches: 070-net-icmp-pass-zeroed-opts-from-icmp-v6-_ndo_send-bef.patch 081-wireguard-device-do-not-generate-ICMP-for-non-IP-pac.patch 082-wireguard-queueing-get-rid-of-per-peer-ring-buffers.patch 083-wireguard-kconfig-use-arm-chacha-even-with-no-neon.patch 830-v5.12-0002-usb-serial-option-update-interface-mapping-for-ZTE-P685M.patch Manually rebased patches: 313-helios4-dts-status-led-alias.patch 104-powerpc-mpc85xx-change-P2020RDB-dts-file-for-OpenWRT.patch Run tested: ath79 (TL-WDR3600) mvebu (Turris Omnia) Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
97 lines
2.3 KiB
Diff
97 lines
2.3 KiB
Diff
From 68604e89335ccb3e893b5a05b2c0d5cd2eaaf6ec Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
|
|
Date: Tue, 3 Mar 2020 15:14:40 +0100
|
|
Subject: [PATCH] ARM: dts: imx6q-apalis: ixora: add status LEDs aliases
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Petr Štetiar <ynezz@true.cz>
|
|
---
|
|
arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 16 ++++++++++------
|
|
arch/arm/boot/dts/imx6q-apalis-ixora.dts | 12 ++++++++----
|
|
2 files changed, 18 insertions(+), 10 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
|
|
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
|
|
@@ -25,6 +25,10 @@
|
|
i2c2 = &i2c2;
|
|
rtc0 = &rtc_i2c;
|
|
rtc1 = &snvs_rtc;
|
|
+ led-boot = &led_boot;
|
|
+ led-failsafe = &led_failsafe;
|
|
+ led-running = &led_running;
|
|
+ led-upgrade = &led_upgrade;
|
|
};
|
|
|
|
chosen {
|
|
@@ -92,22 +96,22 @@
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_leds_ixora>;
|
|
|
|
- led4-green {
|
|
+ led_running: led4-green {
|
|
label = "LED_4_GREEN";
|
|
- gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
|
|
+ gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
- led4-red {
|
|
+ led_upgrade: led4-red {
|
|
label = "LED_4_RED";
|
|
- gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
|
|
+ gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
- led5-green {
|
|
+ led_boot: led5-green {
|
|
label = "LED_5_GREEN";
|
|
gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
- led5-red {
|
|
+ led_failsafe: led5-red {
|
|
label = "LED_5_RED";
|
|
gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
|
|
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
|
|
@@ -24,6 +24,10 @@
|
|
i2c2 = &i2c2;
|
|
rtc0 = &rtc_i2c;
|
|
rtc1 = &snvs_rtc;
|
|
+ led-boot = &led_boot;
|
|
+ led-failsafe = &led_failsafe;
|
|
+ led-running = &led_running;
|
|
+ led-upgrade = &led_upgrade;
|
|
};
|
|
|
|
chosen {
|
|
@@ -91,22 +95,22 @@
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_leds_ixora>;
|
|
|
|
- led4-green {
|
|
+ led_running: led4-green {
|
|
label = "LED_4_GREEN";
|
|
gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
- led4-red {
|
|
+ led_upgrade: led4-red {
|
|
label = "LED_4_RED";
|
|
gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
- led5-green {
|
|
+ led_boot: led5-green {
|
|
label = "LED_5_GREEN";
|
|
gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
- led5-red {
|
|
+ led_failsafe: led5-red {
|
|
label = "LED_5_RED";
|
|
gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
|
|
};
|