diff options
author | Simon Glass <sjg@chromium.org> | 2020-05-10 20:40:11 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-05-19 04:19:23 +0300 |
commit | c05ed00afb95fa5237f16962fccf5810437317bf (patch) | |
tree | 19bb43dd3c7d12205fffb104db7c799d0a37af9f /arch/arm/cpu | |
parent | 07e1114671c8b13d1bb90548a3c5ea31c49415d1 (diff) | |
download | u-boot-c05ed00afb95fa5237f16962fccf5810437317bf.tar.xz |
common: Drop linux/delay.h from common header
Move this uncommon header out of the common header.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/cpu')
25 files changed, 26 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm920t/ep93xx/timer.c b/arch/arm/cpu/arm920t/ep93xx/timer.c index 0ee6034220..892bb06db1 100644 --- a/arch/arm/cpu/arm920t/ep93xx/timer.c +++ b/arch/arm/cpu/arm920t/ep93xx/timer.c @@ -14,6 +14,7 @@ #include <common.h> #include <init.h> #include <time.h> +#include <linux/delay.h> #include <linux/types.h> #include <asm/arch/ep93xx.h> #include <asm/io.h> diff --git a/arch/arm/cpu/arm920t/imx/timer.c b/arch/arm/cpu/arm920t/imx/timer.c index 21129a7901..e9d5577921 100644 --- a/arch/arm/cpu/arm920t/imx/timer.c +++ b/arch/arm/cpu/arm920t/imx/timer.c @@ -18,6 +18,7 @@ #if defined (CONFIG_IMX) #include <asm/arch/imx-regs.h> +#include <linux/delay.h> int timer_init (void) { @@ -48,7 +49,7 @@ ulong get_timer (ulong base) return get_timer_masked() - base; } -void __udelay (unsigned long usec) +void __udelay(unsigned long usec) { ulong endtime = get_timer_masked() + usec; signed long diff; diff --git a/arch/arm/cpu/arm926ejs/armada100/timer.c b/arch/arm/cpu/arm926ejs/armada100/timer.c index b9941fcb2f..0f1e68c835 100644 --- a/arch/arm/cpu/arm926ejs/armada100/timer.c +++ b/arch/arm/cpu/arm926ejs/armada100/timer.c @@ -12,6 +12,7 @@ #include <time.h> #include <asm/arch/cpu.h> #include <asm/arch/armada100.h> +#include <linux/delay.h> /* * Timer registers diff --git a/arch/arm/cpu/arm926ejs/mx27/timer.c b/arch/arm/cpu/arm926ejs/mx27/timer.c index d6e1e09f93..408e88aa12 100644 --- a/arch/arm/cpu/arm926ejs/mx27/timer.c +++ b/arch/arm/cpu/arm926ejs/mx27/timer.c @@ -22,6 +22,7 @@ #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/ptrace.h> +#include <linux/delay.h> /* General purpose timers bitfields */ #define GPTCR_SWR (1 << 15) /* Software reset */ diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c index d742c0f151..12ebc1c802 100644 --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c @@ -15,6 +15,7 @@ #include <hang.h> #include <init.h> #include <net.h> +#include <linux/delay.h> #include <linux/errno.h> #include <asm/io.h> #include <asm/arch/clock.h> diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c index b6fdc88be7..5ab4ed0c5a 100644 --- a/arch/arm/cpu/arm926ejs/mxs/timer.c +++ b/arch/arm/cpu/arm926ejs/mxs/timer.c @@ -15,6 +15,7 @@ #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h> +#include <linux/delay.h> /* Maximum fixed count */ #if defined(CONFIG_MX23) diff --git a/arch/arm/cpu/arm926ejs/spear/reset.c b/arch/arm/cpu/arm926ejs/spear/reset.c index 3b884cd0d3..a316540d52 100644 --- a/arch/arm/cpu/arm926ejs/spear/reset.c +++ b/arch/arm/cpu/arm926ejs/spear/reset.c @@ -9,6 +9,7 @@ #include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/spr_syscntl.h> +#include <linux/delay.h> void reset_cpu(ulong ignored) { diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c index 6803c349e8..dd0f15c0ce 100644 --- a/arch/arm/cpu/arm926ejs/spear/timer.c +++ b/arch/arm/cpu/arm926ejs/spear/timer.c @@ -12,6 +12,7 @@ #include <asm/arch/spr_gpt.h> #include <asm/arch/spr_misc.h> #include <asm/ptrace.h> +#include <linux/delay.h> #define GPT_RESOLUTION (CONFIG_SPEAR_HZ_CLOCK / CONFIG_SPEAR_HZ) #define READ_TIMER() (readl(&gpt_regs_p->count) & GPT_FREE_RUNNING) diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.c b/arch/arm/cpu/armv7/bcm235xx/clk-core.c index 04366c871f..d7edefee23 100644 --- a/arch/arm/cpu/armv7/bcm235xx/clk-core.c +++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.c @@ -12,6 +12,7 @@ #include <common.h> #include <log.h> #include <asm/io.h> +#include <linux/delay.h> #include <linux/errno.h> #include <bitfield.h> #include <asm/arch/sysmap.h> diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-eth.c b/arch/arm/cpu/armv7/bcm235xx/clk-eth.c index 618af709fa..209ceca9a0 100644 --- a/arch/arm/cpu/armv7/bcm235xx/clk-eth.c +++ b/arch/arm/cpu/armv7/bcm235xx/clk-eth.c @@ -5,6 +5,7 @@ #include <common.h> #include <asm/io.h> +#include <linux/delay.h> #include <linux/errno.h> #include <asm/arch/sysmap.h> #include <asm/kona-common/clk.h> diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.c b/arch/arm/cpu/armv7/bcm281xx/clk-core.c index 574a8a02d8..26b673a540 100644 --- a/arch/arm/cpu/armv7/bcm281xx/clk-core.c +++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.c @@ -12,6 +12,7 @@ #include <common.h> #include <log.h> #include <asm/io.h> +#include <linux/delay.h> #include <linux/errno.h> #include <bitfield.h> #include <asm/arch/sysmap.h> diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-eth.c b/arch/arm/cpu/armv7/bcm281xx/clk-eth.c index 618af709fa..209ceca9a0 100644 --- a/arch/arm/cpu/armv7/bcm281xx/clk-eth.c +++ b/arch/arm/cpu/armv7/bcm281xx/clk-eth.c @@ -5,6 +5,7 @@ #include <common.h> #include <asm/io.h> +#include <linux/delay.h> #include <linux/errno.h> #include <asm/arch/sysmap.h> #include <asm/kona-common/clk.h> diff --git a/arch/arm/cpu/armv7/iproc-common/timer.c b/arch/arm/cpu/armv7/iproc-common/timer.c index 5c109764e9..a4255a44c0 100644 --- a/arch/arm/cpu/armv7/iproc-common/timer.c +++ b/arch/arm/cpu/armv7/iproc-common/timer.c @@ -10,6 +10,7 @@ #include <asm/io.h> #include <asm/iproc-common/timer.h> #include <asm/iproc-common/sysmap.h> +#include <linux/delay.h> static inline uint64_t timer_global_read(void) { diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c index e9464ee7e4..91e988217a 100644 --- a/arch/arm/cpu/armv7/ls102xa/cpu.c +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c @@ -18,6 +18,7 @@ #include <fsl_esdhc.h> #include <config.h> #include <fsl_wdog.h> +#include <linux/delay.h> #include "fsl_epu.h" diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c b/arch/arm/cpu/armv7/ls102xa/timer.c index 46ade4ae86..2a32b30999 100644 --- a/arch/arm/cpu/armv7/ls102xa/timer.c +++ b/arch/arm/cpu/armv7/ls102xa/timer.c @@ -10,6 +10,7 @@ #include <div64.h> #include <asm/arch/immap_ls102xa.h> #include <asm/arch/clock.h> +#include <linux/delay.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c index d2b5b4d3fc..3064fd25d4 100644 --- a/arch/arm/cpu/armv7/s5p-common/timer.c +++ b/arch/arm/cpu/armv7/s5p-common/timer.c @@ -13,6 +13,7 @@ #include <asm/io.h> #include <asm/arch/pwm.h> #include <asm/arch/clk.h> +#include <linux/delay.h> /* Use the old PWM interface for now */ #undef CONFIG_DM_PWM diff --git a/arch/arm/cpu/armv7/stv0991/reset.c b/arch/arm/cpu/armv7/stv0991/reset.c index 008e271dcc..fb67de10f4 100644 --- a/arch/arm/cpu/armv7/stv0991/reset.c +++ b/arch/arm/cpu/armv7/stv0991/reset.c @@ -8,6 +8,7 @@ #include <cpu_func.h> #include <asm/io.h> #include <asm/arch/stv0991_wdru.h> +#include <linux/delay.h> void reset_cpu(ulong ignored) { puts("System is going to reboot ...\n"); diff --git a/arch/arm/cpu/armv7/stv0991/timer.c b/arch/arm/cpu/armv7/stv0991/timer.c index 5adccab012..919529aa1b 100644 --- a/arch/arm/cpu/armv7/stv0991/timer.c +++ b/arch/arm/cpu/armv7/stv0991/timer.c @@ -11,6 +11,7 @@ #include <asm/arch-stv0991/hardware.h> #include <asm/arch-stv0991/stv0991_cgu.h> #include <asm/arch-stv0991/stv0991_gpt.h> +#include <linux/delay.h> static struct stv0991_cgu_regs *const stv0991_cgu_regs = \ (struct stv0991_cgu_regs *) (CGU_BASE_ADDR); diff --git a/arch/arm/cpu/armv7/sunxi/timer.c b/arch/arm/cpu/armv7/sunxi/timer.c index 4f6a66d803..65b64b5ac7 100644 --- a/arch/arm/cpu/armv7/sunxi/timer.c +++ b/arch/arm/cpu/armv7/sunxi/timer.c @@ -10,6 +10,7 @@ #include <time.h> #include <asm/io.h> #include <asm/arch/timer.h> +#include <linux/delay.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/armv7/vf610/timer.c b/arch/arm/cpu/armv7/vf610/timer.c index 229e9e959e..fa8f8fae10 100644 --- a/arch/arm/cpu/armv7/vf610/timer.c +++ b/arch/arm/cpu/armv7/vf610/timer.c @@ -10,6 +10,7 @@ #include <div64.h> #include <asm/arch/imx-regs.h> #include <asm/arch/clock.h> +#include <linux/delay.h> static struct pit_reg *cur_pit = (struct pit_reg *)PIT_BASE_ADDR; diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c index f24ca7f1dc..41c89b8904 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c @@ -6,6 +6,7 @@ #include <common.h> #include <log.h> #include <asm/io.h> +#include <linux/delay.h> #include <linux/errno.h> #include <asm/arch/fsl_serdes.h> #include <asm/arch/soc.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c index 3ac50966e1..3f1da43614 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c @@ -8,6 +8,7 @@ #include <env.h> #include <log.h> #include <asm/io.h> +#include <linux/delay.h> #include <linux/errno.h> #include <asm/arch/fsl_serdes.h> #include <asm/arch/soc.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c index 31536b8181..1ea887b331 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c @@ -11,6 +11,7 @@ #include <asm/system.h> #include <asm/arch/mp.h> #include <asm/arch/soc.h> +#include <linux/delay.h> #include "cpu.h" #include <asm/arch-fsl-layerscape/soc.h> diff --git a/arch/arm/cpu/pxa/usb.c b/arch/arm/cpu/pxa/usb.c index 80a5977415..13e010d91e 100644 --- a/arch/arm/cpu/pxa/usb.c +++ b/arch/arm/cpu/pxa/usb.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <linux/delay.h> #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT) # if defined(CONFIG_CPU_MONAHANS) || defined(CONFIG_CPU_PXA27X) diff --git a/arch/arm/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c index f2cbee5dca..a5cdaf5a66 100644 --- a/arch/arm/cpu/sa1100/timer.c +++ b/arch/arm/cpu/sa1100/timer.c @@ -12,6 +12,7 @@ #include <common.h> #include <SA-1100.h> #include <time.h> +#include <linux/delay.h> static ulong get_timer_masked (void) { |