projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ti-v2020.07-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
[oweals/u-boot.git]
/
arch
/
arm
/
mach-k3
/
include
/
mach
/
j721e_hardware.h
diff --git
a/arch/arm/mach-k3/include/mach/j721e_hardware.h
b/arch/arm/mach-k3/include/mach/j721e_hardware.h
index 2efa911a9a9d025de75779acd4504512d1e4059e..19873d6e28c496b4839076f1fb4bda6ed79b1016 100644
(file)
--- a/
arch/arm/mach-k3/include/mach/j721e_hardware.h
+++ b/
arch/arm/mach-k3/include/mach/j721e_hardware.h
@@
-8,6
+8,9
@@
#define __ASM_ARCH_J721E_HARDWARE_H
#include <config.h>
#define __ASM_ARCH_J721E_HARDWARE_H
#include <config.h>
+#ifndef __ASSEMBLY__
+#include <linux/bitops.h>
+#endif
#define CTRL_MMR0_BASE 0x00100000
#define CTRLMMR_MAIN_DEVSTAT (CTRL_MMR0_BASE + 0x30)
#define CTRL_MMR0_BASE 0x00100000
#define CTRLMMR_MAIN_DEVSTAT (CTRL_MMR0_BASE + 0x30)