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 branch '2020-05-18-reduce-size-of-common.h'
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
arch-imx8m
/
clock_imx8mm.h
diff --git
a/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h
b/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h
index debed6bac7c08b7ee4f7596b5fec2e743ad3d7fb..63b14b9ca58f44808e0da602a39b66c983c4aa34 100644
(file)
--- a/
arch/arm/include/asm/arch-imx8m/clock_imx8mm.h
+++ b/
arch/arm/include/asm/arch-imx8m/clock_imx8mm.h
@@
-8,6
+8,10
@@
#ifndef _ASM_ARCH_IMX8MM_CLOCK_H
#define _ASM_ARCH_IMX8MM_CLOCK_H
#ifndef _ASM_ARCH_IMX8MM_CLOCK_H
#define _ASM_ARCH_IMX8MM_CLOCK_H
+#ifndef __ASSEMBLY__
+#include <linux/bitops.h>
+#endif
+
#define PLL_1443X_RATE(_rate, _m, _p, _s, _k) \
{ \
.rate = (_rate), \
#define PLL_1443X_RATE(_rate, _m, _p, _s, _k) \
{ \
.rate = (_rate), \
@@
-19,7
+23,7
@@
#define LOCK_STATUS BIT(31)
#define LOCK_SEL_MASK BIT(29)
#define LOCK_STATUS BIT(31)
#define LOCK_SEL_MASK BIT(29)
-#define CLKE_MASK BIT(1
1
)
+#define CLKE_MASK BIT(1
3
)
#define RST_MASK BIT(9)
#define BYPASS_MASK BIT(4)
#define MDIV_SHIFT 12
#define RST_MASK BIT(9)
#define BYPASS_MASK BIT(4)
#define MDIV_SHIFT 12
@@
-363,7
+367,8
@@
enum clk_root_src {
EXT_CLK_2,
EXT_CLK_3,
EXT_CLK_4,
EXT_CLK_2,
EXT_CLK_3,
EXT_CLK_4,
- OSC_HDMI_CLK
+ OSC_HDMI_CLK,
+ ARM_A53_ALT_CLK,
};
enum clk_ccgr_index {
};
enum clk_ccgr_index {