diff options
Diffstat (limited to 'arch/arc')
| -rw-r--r-- | arch/arc/dts/axs10x_mb.dtsi | 4 | ||||
| -rw-r--r-- | arch/arc/dts/hsdk-common.dtsi | 11 | ||||
| -rw-r--r-- | arch/arc/include/asm/arcregs.h | 2 | ||||
| -rw-r--r-- | arch/arc/lib/bootm.c | 7 | ||||
| -rw-r--r-- | arch/arc/lib/cache.c | 1 | ||||
| -rw-r--r-- | arch/arc/lib/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arc/lib/init_helpers.c | 1 | ||||
| -rw-r--r-- | arch/arc/lib/relocate.c | 1 | ||||
| -rw-r--r-- | arch/arc/lib/reset.c | 2 |
9 files changed, 25 insertions, 6 deletions
diff --git a/arch/arc/dts/axs10x_mb.dtsi b/arch/arc/dts/axs10x_mb.dtsi index 5b77642b8d..33b0593438 100644 --- a/arch/arc/dts/axs10x_mb.dtsi +++ b/arch/arc/dts/axs10x_mb.dtsi @@ -62,12 +62,12 @@ max-speed = <100>; }; - ehci@0x40000 { + ehci@40000 { compatible = "generic-ehci"; reg = < 0x40000 0x100 >; }; - ohci@0x60000 { + ohci@60000 { compatible = "generic-ohci"; reg = < 0x60000 0x100 >; }; diff --git a/arch/arc/dts/hsdk-common.dtsi b/arch/arc/dts/hsdk-common.dtsi index fd4245e164..9aa10e4b25 100644 --- a/arch/arc/dts/hsdk-common.dtsi +++ b/arch/arc/dts/hsdk-common.dtsi @@ -84,12 +84,19 @@ phy-mode = "gmii"; }; - ehci@0xf0040000 { + ehci@f0040000 { compatible = "generic-ehci"; reg = <0xf0040000 0x100>; + + /* + * OHCI and EHCI have reset line shared so we don't add + * reset property to OHCI node as it is probed later and + * it will reset sucessfuly probed and configured EHCI HW. + */ + resets = <&cgu_rst HSDK_USB_RESET>; }; - ohci@0xf0060000 { + ohci@f0060000 { compatible = "generic-ohci"; reg = <0xf0060000 0x100>; }; diff --git a/arch/arc/include/asm/arcregs.h b/arch/arc/include/asm/arcregs.h index 516c14e105..a9f54f61e0 100644 --- a/arch/arc/include/asm/arcregs.h +++ b/arch/arc/include/asm/arcregs.h @@ -109,6 +109,8 @@ #define ARC_AUX_SUBSYS_BUILD 0xF0 #ifndef __ASSEMBLY__ +#include <linux/bitops.h> + /* Accessors for auxiliary registers */ #define read_aux_reg(reg) __builtin_arc_lr(reg) diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c index d38c18ef8f..63d6207c04 100644 --- a/arch/arc/lib/bootm.c +++ b/arch/arc/lib/bootm.c @@ -3,9 +3,14 @@ * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ +#include <common.h> +#include <bootstage.h> +#include <env.h> +#include <image.h> #include <irq_func.h> +#include <lmb.h> +#include <log.h> #include <asm/cache.h> -#include <common.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arc/lib/cache.c b/arch/arc/lib/cache.c index 8a1d67870a..85651b219c 100644 --- a/arch/arc/lib/cache.c +++ b/arch/arc/lib/cache.c @@ -6,6 +6,7 @@ #include <config.h> #include <common.h> #include <cpu_func.h> +#include <linux/bitops.h> #include <linux/compiler.h> #include <linux/kernel.h> #include <linux/log2.h> diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c index 83246550ec..27b5832a0c 100644 --- a/arch/arc/lib/cpu.c +++ b/arch/arc/lib/cpu.c @@ -4,10 +4,12 @@ */ #include <common.h> +#include <init.h> #include <malloc.h> #include <vsprintf.h> #include <asm/arcregs.h> #include <asm/cache.h> +#include <linux/bitops.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arc/lib/init_helpers.c b/arch/arc/lib/init_helpers.c index c853f25d34..023eae1907 100644 --- a/arch/arc/lib/init_helpers.c +++ b/arch/arc/lib/init_helpers.c @@ -3,6 +3,7 @@ * Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved. */ +#include <init.h> #include <asm/cache.h> #include <common.h> diff --git a/arch/arc/lib/relocate.c b/arch/arc/lib/relocate.c index 4ffba84eeb..6882ebec6d 100644 --- a/arch/arc/lib/relocate.c +++ b/arch/arc/lib/relocate.c @@ -5,6 +5,7 @@ #include <common.h> #include <elf.h> +#include <log.h> #include <asm-generic/sections.h> extern ulong __image_copy_start; diff --git a/arch/arc/lib/reset.c b/arch/arc/lib/reset.c index 30dd4b5238..fbb56ec83a 100644 --- a/arch/arc/lib/reset.c +++ b/arch/arc/lib/reset.c @@ -13,7 +13,7 @@ __weak void reset_cpu(ulong addr) __builtin_arc_brk(); } -int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { printf("Resetting the board...\n"); |