diff options
author | Simon Glass <sjg@chromium.org> | 2020-05-10 11:40:13 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-05-18 21:19:23 -0400 |
commit | cd93d625fd751d55c729c78b10f82109d56a5f1d (patch) | |
tree | 158fd30f3d06142f6a99cbae6ed8ccb0f3be567b /arch/x86 | |
parent | f09f1ecbe77863ecefe586ccd6000064b49105a3 (diff) | |
download | u-boot-cd93d625fd751d55c729c78b10f82109d56a5f1d.zip u-boot-cd93d625fd751d55c729c78b10f82109d56a5f1d.tar.gz u-boot-cd93d625fd751d55c729c78b10f82109d56a5f1d.tar.bz2 |
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/x86')
-rw-r--r-- | arch/x86/cpu/apollolake/fsp_s.c | 1 | ||||
-rw-r--r-- | arch/x86/cpu/apollolake/pmc.c | 1 | ||||
-rw-r--r-- | arch/x86/cpu/baytrail/valleyview.c | 1 | ||||
-rw-r--r-- | arch/x86/cpu/intel_common/lpc.c | 1 | ||||
-rw-r--r-- | arch/x86/cpu/intel_common/p2sb.c | 1 | ||||
-rw-r--r-- | arch/x86/cpu/ivybridge/bd82x6x.c | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/arch-apollolake/lpc.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/arch-apollolake/systemagent.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/arch-broadwell/adsp.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/arch-broadwell/serialio.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/atomic.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/fast_spi.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/intel_pinctrl.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/msr-index.h | 4 | ||||
-rw-r--r-- | arch/x86/lib/scu.c | 1 |
15 files changed, 18 insertions, 0 deletions
diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c index 7d62af9..3e303f8 100644 --- a/arch/x86/cpu/apollolake/fsp_s.c +++ b/arch/x86/cpu/apollolake/fsp_s.c @@ -23,6 +23,7 @@ #include <asm/arch/systemagent.h> #include <asm/arch/fsp/fsp_configs.h> #include <asm/arch/fsp/fsp_s_upd.h> +#include <linux/bitops.h> #define PCH_P2SB_E0 0xe0 #define HIDE_BIT BIT(0) diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c index c82cbdc..192dec7 100644 --- a/arch/x86/cpu/apollolake/pmc.c +++ b/arch/x86/cpu/apollolake/pmc.c @@ -16,6 +16,7 @@ #include <acpi/acpi_s3.h> #include <asm/io.h> #include <asm/pci.h> +#include <linux/bitops.h> #include <power/acpi_pmc.h> #define GPIO_GPE_CFG 0x1050 diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c index f2e48f4..f73738c 100644 --- a/arch/x86/cpu/baytrail/valleyview.c +++ b/arch/x86/cpu/baytrail/valleyview.c @@ -11,6 +11,7 @@ #include <asm/mrccache.h> #include <asm/post.h> #include <asm/arch/iomap.h> +#include <linux/bitops.h> /* GPIO SUS */ #define GPIO_SUS_PAD_BASE (IO_BASE_ADDRESS + IO_BASE_OFFSET_GPSSUS) diff --git a/arch/x86/cpu/intel_common/lpc.c b/arch/x86/cpu/intel_common/lpc.c index 2a538cf..3420f03 100644 --- a/arch/x86/cpu/intel_common/lpc.c +++ b/arch/x86/cpu/intel_common/lpc.c @@ -12,6 +12,7 @@ #include <asm/intel_regs.h> #include <asm/io.h> #include <asm/lpc_common.h> +#include <linux/bitops.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c index 860eaf9..ec35d04 100644 --- a/arch/x86/cpu/intel_common/p2sb.c +++ b/arch/x86/cpu/intel_common/p2sb.c @@ -14,6 +14,7 @@ #include <p2sb.h> #include <spl.h> #include <asm/pci.h> +#include <linux/bitops.h> struct p2sb_platdata { #if CONFIG_IS_ENABLED(OF_PLATDATA) diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c index d72c0d6..5448f06 100644 --- a/arch/x86/cpu/ivybridge/bd82x6x.c +++ b/arch/x86/cpu/ivybridge/bd82x6x.c @@ -18,6 +18,7 @@ #include <asm/arch/model_206ax.h> #include <asm/arch/pch.h> #include <asm/arch/sandybridge.h> +#include <linux/bitops.h> #include <linux/delay.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/include/asm/arch-apollolake/lpc.h b/arch/x86/include/asm/arch-apollolake/lpc.h index 5d2adad..977b7ec 100644 --- a/arch/x86/include/asm/arch-apollolake/lpc.h +++ b/arch/x86/include/asm/arch-apollolake/lpc.h @@ -7,6 +7,7 @@ #ifndef _ASM_ARCH_LPC_H #define _ASM_ARCH_LPC_H +#include <linux/bitops.h> #define LPC_SERIRQ_CTL 0x64 #define LPC_SCNT_EN BIT(7) #define LPC_SCNT_MODE BIT(6) diff --git a/arch/x86/include/asm/arch-apollolake/systemagent.h b/arch/x86/include/asm/arch-apollolake/systemagent.h index 206d890..9e7bd62 100644 --- a/arch/x86/include/asm/arch-apollolake/systemagent.h +++ b/arch/x86/include/asm/arch-apollolake/systemagent.h @@ -8,6 +8,7 @@ #define _ASM_ARCH_SYSTEMAGENT_H /* Device 0:0.0 PCI configuration space */ +#include <linux/bitops.h> #define MCHBAR 0x48 /* RAPL Package Power Limit register under MCHBAR */ diff --git a/arch/x86/include/asm/arch-broadwell/adsp.h b/arch/x86/include/asm/arch-broadwell/adsp.h index eb825ce..a5a1f73 100644 --- a/arch/x86/include/asm/arch-broadwell/adsp.h +++ b/arch/x86/include/asm/arch-broadwell/adsp.h @@ -10,6 +10,7 @@ #ifndef __ASM_ARCH_BROADWELL_ADSP_H #define __ASM_ARCH_BROADWELL_ADSP_H +#include <linux/bitops.h> #define ADSP_PCI_IRQ 23 #define ADSP_ACPI_IRQ 3 #define ADSP_ACPI_IRQEN BIT(3) diff --git a/arch/x86/include/asm/arch-broadwell/serialio.h b/arch/x86/include/asm/arch-broadwell/serialio.h index 5e98eaf..ff09278 100644 --- a/arch/x86/include/asm/arch-broadwell/serialio.h +++ b/arch/x86/include/asm/arch-broadwell/serialio.h @@ -9,6 +9,7 @@ #define __ARCH_BROADWELL_SERIALIO_H_ /* Serial IO IOBP Registers */ +#include <linux/bitops.h> #define SIO_IOBP_PORTCTRL0 0xcb000000 /* SDIO D23:F0 */ #define SIO_IOBP_PORTCTRL0_ACPI_IRQ_EN BIT(5) #define SIO_IOBP_PORTCTRL0_PCI_CONF_DIS BIT(4) diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h index 806f787..4ca0f79 100644 --- a/arch/x86/include/asm/atomic.h +++ b/arch/x86/include/asm/atomic.h @@ -1,6 +1,7 @@ #ifndef _ASM_X86_ATOMIC_H #define _ASM_X86_ATOMIC_H +#include <linux/bitops.h> #include <linux/compiler.h> #include <linux/types.h> #include <asm/processor.h> diff --git a/arch/x86/include/asm/fast_spi.h b/arch/x86/include/asm/fast_spi.h index 6894298..47c1da8 100644 --- a/arch/x86/include/asm/fast_spi.h +++ b/arch/x86/include/asm/fast_spi.h @@ -7,6 +7,7 @@ #define ASM_FAST_SPI_H /* Register offsets from the MMIO region base (PCI_BASE_ADDRESS_0) */ +#include <linux/bitops.h> struct fast_spi_regs { u32 bfp; u32 hsfsts_ctl; diff --git a/arch/x86/include/asm/intel_pinctrl.h b/arch/x86/include/asm/intel_pinctrl.h index 72fd924..e2524b0 100644 --- a/arch/x86/include/asm/intel_pinctrl.h +++ b/arch/x86/include/asm/intel_pinctrl.h @@ -10,6 +10,7 @@ #define __ASM_INTEL_PINCTRL_H #include <dm/pinctrl.h> +#include <linux/bitops.h> /** * struct pad_config - config for a pad diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 246c14f..94e6b18 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -9,6 +9,10 @@ #ifndef _ASM_X86_MSR_INDEX_H #define _ASM_X86_MSR_INDEX_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + /* CPU model specific register (MSR) numbers */ /* x86-64 specific MSRs */ diff --git a/arch/x86/lib/scu.c b/arch/x86/lib/scu.c index 41e6739..d29d701 100644 --- a/arch/x86/lib/scu.c +++ b/arch/x86/lib/scu.c @@ -15,6 +15,7 @@ #include <syscon.h> #include <asm/cpu.h> #include <asm/scu.h> +#include <linux/bitops.h> #include <linux/delay.h> #include <linux/errno.h> #include <linux/io.h> |