diff options
Diffstat (limited to 'arch/arm/boards/gateworks-ventana')
6 files changed, 22 insertions, 7 deletions
diff --git a/arch/arm/boards/gateworks-ventana/Makefile b/arch/arm/boards/gateworks-ventana/Makefile index 7d195eebd6..4e1cefbc4c 100644 --- a/arch/arm/boards/gateworks-ventana/Makefile +++ b/arch/arm/boards/gateworks-ventana/Makefile @@ -1,2 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + obj-y += board.o gsc.o lwl-y += lowlevel.o 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; diff --git a/arch/arm/boards/gateworks-ventana/flash-header-ventana-quad-1gx64.imxcfg b/arch/arm/boards/gateworks-ventana/flash-header-ventana-quad-1gx64.imxcfg index 98c7ae6095..cde49ef029 100644 --- a/arch/arm/boards/gateworks-ventana/flash-header-ventana-quad-1gx64.imxcfg +++ b/arch/arm/boards/gateworks-ventana/flash-header-ventana-quad-1gx64.imxcfg @@ -1,9 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-only + soc imx6 loadaddr 0x20000000 ivtofs 0x400 -#include <mach/imx6-ddr-regs.h> -#include <mach/imx6q-ddr-regs.h> +#include <mach/imx/imx6-ddr-regs.h> +#include <mach/imx/imx6q-ddr-regs.h> #include "ram-base.imxcfg" #include "quad_128x64.imxcfg" diff --git a/arch/arm/boards/gateworks-ventana/lowlevel.c b/arch/arm/boards/gateworks-ventana/lowlevel.c index 0a79d82049..db18b53139 100644 --- a/arch/arm/boards/gateworks-ventana/lowlevel.c +++ b/arch/arm/boards/gateworks-ventana/lowlevel.c @@ -1,6 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only + #include <common.h> #include <linux/sizes.h> -#include <mach/generic.h> +#include <mach/imx/generic.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/gateworks-ventana/quad_128x64.imxcfg b/arch/arm/boards/gateworks-ventana/quad_128x64.imxcfg index daf01a8ad1..66a7876649 100644 --- a/arch/arm/boards/gateworks-ventana/quad_128x64.imxcfg +++ b/arch/arm/boards/gateworks-ventana/quad_128x64.imxcfg @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only + wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x00190017 wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x00140026 wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x0021001C diff --git a/arch/arm/boards/gateworks-ventana/ram-base.imxcfg b/arch/arm/boards/gateworks-ventana/ram-base.imxcfg index 07dc34c0bb..c482f60b09 100644 --- a/arch/arm/boards/gateworks-ventana/ram-base.imxcfg +++ b/arch/arm/boards/gateworks-ventana/ram-base.imxcfg @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only + wm 32 MX6_IOM_DRAM_SDQS0 0x00000030 wm 32 MX6_IOM_DRAM_SDQS1 0x00000030 wm 32 MX6_IOM_DRAM_SDQS2 0x00000030 |