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>
87 lines
2.0 KiB
Diff
87 lines
2.0 KiB
Diff
From b6764bb27c819cdcf854371db485a43d71f579f3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
|
|
Date: Tue, 3 Mar 2020 15:15:57 +0100
|
|
Subject: [PATCH] ARM: dts: imx6q-apalis: ixora: make switch3 reset button
|
|
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 | 15 ++++++++++++++-
|
|
arch/arm/boot/dts/imx6q-apalis-ixora.dts | 15 ++++++++++++++-
|
|
2 files changed, 28 insertions(+), 2 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
|
|
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
|
|
@@ -38,7 +38,7 @@
|
|
gpio-keys {
|
|
compatible = "gpio-keys";
|
|
pinctrl-names = "default";
|
|
- pinctrl-0 = <&pinctrl_gpio_keys>;
|
|
+ pinctrl-0 = <&pinctrl_gpio_keys &pinctrl_switch3_ixora>;
|
|
|
|
wakeup {
|
|
label = "Wake-Up";
|
|
@@ -47,6 +47,13 @@
|
|
debounce-interval = <10>;
|
|
wakeup-source;
|
|
};
|
|
+
|
|
+ reset {
|
|
+ label = "reset";
|
|
+ gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
|
|
+ linux,code = <KEY_RESTART>;
|
|
+ debounce-interval = <10>;
|
|
+ };
|
|
};
|
|
|
|
lcd_display: disp0 {
|
|
@@ -275,4 +282,10 @@
|
|
MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0
|
|
>;
|
|
};
|
|
+
|
|
+ pinctrl_switch3_ixora: switch3ixora {
|
|
+ fsl,pins = <
|
|
+ MX6QDL_PAD_SD1_DAT0__GPIO1_IO16 0x1b0b0
|
|
+ >;
|
|
+ };
|
|
};
|
|
--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
|
|
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
|
|
@@ -37,7 +37,7 @@
|
|
gpio-keys {
|
|
compatible = "gpio-keys";
|
|
pinctrl-names = "default";
|
|
- pinctrl-0 = <&pinctrl_gpio_keys>;
|
|
+ pinctrl-0 = <&pinctrl_gpio_keys &pinctrl_switch3_ixora>;
|
|
|
|
wakeup {
|
|
label = "Wake-Up";
|
|
@@ -46,6 +46,13 @@
|
|
debounce-interval = <10>;
|
|
wakeup-source;
|
|
};
|
|
+
|
|
+ reset {
|
|
+ label = "reset";
|
|
+ gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
|
|
+ linux,code = <KEY_RESTART>;
|
|
+ debounce-interval = <10>;
|
|
+ };
|
|
};
|
|
|
|
lcd_display: disp0 {
|
|
@@ -276,4 +283,10 @@
|
|
MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0
|
|
>;
|
|
};
|
|
+
|
|
+ pinctrl_switch3_ixora: switch3ixora {
|
|
+ fsl,pins = <
|
|
+ MX6QDL_PAD_SD1_DAT0__GPIO1_IO16 0x1b0b0
|
|
+ >;
|
|
+ };
|
|
};
|