domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uboot-mediatek: fix factory/reset button

Browse Source 
U-Boot commit ea6fdc13595 ("dm: button: add support for linux_code in
button-gpio.c driver") makes it mandatory to specify linux,code for all
buttons. As that broke handling of the reset button in U-Boot with the
update to U-Boot 2023.04, add linux,code for all butons.

Reported-by: @DragonBluep
Fixes: 50f7c5af4a ("uboot-mediatek: update to v2023.04")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2023-04-20 11:31:49 +01:00
parent 9f2ede5551
commit 42eeb22450
13 changed files with 110 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
package/boot/uboot-mediatek/patches/301-mt7622-generic-reset-button-ignore-env.patch
View File

@@ -17,7 +17,7 @@
#include <mtd.h> #include <mtd.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
@@ -25,7 +32,19 @@ int board_init(void) @@ -25,7 +32,22 @@ int board_init(void)
int board_late_init(void) int board_late_init(void)
{ {
@@ -27,7 +27,10 @@
+ if (!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev)) { + if (!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev)) {
+ puts("reset button found\n"); + puts("reset button found\n");
+#ifdef CONFIG_RESET_BUTTON_SETTLE_DELAY +#ifdef CONFIG_RESET_BUTTON_SETTLE_DELAY
+ mdelay(CONFIG_RESET_BUTTON_SETTLE_DELAY); + if (CONFIG_RESET_BUTTON_SETTLE_DELAY > 0) {
+ button_get_state(dev);
+ mdelay(CONFIG_RESET_BUTTON_SETTLE_DELAY);
+ }
+#endif +#endif
+ if (button_get_state(dev) == BUTTON_ON) { + if (button_get_state(dev) == BUTTON_ON) {
+ puts("button pushed, resetting environment\n"); + puts("button pushed, resetting environment\n");
@@ -40,7 +43,7 @@
} }
--- a/arch/arm/mach-mediatek/Kconfig --- a/arch/arm/mach-mediatek/Kconfig
+++ b/arch/arm/mach-mediatek/Kconfig +++ b/arch/arm/mach-mediatek/Kconfig
@@ -140,4 +140,8 @@ config MTK_BROM_HEADER_INFO @@ -140,4 +140,11 @@ config MTK_BROM_HEADER_INFO
source "board/mediatek/mt7629/Kconfig" source "board/mediatek/mt7629/Kconfig"
@@ -48,4 +51,7 @@
+ string "Button to trigger factory reset" + string "Button to trigger factory reset"
+ default "reset" + default "reset"
+ +
+config RESET_BUTTON_SETTLE_DELAY
+ int "Delay to wait for button to settle"
+ default 0
endif endif

7
package/boot/uboot-mediatek/patches/302-mt7623-generic-reset-button-ignore-env.patch
View File

@@ -18,7 +18,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@@ -41,3 +50,22 @@ int mmc_get_env_dev(void) @@ -41,3 +50,25 @@ int mmc_get_env_dev(void)
return mmc_get_boot_dev(); return mmc_get_boot_dev();
} }
#endif #endif
@@ -30,7 +30,10 @@
+ if (!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev)) { + if (!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev)) {
+ puts("reset button found\n"); + puts("reset button found\n");
+#ifdef CONFIG_RESET_BUTTON_SETTLE_DELAY +#ifdef CONFIG_RESET_BUTTON_SETTLE_DELAY
+ mdelay(CONFIG_RESET_BUTTON_SETTLE_DELAY); + if (CONFIG_RESET_BUTTON_SETTLE_DELAY > 0) {
+ button_get_state(dev);
+ mdelay(CONFIG_RESET_BUTTON_SETTLE_DELAY);
+ }
+#endif +#endif
+ if (button_get_state(dev) == BUTTON_ON) { + if (button_get_state(dev) == BUTTON_ON) {
+ puts("button pushed, resetting environment\n"); + puts("button pushed, resetting environment\n");

7
package/boot/uboot-mediatek/patches/303-mt7986-generic-reset-button-ignore-env.patch
View File

@@ -17,7 +17,7 @@
#include <mtd.h> #include <mtd.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
@@ -24,7 +31,19 @@ int board_init(void) @@ -24,7 +31,22 @@ int board_init(void)
int board_late_init(void) int board_late_init(void)
{ {
@@ -28,7 +28,10 @@
+ if (!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev)) { + if (!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev)) {
+ puts("reset button found\n"); + puts("reset button found\n");
+#ifdef CONFIG_RESET_BUTTON_SETTLE_DELAY +#ifdef CONFIG_RESET_BUTTON_SETTLE_DELAY
+ mdelay(CONFIG_RESET_BUTTON_SETTLE_DELAY); + if (CONFIG_RESET_BUTTON_SETTLE_DELAY > 0) {
+ button_get_state(dev);
+ mdelay(CONFIG_RESET_BUTTON_SETTLE_DELAY);
+ }
+#endif +#endif
+ if (button_get_state(dev) == BUTTON_ON) { + if (button_get_state(dev) == BUTTON_ON) {
+ puts("button pushed, resetting environment\n"); + puts("button pushed, resetting environment\n");

11
package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch
View File

@@ -213,7 +213,15 @@
+_set_bmf=setenv _set_bmf ; setenv bootmenu_${_menu_next} "Reset all settings to factory defaults.=run reset_factory ; reset" ; setenv _menu_next +_set_bmf=setenv _set_bmf ; setenv bootmenu_${_menu_next} "Reset all settings to factory defaults.=run reset_factory ; reset" ; setenv _menu_next
--- a/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts --- a/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts
+++ b/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts +++ b/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts
@@ -66,6 +66,15 @@ @@ -6,6 +6,7 @@
*/
/dts-v1/;
+#include <dt-bindings/input/linux-event-codes.h>
#include "mt7623.dtsi"
#include "mt7623-u-boot.dtsi"
@@ -66,6 +67,16 @@
default-state = "off"; default-state = "off";
}; };
}; };
@@ -224,6 +232,7 @@
+ factory { + factory {
+ label = "factory"; + label = "factory";
+ gpios = <&gpio 256 GPIO_ACTIVE_LOW>; + gpios = <&gpio 256 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_RESTART>;
+ }; + };
+ }; + };
}; };

49
package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch
View File

@@ -191,3 +191,52 @@
+_update_bootdev=setenv _update_bootdev ; setenv bootargs "$console root=/dev/mmcblk0p65" +_update_bootdev=setenv _update_bootdev ; setenv bootargs "$console root=/dev/mmcblk0p65"
+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title +_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver"
--- a/arch/arm/dts/mt7623a-unielec-u7623-02-emmc.dts
+++ b/arch/arm/dts/mt7623a-unielec-u7623-02-emmc.dts
@@ -6,6 +6,7 @@
*/
/dts-v1/;
+#include <dt-bindings/input/linux-event-codes.h>
#include "mt7623.dtsi"
#include "mt7623-u-boot.dtsi"
@@ -50,6 +51,18 @@
regulator-always-on;
};
+ gpio-keys {
+ compatible = "gpio-keys";
+ pinctrl-names = "default";
+ pinctrl-0 = <&key_pins_a>;
+
+ factory {
+ label = "factory";
+ gpios = <&gpio 256 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_RESTART>;
+ };
+ };
+
leds {
compatible = "gpio-leds";
@@ -109,6 +122,19 @@
};
};
+ key_pins_a: keys-alt {
+ mux {
+ function = "gpio";
+ groups = "msdc3";
+ };
+
+ conf {
+ pins = "MSDC0E_DAT0", "MSDC0E_DAT1";
+ input-enable;
+ bias-pull-up;
+ };
+ };
+
mmc0_pins_default: mmc0default {
mux {
function = "msdc";

20
package/boot/uboot-mediatek/patches/402-update-bananapi-bpi-r64-device-tree.patch
View File

@@ -1,6 +1,14 @@
--- a/arch/arm/dts/mt7622-bananapi-bpi-r64.dts --- a/arch/arm/dts/mt7622-bananapi-bpi-r64.dts
+++ b/arch/arm/dts/mt7622-bananapi-bpi-r64.dts +++ b/arch/arm/dts/mt7622-bananapi-bpi-r64.dts
@@ -20,6 +20,7 @@ @@ -5,6 +5,7 @@
*/
/dts-v1/;
+#include <dt-bindings/input/linux-event-codes.h>
#include "mt7622.dtsi"
#include "mt7622-u-boot.dtsi"
@@ -20,6 +21,7 @@
aliases { aliases {
spi0 = &snfi; spi0 = &snfi;
@@ -8,7 +16,7 @@
}; };
memory@40000000 { memory@40000000 {
@@ -27,6 +28,42 @@ @@ -27,6 +29,44 @@
reg = <0x40000000 0x40000000>; reg = <0x40000000 0x40000000>;
}; };
@@ -18,11 +26,13 @@
+ reset { + reset {
+ label = "reset"; + label = "reset";
+ gpios = <&gpio 0 GPIO_ACTIVE_LOW>; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_RESTART>;
+ }; + };
+ +
+ wps { + wps {
+ label = "wps"; + label = "wps";
+ gpios = <&gpio 102 GPIO_ACTIVE_LOW>; + gpios = <&gpio 102 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_WPS_BUTTON>;
+ }; + };
+ }; + };
+ +
@@ -51,7 +61,7 @@
reg_1p8v: regulator-1p8v { reg_1p8v: regulator-1p8v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "fixed-1.8V"; regulator-name = "fixed-1.8V";
@@ -182,6 +219,7 @@ @@ -182,6 +222,7 @@
}; };
&uart0 { &uart0 {
@@ -59,7 +69,7 @@
status = "okay"; status = "okay";
}; };
@@ -197,7 +235,7 @@ @@ -197,7 +238,7 @@
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
max-frequency = <50000000>; max-frequency = <50000000>;
@@ -68,7 +78,7 @@
vmmc-supply = <&reg_3p3v>; vmmc-supply = <&reg_3p3v>;
vqmmc-supply = <&reg_3p3v>; vqmmc-supply = <&reg_3p3v>;
non-removable; non-removable;
@@ -208,7 +246,7 @@ @@ -208,7 +249,7 @@
pinctrl-0 = <&mmc1_pins_default>; pinctrl-0 = <&mmc1_pins_default>;
status = "okay"; status = "okay";
bus-width = <4>; bus-width = <4>;

4
package/boot/uboot-mediatek/patches/403-add-bananapi_bpi-r64-snand.patch
View File

@@ -1,6 +1,6 @@
--- a/arch/arm/dts/mt7622-bananapi-bpi-r64.dts --- a/arch/arm/dts/mt7622-bananapi-bpi-r64.dts
+++ b/arch/arm/dts/mt7622-bananapi-bpi-r64.dts +++ b/arch/arm/dts/mt7622-bananapi-bpi-r64.dts
@@ -19,7 +19,7 @@ @@ -20,7 +20,7 @@
}; };
aliases { aliases {
@@ -9,7 +9,7 @@
ethernet0 = &eth; ethernet0 = &eth;
}; };
@@ -205,17 +205,11 @@ @@ -208,17 +208,11 @@
}; };
}; };

2
package/boot/uboot-mediatek/patches/405-dts-mt7623n-bpi-r2-fix-leds.patch
View File

@@ -1,6 +1,6 @@
--- a/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts --- a/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts
+++ b/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts +++ b/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts
@@ -50,19 +50,19 @@ @@ -51,19 +51,19 @@
blue { blue {
label = "bpi-r2:pio:blue"; label = "bpi-r2:pio:blue";

2
package/boot/uboot-mediatek/patches/406-dts-mt7623n-bpi-r2-uart0-force-highspeed.patch
View File

@@ -1,6 +1,6 @@
--- a/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts --- a/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts
+++ b/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts +++ b/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts
@@ -243,6 +243,7 @@ @@ -245,6 +245,7 @@
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pins_a>;

5
package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch
View File

@@ -144,7 +144,7 @@
+CONFIG_USB_STORAGE=y +CONFIG_USB_STORAGE=y
--- /dev/null --- /dev/null
+++ b/arch/arm/dts/mt7622-linksys-e8450-ubi.dts +++ b/arch/arm/dts/mt7622-linksys-e8450-ubi.dts
@@ -0,0 +1,194 @@ @@ -0,0 +1,197 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (c) 2019 MediaTek Inc. + * Copyright (c) 2019 MediaTek Inc.
@@ -152,6 +152,7 @@
+ */ + */
+ +
+/dts-v1/; +/dts-v1/;
+#include <dt-bindings/input/linux-event-codes.h>
+#include "mt7622.dtsi" +#include "mt7622.dtsi"
+#include "mt7622-u-boot.dtsi" +#include "mt7622-u-boot.dtsi"
+ +
@@ -175,11 +176,13 @@
+ factory { + factory {
+ label = "reset"; + label = "reset";
+ gpios = <&gpio 0 GPIO_ACTIVE_LOW>; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_RESTART>;
+ }; + };
+ +
+ wps { + wps {
+ label = "wps"; + label = "wps";
+ gpios = <&gpio 102 GPIO_ACTIVE_LOW>; + gpios = <&gpio 102 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_WPS_BUTTON>;
+ }; + };
+ }; + };
+ +

4
package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch
View File

@@ -158,6 +158,7 @@
+ */ + */
+ +
+/dts-v1/; +/dts-v1/;
+#include <dt-bindings/input/linux-event-codes.h>
+#include "mt7622.dtsi" +#include "mt7622.dtsi"
+#include "mt7622-u-boot.dtsi" +#include "mt7622-u-boot.dtsi"
+ +
@@ -178,12 +179,11 @@
+ +
+ gpio-keys { + gpio-keys {
+ compatible = "gpio-keys"; + compatible = "gpio-keys";
+ u-boot,dm-pre-reloc;
+ +
+ reset { + reset {
+ label = "reset"; + label = "reset";
+ gpios = <&gpio 62 GPIO_ACTIVE_LOW>; + gpios = <&gpio 62 GPIO_ACTIVE_LOW>;
+ u-boot,dm-pre-reloc; + linux,code = <KEY_RESTART>;
+ }; + };
+ }; + };
+ +

4
package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch
View File

@@ -851,7 +851,7 @@
+ +
--- /dev/null --- /dev/null
+++ b/arch/arm/dts/mt7986a-bpi-r3-sd.dts +++ b/arch/arm/dts/mt7986a-bpi-r3-sd.dts
@@ -0,0 +1,270 @@ @@ -0,0 +1,272 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (c) 2021 MediaTek Inc. + * Copyright (c) 2021 MediaTek Inc.
@@ -859,6 +859,7 @@
+ */ + */
+ +
+/dts-v1/; +/dts-v1/;
+#include <dt-bindings/input/linux-event-codes.h>
+#include "mt7986.dtsi" +#include "mt7986.dtsi"
+#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/gpio/gpio.h>
+ +
@@ -893,6 +894,7 @@
+ wps { + wps {
+ label = "reset"; + label = "reset";
+ gpios = <&gpio 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_RESTART>;
+ }; + };
+ }; + };
+ +

5
package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch
View File

@@ -183,7 +183,7 @@
+CONFIG_SERVERIP="192.168.1.254" +CONFIG_SERVERIP="192.168.1.254"
--- /dev/null --- /dev/null
+++ b/arch/arm/dts/mt7986a-xiaomi_redmi-ax6000.dts +++ b/arch/arm/dts/mt7986a-xiaomi_redmi-ax6000.dts
@@ -0,0 +1,153 @@ @@ -0,0 +1,156 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (c) 2021 MediaTek Inc. + * Copyright (c) 2021 MediaTek Inc.
@@ -191,6 +191,7 @@
+ */ + */
+ +
+/dts-v1/; +/dts-v1/;
+#include <dt-bindings/input/linux-event-codes.h>
+#include "mt7986.dtsi" +#include "mt7986.dtsi"
+#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/gpio/gpio.h>
+ +
@@ -210,10 +211,12 @@
+ factory { + factory {
+ label = "reset"; + label = "reset";
+ gpios = <&gpio 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_RESTART>;
+ }; + };
+ mesh { + mesh {
+ label = "mesh"; + label = "mesh";
+ gpios = <&gpio 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_WPS_BUTTON>;
+ }; + };
+ }; + };
+}; +};