/dts-v1/;
 
 #include "k3-am654.dtsi"
+#include <dt-bindings/input/input.h>
 
 / {
        compatible =  "ti,am654-evm", "ti,am654";
                        no-map;
                };
        };
+
+       gpio-keys {
+               compatible = "gpio-keys";
+               autorepeat;
+               pinctrl-names = "default";
+               pinctrl-0 = <&push_button_pins_default>;
+
+               sw5 {
+                       label = "GPIO Key USER1";
+                       linux,code = <BTN_0>;
+                       gpios = <&wkup_gpio0 24 GPIO_ACTIVE_LOW>;
+               };
+
+               sw6 {
+                       label = "GPIO Key USER2";
+                       linux,code = <BTN_1>;
+                       gpios = <&wkup_gpio0 27 GPIO_ACTIVE_LOW>;
+               };
+       };
 };
 
 &wkup_pmx0 {
                        AM65X_WKUP_IOPAD(0x00e4, PIN_INPUT, 0) /* (AD6) WKUP_I2C0_SDA */
                >;
        };
+
+       push_button_pins_default: push_button__pins_default {
+               pinctrl-single,pins = <
+                       AM65X_WKUP_IOPAD(0x0030, PIN_INPUT, 7) /* (R5) WKUP_GPIO0_24 */
+                       AM65X_WKUP_IOPAD(0x003c, PIN_INPUT, 7) /* (P2) WKUP_GPIO0_27 */
+               >;
+       };
 };
 
 &main_pmx0 {