diff --git a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
index 6cd8ba4578b..a9c03b7edae 100644
--- a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
+++ b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
@@ -40,6 +40,10 @@
 	keys {
 		compatible = "gpio-keys";
 
+		pinctrl-names = "default";
+		/* GPIO1 (poe_pass) and GPIO2 (watchdog) requires jtag disabled */
+		pinctrl-0 = <&jtag_disable_pins>;
+
 		reset {
 			label = "Reset";
 			linux,code = <KEY_RESTART>;