diff options
Diffstat (limited to 'arch/arm/boards/sama5d3xek')
-rw-r--r-- | arch/arm/boards/sama5d3xek/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/boards/sama5d3xek/hw_version.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/sama5d3xek/init.c | 17 | ||||
-rw-r--r-- | arch/arm/boards/sama5d3xek/lowlevel.c | 4 |
4 files changed, 13 insertions, 12 deletions
diff --git a/arch/arm/boards/sama5d3xek/Makefile b/arch/arm/boards/sama5d3xek/Makefile index 6ed914fc0a..9691f07917 100644 --- a/arch/arm/boards/sama5d3xek/Makefile +++ b/arch/arm/boards/sama5d3xek/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only + obj-y += init.o obj-$(CONFIG_W1) += hw_version.o lwl-y += lowlevel.o diff --git a/arch/arm/boards/sama5d3xek/hw_version.c b/arch/arm/boards/sama5d3xek/hw_version.c index 03c8df2cad..c64d4566c6 100644 --- a/arch/arm/boards/sama5d3xek/hw_version.c +++ b/arch/arm/boards/sama5d3xek/hw_version.c @@ -151,7 +151,7 @@ static void at91sama5d3xek_devices_detect_one(const char *name) struct one_wire_info info; struct board_info* binfo; struct vendor_info* vinfo; - struct device_d *dev = NULL; + struct device *dev = NULL; char str[16]; char *bname, *vname; u8 vendor_id = 0; diff --git a/arch/arm/boards/sama5d3xek/init.c b/arch/arm/boards/sama5d3xek/init.c index 6e8fbea4c8..b75856198e 100644 --- a/arch/arm/boards/sama5d3xek/init.c +++ b/arch/arm/boards/sama5d3xek/init.c @@ -6,24 +6,23 @@ #include <init.h> #include <environment.h> #include <asm/armlinux.h> -#include <generated/mach-types.h> -#include <partition.h> +#include <asm/mach-types.h> #include <fs.h> #include <fcntl.h> #include <io.h> #include <envfs.h> -#include <mach/hardware.h> +#include <mach/at91/hardware.h> #include <nand.h> #include <linux/sizes.h> #include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h> -#include <mach/board.h> -#include <mach/at91sam9_smc.h> +#include <mach/at91/board.h> +#include <mach/at91/at91sam9_smc.h> #include <gpio.h> -#include <mach/iomux.h> -#include <mach/at91_pmc.h> -#include <mach/at91_rstc.h> -#include <mach/at91sam9x5_matrix.h> +#include <mach/at91/iomux.h> +#include <mach/at91/at91_pmc.h> +#include <mach/at91/at91_rstc.h> +#include <mach/at91/at91sam9x5_matrix.h> #include <input/qt1070.h> #include <readkey.h> #include <poller.h> diff --git a/arch/arm/boards/sama5d3xek/lowlevel.c b/arch/arm/boards/sama5d3xek/lowlevel.c index 28c07d5053..fe5f172127 100644 --- a/arch/arm/boards/sama5d3xek/lowlevel.c +++ b/arch/arm/boards/sama5d3xek/lowlevel.c @@ -10,8 +10,8 @@ #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> -#include <mach/at91_ddrsdrc.h> -#include <mach/hardware.h> +#include <mach/at91/at91_ddrsdrc.h> +#include <mach/at91/hardware.h> void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2) { |