diff options
Diffstat (limited to 'arch/arm/boards/embest-marsboard')
4 files changed, 15 insertions, 9 deletions
diff --git a/arch/arm/boards/embest-marsboard/Makefile b/arch/arm/boards/embest-marsboard/Makefile index ef5219444c..eaa6ace2f4 100644 --- a/arch/arm/boards/embest-marsboard/Makefile +++ b/arch/arm/boards/embest-marsboard/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only + obj-y += board.o lwl-y += lowlevel.o bbenv-y += defaultenv-mars diff --git a/arch/arm/boards/embest-marsboard/board.c b/arch/arm/boards/embest-marsboard/board.c index a11b7b6579..1a5e5a8491 100644 --- a/arch/arm/boards/embest-marsboard/board.c +++ b/arch/arm/boards/embest-marsboard/board.c @@ -8,7 +8,8 @@ #include <common.h> #include <init.h> #include <envfs.h> -#include <mach/bbu.h> +#include <mach/imx/bbu.h> +#include <linux/mdio.h> #include <linux/phy.h> #include <deep-probe.h> @@ -19,13 +20,13 @@ static int ar8035_phy_fixup(struct phy_device *dev) /* Ar803x phy SmartEEE feature cause link status generates glitch, * which cause ethernet link down/up issue, so disable SmartEEE */ - val = phy_read_mmd_indirect(dev, 0x805d, 0x3); + val = phy_read_mmd(dev, MDIO_MMD_PCS, 0x805d); phy_write(dev, MII_MMD_DATA, val & ~(1 << 8)); - val = phy_read_mmd_indirect(dev, 0x4003, 0x3); + val = phy_read_mmd(dev, MDIO_MMD_PCS, 0x4003); phy_write(dev, MII_MMD_DATA, val & ~(1 << 8)); - val = phy_read_mmd_indirect(dev, 0x4007, 0x3); + val = phy_read_mmd(dev, MDIO_MMD_PCS, 0x4007); val &= 0xffe3; val |= 0x18; phy_write(dev, MII_MMD_DATA, val); @@ -33,7 +34,7 @@ static int ar8035_phy_fixup(struct phy_device *dev) return 0; } -static int marsboard_device_init(struct device_d *dev) +static int marsboard_device_init(struct device *dev) { barebox_set_hostname("marsboard"); @@ -53,7 +54,7 @@ static const struct of_device_id marsboard_of_match[] = { }; BAREBOX_DEEP_PROBE_ENABLE(marsboard_of_match); -static struct driver_d marsboard_driver = { +static struct driver marsboard_driver = { .name = "board-mars", .probe = marsboard_device_init, .of_compatible = marsboard_of_match, diff --git a/arch/arm/boards/embest-marsboard/flash-header-embest-marsboard.imxcfg b/arch/arm/boards/embest-marsboard/flash-header-embest-marsboard.imxcfg index afc95d9bd9..5cf7201e88 100644 --- a/arch/arm/boards/embest-marsboard/flash-header-embest-marsboard.imxcfg +++ b/arch/arm/boards/embest-marsboard/flash-header-embest-marsboard.imxcfg @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + soc imx6 loadaddr 0x20000000 ivtofs 0x400 diff --git a/arch/arm/boards/embest-marsboard/lowlevel.c b/arch/arm/boards/embest-marsboard/lowlevel.c index 9e20a2ec06..84378c00f2 100644 --- a/arch/arm/boards/embest-marsboard/lowlevel.c +++ b/arch/arm/boards/embest-marsboard/lowlevel.c @@ -6,10 +6,11 @@ #include <common.h> #include <io.h> #include <asm/barebox-arm.h> -#include <mach/imx6.h> -#include <mach/esdctl.h> -#include <mach/iomux-mx6.h> +#include <mach/imx/imx6.h> +#include <mach/imx/esdctl.h> +#include <mach/imx/iomux-mx6.h> #include <debug_ll.h> +#include <mach/imx/debug_ll.h> static inline void setup_uart(void) { |