diff options
| author | Simon Glass <sjg@chromium.org> | 2020-05-10 20:40:13 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-19 04:19:23 +0300 |
| commit | cd93d625fd751d55c729c78b10f82109d56a5f1d (patch) | |
| tree | 158fd30f3d06142f6a99cbae6ed8ccb0f3be567b /arch/arm/mach-keystone | |
| parent | f09f1ecbe77863ecefe586ccd6000064b49105a3 (diff) | |
| download | u-boot-cd93d625fd751d55c729c78b10f82109d56a5f1d.tar.xz | |
common: Drop linux/bitops.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/mach-keystone')
| -rw-r--r-- | arch/arm/mach-keystone/clock.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-keystone/include/mach/clock_defs.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-keystone/include/mach/hardware-k2hk.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-keystone/include/mach/hardware-k2l.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-keystone/include/mach/hardware.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-keystone/include/mach/xhci-keystone.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-keystone/init.c | 1 |
7 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/mach-keystone/clock.c b/arch/arm/mach-keystone/clock.c index 3c46824d0b..0c59515d2e 100644 --- a/arch/arm/mach-keystone/clock.c +++ b/arch/arm/mach-keystone/clock.c @@ -9,6 +9,7 @@ #include <common.h> #include <asm/arch/clock.h> #include <asm/arch/clock_defs.h> +#include <linux/bitops.h> /* DEV and ARM speed definitions as specified in DEVSPEED register */ int __weak speeds[DEVSPEED_NUMSPDS] = { diff --git a/arch/arm/mach-keystone/include/mach/clock_defs.h b/arch/arm/mach-keystone/include/mach/clock_defs.h index 42bd0ac1cd..336b103dc8 100644 --- a/arch/arm/mach-keystone/include/mach/clock_defs.h +++ b/arch/arm/mach-keystone/include/mach/clock_defs.h @@ -9,6 +9,9 @@ #define _CLOCK_DEFS_H_ #include <asm/arch/hardware.h> +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif /* PLL Control Registers */ struct pllctl_regs { diff --git a/arch/arm/mach-keystone/include/mach/hardware-k2hk.h b/arch/arm/mach-keystone/include/mach/hardware-k2hk.h index 7793cf1266..3d078be991 100644 --- a/arch/arm/mach-keystone/include/mach/hardware-k2hk.h +++ b/arch/arm/mach-keystone/include/mach/hardware-k2hk.h @@ -9,6 +9,10 @@ #ifndef __ASM_ARCH_HARDWARE_K2HK_H #define __ASM_ARCH_HARDWARE_K2HK_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define KS2_ARM_PLL_EN BIT(13) /* PA SS Registers */ diff --git a/arch/arm/mach-keystone/include/mach/hardware-k2l.h b/arch/arm/mach-keystone/include/mach/hardware-k2l.h index f46a98cfd1..0e710a3795 100644 --- a/arch/arm/mach-keystone/include/mach/hardware-k2l.h +++ b/arch/arm/mach-keystone/include/mach/hardware-k2l.h @@ -9,6 +9,10 @@ #ifndef __ASM_ARCH_HARDWARE_K2L_H #define __ASM_ARCH_HARDWARE_K2L_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define KS2_ARM_PLL_EN BIT(13) /* PA SS Registers */ diff --git a/arch/arm/mach-keystone/include/mach/hardware.h b/arch/arm/mach-keystone/include/mach/hardware.h index d2234dc88c..0c5dc6a739 100644 --- a/arch/arm/mach-keystone/include/mach/hardware.h +++ b/arch/arm/mach-keystone/include/mach/hardware.h @@ -11,6 +11,7 @@ #include <config.h> #ifndef __ASSEMBLY__ +#include <linux/bitops.h> #include <linux/sizes.h> #include <asm/io.h> diff --git a/arch/arm/mach-keystone/include/mach/xhci-keystone.h b/arch/arm/mach-keystone/include/mach/xhci-keystone.h index a05351292c..989b0c3158 100644 --- a/arch/arm/mach-keystone/include/mach/xhci-keystone.h +++ b/arch/arm/mach-keystone/include/mach/xhci-keystone.h @@ -6,6 +6,10 @@ * Texas Instruments Incorporated, <www.ti.com> */ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define USB3_PHY_REF_SSP_EN BIT(29) #define USB3_PHY_OTG_VBUSVLDECTSEL BIT(16) diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c index d947d40eac..88e8912959 100644 --- a/arch/arm/mach-keystone/init.c +++ b/arch/arm/mach-keystone/init.c @@ -16,6 +16,7 @@ #include <asm/arch/clock.h> #include <asm/arch/hardware.h> #include <asm/arch/psc_defs.h> +#include <linux/bitops.h> #define MAX_PCI_PORTS 2 enum pci_mode { |