projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
video: Convert CONFIG_VIDEO_LOGO to Kconfig
[platform/kernel/u-boot.git]
/
include
/
wait_bit.h
diff --git
a/include/wait_bit.h
b/include/wait_bit.h
index
bd021ba
..
dc2ffeb
100644
(file)
--- a/
include/wait_bit.h
+++ b/
include/wait_bit.h
@@
-1,17
+1,18
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Wait for bit with timeout and ctrlc
*
* (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
/*
* Wait for bit with timeout and ctrlc
*
* (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __WAIT_BIT_H
#define __WAIT_BIT_H
*/
#ifndef __WAIT_BIT_H
#define __WAIT_BIT_H
-#include <common.h>
#include <console.h>
#include <console.h>
+#include <log.h>
+#include <time.h>
#include <watchdog.h>
#include <watchdog.h>
+#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/io.h>
#include <linux/errno.h>
#include <asm/io.h>
@@
-73,10
+74,12
@@
static inline int wait_for_bit_##sfx(const void *reg, \
BUILD_WAIT_FOR_BIT(8, u8, readb)
BUILD_WAIT_FOR_BIT(le16, u16, readw)
BUILD_WAIT_FOR_BIT(8, u8, readb)
BUILD_WAIT_FOR_BIT(le16, u16, readw)
+BUILD_WAIT_FOR_BIT(16, u16, readw)
#ifdef readw_be
BUILD_WAIT_FOR_BIT(be16, u16, readw_be)
#endif
BUILD_WAIT_FOR_BIT(le32, u32, readl)
#ifdef readw_be
BUILD_WAIT_FOR_BIT(be16, u16, readw_be)
#endif
BUILD_WAIT_FOR_BIT(le32, u32, readl)
+BUILD_WAIT_FOR_BIT(32, u32, readl)
#ifdef readl_be
BUILD_WAIT_FOR_BIT(be32, u32, readl_be)
#endif
#ifdef readl_be
BUILD_WAIT_FOR_BIT(be32, u32, readl_be)
#endif