diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-09-12 07:53:05 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-09-12 07:53:05 +0200 |
| commit | f48a1596f4e911d4516b986e4778f18321b39b48 (patch) | |
| tree | d6a441c78931884da29315dea7e1f0f7f7011645 | |
| parent | 93b85bc9fd1a74665f3fe4b7a9fcf88691b6350a (diff) | |
| parent | 02c67fe7b92363bcc29539ba9c392d437e45d81e (diff) | |
| download | barebox-f48a1596f4e911d4516b986e4778f18321b39b48.tar.gz barebox-f48a1596f4e911d4516b986e4778f18321b39b48.tar.xz | |
Merge branch 'for-next/mips'
| -rw-r--r-- | arch/mips/configs/ath79_defconfig | 5 | ||||
| -rw-r--r-- | arch/mips/dts/ar9331-dptechnics-dpt-module.dts | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/mips/configs/ath79_defconfig b/arch/mips/configs/ath79_defconfig index 83d22e4e1c..ab7af794a2 100644 --- a/arch/mips/configs/ath79_defconfig +++ b/arch/mips/configs/ath79_defconfig @@ -52,6 +52,7 @@ CONFIG_CMD_LED=y CONFIG_CMD_POWEROFF=y CONFIG_CMD_SPI=y CONFIG_CMD_LED_TRIGGER=y +CONFIG_CMD_WD=y CONFIG_CMD_BAREBOX_UPDATE=y CONFIG_CMD_OF_NODE=y CONFIG_CMD_OF_PROPERTY=y @@ -77,6 +78,10 @@ CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_LED_GPIO_OF=y CONFIG_LED_TRIGGERS=y +CONFIG_KEYBOARD_GPIO=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_POLLER=y +CONFIG_WATCHDOG_AR9344=y CONFIG_FS_TFTP=y CONFIG_FS_NFS=y CONFIG_DIGEST_SHA224_GENERIC=y diff --git a/arch/mips/dts/ar9331-dptechnics-dpt-module.dts b/arch/mips/dts/ar9331-dptechnics-dpt-module.dts index f0de46315c..315589aab9 100644 --- a/arch/mips/dts/ar9331-dptechnics-dpt-module.dts +++ b/arch/mips/dts/ar9331-dptechnics-dpt-module.dts @@ -24,6 +24,12 @@ barebox,default-trigger = "heartbeat"; }; }; + + gpio-keys { + button@0 { + gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; + }; + }; }; &spiflash { |