diff options
Diffstat (limited to 'arch/arm/boards/gateworks-ventana/board.c')
| -rw-r--r-- | arch/arm/boards/gateworks-ventana/board.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/boards/gateworks-ventana/board.c b/arch/arm/boards/gateworks-ventana/board.c index 163f8338c6..aa2137a971 100644 --- a/arch/arm/boards/gateworks-ventana/board.c +++ b/arch/arm/boards/gateworks-ventana/board.c @@ -8,8 +8,8 @@ #include <linux/marvell_phy.h> #include <linux/pci.h> #include <linux/phy.h> -#include <mach/bbu.h> -#include <mach/imx6.h> +#include <mach/imx/bbu.h> +#include <mach/imx/imx6.h> #include <net.h> #include "gsc.h" @@ -19,9 +19,14 @@ static int gw54xx_wdog_of_fixup(struct device_node *root, void *context) struct device_node *np; /* switch to the watchdog with internal reset capabilities */ - np = of_find_node_by_name(root, "wdog@020c0000"); + np = of_find_node_by_name_address(root, "wdog@020c0000"); of_device_disable(np); - np = of_find_node_by_name(root, "wdog@020bc000"); + np = of_find_node_by_name_address(root, "watchdog@20c0000"); + of_device_disable(np); + + np = of_find_node_by_name_address(root, "wdog@020bc000"); + of_device_enable(np); + np = of_find_node_by_name_address(root, "watchdog@20bc000"); of_device_enable(np); return 0; |