diff options
Diffstat (limited to 'arch')
192 files changed, 370 insertions, 4 deletions
diff --git a/arch/arc/include/asm/arcregs.h b/arch/arc/include/asm/arcregs.h index 516c14e105..a9f54f61e0 100644 --- a/arch/arc/include/asm/arcregs.h +++ b/arch/arc/include/asm/arcregs.h @@ -109,6 +109,8 @@ #define ARC_AUX_SUBSYS_BUILD 0xF0 #ifndef __ASSEMBLY__ +#include <linux/bitops.h> + /* Accessors for auxiliary registers */ #define read_aux_reg(reg) __builtin_arc_lr(reg) diff --git a/arch/arc/lib/cache.c b/arch/arc/lib/cache.c index 8a1d67870a..85651b219c 100644 --- a/arch/arc/lib/cache.c +++ b/arch/arc/lib/cache.c @@ -6,6 +6,7 @@ #include <config.h> #include <common.h> #include <cpu_func.h> +#include <linux/bitops.h> #include <linux/compiler.h> #include <linux/kernel.h> #include <linux/log2.h> diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c index f032f3e2f2..27b5832a0c 100644 --- a/arch/arc/lib/cpu.c +++ b/arch/arc/lib/cpu.c @@ -9,6 +9,7 @@ #include <vsprintf.h> #include <asm/arcregs.h> #include <asm/cache.h> +#include <linux/bitops.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/armv7/mpu_v7r.c b/arch/arm/cpu/armv7/mpu_v7r.c index 6deecfdc23..57ab640e26 100644 --- a/arch/arm/cpu/armv7/mpu_v7r.c +++ b/arch/arm/cpu/armv7/mpu_v7r.c @@ -12,6 +12,7 @@ #include <asm/armv7.h> #include <asm/system.h> #include <asm/barriers.h> +#include <linux/bitops.h> #include <linux/compiler.h> #include <asm/armv7_mpu.h> diff --git a/arch/arm/cpu/armv7m/cache.c b/arch/arm/cpu/armv7m/cache.c index 72fc34db1c..d1aecf6a85 100644 --- a/arch/arm/cpu/armv7m/cache.c +++ b/arch/arm/cpu/armv7m/cache.c @@ -11,6 +11,7 @@ #include <asm/armv7m.h> #include <asm/cache.h> #include <asm/io.h> +#include <linux/bitops.h> /* Cache maintenance operation registers */ diff --git a/arch/arm/cpu/armv7m/systick-timer.c b/arch/arm/cpu/armv7m/systick-timer.c index dbe1b61977..d2672fd40c 100644 --- a/arch/arm/cpu/armv7m/systick-timer.c +++ b/arch/arm/cpu/armv7m/systick-timer.c @@ -25,6 +25,7 @@ #include <init.h> #include <time.h> #include <asm/io.h> +#include <linux/bitops.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c index 3f1da43614..aa6fd6b28c 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c @@ -8,6 +8,7 @@ #include <env.h> #include <log.h> #include <asm/io.h> +#include <linux/bitops.h> #include <linux/delay.h> #include <linux/errno.h> #include <asm/arch/fsl_serdes.h> diff --git a/arch/arm/cpu/armv8/generic_timer.c b/arch/arm/cpu/armv8/generic_timer.c index 6fe3ede387..e23629ab0b 100644 --- a/arch/arm/cpu/armv8/generic_timer.c +++ b/arch/arm/cpu/armv8/generic_timer.c @@ -9,6 +9,7 @@ #include <command.h> #include <time.h> #include <asm/system.h> +#include <linux/bitops.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/armv8/hisilicon/pinmux.c b/arch/arm/cpu/armv8/hisilicon/pinmux.c index 6b6ad02031..5183e00a44 100644 --- a/arch/arm/cpu/armv8/hisilicon/pinmux.c +++ b/arch/arm/cpu/armv8/hisilicon/pinmux.c @@ -10,6 +10,7 @@ #include <asm/gpio.h> #include <asm/io.h> #include <asm/arch/pinmux.h> +#include <linux/bitops.h> struct hi6220_pinmux0_regs *pmx0 = (struct hi6220_pinmux0_regs *)HI6220_PINMUX0_BASE; diff --git a/arch/arm/cpu/armv8/s32v234/cpu.c b/arch/arm/cpu/armv8/s32v234/cpu.c index 5394a6697e..8ee3adc805 100644 --- a/arch/arm/cpu/armv8/s32v234/cpu.c +++ b/arch/arm/cpu/armv8/s32v234/cpu.c @@ -12,6 +12,7 @@ #include <asm/armv8/mmu.h> #include <asm/io.h> #include <asm/arch/mc_me_regs.h> +#include <linux/bitops.h> #include "cpu.h" u32 cpu_mask(void) diff --git a/arch/arm/include/asm/arch-am33xx/cpu.h b/arch/arm/include/asm/arch-am33xx/cpu.h index 9b819b0a1c..79081de700 100644 --- a/arch/arm/include/asm/arch-am33xx/cpu.h +++ b/arch/arm/include/asm/arch-am33xx/cpu.h @@ -12,6 +12,7 @@ #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) #include <asm/types.h> +#include <linux/bitops.h> #endif /* !(__KERNEL_STRICT_NAMES || __ASSEMBLY__) */ #include <asm/arch/hardware.h> diff --git a/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h b/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h index 64809d5deb..0b73ebdbb4 100644 --- a/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h +++ b/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h @@ -10,6 +10,10 @@ #ifndef __AM43XX_HARDWARE_AM43XX_H #define __AM43XX_HARDWARE_AM43XX_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + /* Module base addresses */ /* L3 Fast Configuration Bandwidth Limiter Base Address */ diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h index ddd9390df4..908d860027 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/config.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h @@ -10,6 +10,10 @@ #include <linux/kconfig.h> #include <fsl_ddrc_version.h> +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define CONFIG_STANDALONE_LOAD_ADDR 0x80300000 /* diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h index 862ec2e2f1..c9be0768e3 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h @@ -7,6 +7,9 @@ #define __ARCH_FSL_LSCH2_IMMAP_H__ #include <fsl_immap.h> +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif #define CONFIG_SYS_IMMR 0x01000000 #define CONFIG_SYS_DCSRBAR 0x20000000 diff --git a/arch/arm/include/asm/arch-hi3660/hi3660.h b/arch/arm/include/asm/arch-hi3660/hi3660.h index 3ca0951543..882262d13c 100644 --- a/arch/arm/include/asm/arch-hi3660/hi3660.h +++ b/arch/arm/include/asm/arch-hi3660/hi3660.h @@ -7,6 +7,10 @@ #ifndef __HI3660_H__ #define __HI3660_H__ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define HI3660_UART6_BASE 0xfff32000 #define PMU_REG_BASE 0xfff34000 diff --git a/arch/arm/include/asm/arch-imx8/iomux.h b/arch/arm/include/asm/arch-imx8/iomux.h index bedd01bfd8..3acef1ea6b 100644 --- a/arch/arm/include/asm/arch-imx8/iomux.h +++ b/arch/arm/include/asm/arch-imx8/iomux.h @@ -6,6 +6,10 @@ #ifndef __ASM_ARCH_IMX8_IOMUX_H__ #define __ASM_ARCH_IMX8_IOMUX_H__ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + /* * We use 64bits value for iomux settings. * High 32bits are used for padring register value, diff --git a/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h b/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h index 140e8bbabd..63b14b9ca5 100644 --- 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 __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define PLL_1443X_RATE(_rate, _m, _p, _s, _k) \ { \ .rate = (_rate), \ diff --git a/arch/arm/include/asm/arch-imx8m/clock_imx8mq.h b/arch/arm/include/asm/arch-imx8m/clock_imx8mq.h index 9dda6ddc8c..742cbf3bf8 100644 --- a/arch/arm/include/asm/arch-imx8m/clock_imx8mq.h +++ b/arch/arm/include/asm/arch-imx8m/clock_imx8mq.h @@ -8,6 +8,10 @@ #ifndef _ASM_ARCH_IMX8M_CLOCK_H #define _ASM_ARCH_IMX8M_CLOCK_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + enum pll_clocks { ANATOP_ARM_PLL, ANATOP_GPU_PLL, diff --git a/arch/arm/include/asm/arch-meson/axg.h b/arch/arm/include/asm/arch-meson/axg.h index d293f2a839..91c87696e0 100644 --- a/arch/arm/include/asm/arch-meson/axg.h +++ b/arch/arm/include/asm/arch-meson/axg.h @@ -7,6 +7,10 @@ #ifndef __AXG_H__ #define __AXG_H__ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define AXG_AOBUS_BASE 0xff800000 #define AXG_PERIPHS_BASE 0xff634400 #define AXG_HIU_BASE 0xff63c000 diff --git a/arch/arm/include/asm/arch-meson/g12a.h b/arch/arm/include/asm/arch-meson/g12a.h index b806667860..db29cc3a00 100644 --- a/arch/arm/include/asm/arch-meson/g12a.h +++ b/arch/arm/include/asm/arch-meson/g12a.h @@ -7,6 +7,10 @@ #ifndef __G12A_H__ #define __G12A_H__ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define G12A_AOBUS_BASE 0xff800000 #define G12A_PERIPHS_BASE 0xff634400 #define G12A_HIU_BASE 0xff63c000 diff --git a/arch/arm/include/asm/arch-meson/gx.h b/arch/arm/include/asm/arch-meson/gx.h index b781ba9475..743d2e8bb9 100644 --- a/arch/arm/include/asm/arch-meson/gx.h +++ b/arch/arm/include/asm/arch-meson/gx.h @@ -6,6 +6,10 @@ #ifndef __GX_H__ #define __GX_H__ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define GX_FIRMWARE_MEM_SIZE 0x1000000 #define GX_AOBUS_BASE 0xc8100000 diff --git a/arch/arm/include/asm/arch-meson/sd_emmc.h b/arch/arm/include/asm/arch-meson/sd_emmc.h index e3a72c8b66..1e9f8cf498 100644 --- a/arch/arm/include/asm/arch-meson/sd_emmc.h +++ b/arch/arm/include/asm/arch-meson/sd_emmc.h @@ -7,6 +7,10 @@ #define __SD_EMMC_H__ #include <mmc.h> +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define SDIO_PORT_A 0 #define SDIO_PORT_B 1 diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h index 5b41a7a4b8..ccd48e8305 100644 --- a/arch/arm/include/asm/arch-mx6/imx-regs.h +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h @@ -372,6 +372,7 @@ #include <asm/mach-imx/regs-lcdif.h> #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) #include <asm/types.h> +#include <linux/bitops.h> /* only for i.MX6SX/UL */ #define WDOG3_BASE_ADDR (((is_mx6ul() || is_mx6ull()) ? \ diff --git a/arch/arm/include/asm/arch-mx7/imx-regs.h b/arch/arm/include/asm/arch-mx7/imx-regs.h index 7b23abbc7e..95238dcaa8 100644 --- a/arch/arm/include/asm/arch-mx7/imx-regs.h +++ b/arch/arm/include/asm/arch-mx7/imx-regs.h @@ -225,6 +225,7 @@ #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) #include <asm/mach-imx/regs-lcdif.h> #include <asm/types.h> +#include <linux/bitops.h> extern void imx_get_mac_from_fuse(int dev_id, unsigned char *mac); diff --git a/arch/arm/include/asm/arch-mx7/mx7-ddr.h b/arch/arm/include/asm/arch-mx7/mx7-ddr.h index 3c0790487e..37aaee0ad7 100644 --- a/arch/arm/include/asm/arch-mx7/mx7-ddr.h +++ b/arch/arm/include/asm/arch-mx7/mx7-ddr.h @@ -10,6 +10,10 @@ #ifndef __ASM_ARCH_MX7_DDR_H__ #define __ASM_ARCH_MX7_DDR_H__ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + /* DDRC Registers (DDRC_IPS_BASE_ADDR) */ struct ddrc { u32 mstr; /* 0x0000 */ diff --git a/arch/arm/include/asm/arch-rockchip/cru.h b/arch/arm/include/asm/arch-rockchip/cru.h index 5cf2aec11a..5eb17f9d55 100644 --- a/arch/arm/include/asm/arch-rockchip/cru.h +++ b/arch/arm/include/asm/arch-rockchip/cru.h @@ -7,6 +7,10 @@ #ifndef _ROCKCHIP_CLOCK_H #define _ROCKCHIP_CLOCK_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #if defined(CONFIG_ROCKCHIP_RK3288) # include <asm/arch-rockchip/cru_rk3288.h> #elif defined(CONFIG_ROCKCHIP_RK3399) diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3128.h b/arch/arm/include/asm/arch-rockchip/cru_rk3128.h index 40a5ca7390..cca812d29e 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rk3128.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rk3128.h @@ -6,6 +6,10 @@ #ifndef _ASM_ARCH_CRU_RK3128_H #define _ASM_ARCH_CRU_RK3128_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define MHz 1000000 #define OSC_HZ (24 * MHz) diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3368.h b/arch/arm/include/asm/arch-rockchip/cru_rk3368.h index 714cea85b4..316c67c62f 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rk3368.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rk3368.h @@ -6,6 +6,10 @@ #ifndef _ASM_ARCH_CRU_RK3368_H #define _ASM_ARCH_CRU_RK3368_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + /* RK3368 clock numbers */ enum rk3368_pll_id { APLLB, diff --git a/arch/arm/include/asm/arch-rockchip/cru_rv1108.h b/arch/arm/include/asm/arch-rockchip/cru_rv1108.h index 1db25afe26..0ba5ff6a04 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rv1108.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rv1108.h @@ -6,6 +6,10 @@ #ifndef _ASM_ARCH_CRU_RV1108_H #define _ASM_ARCH_CRU_RV1108_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define OSC_HZ (24 * 1000 * 1000) #define APLL_HZ (600 * 1000000) diff --git a/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h b/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h index 82234cf8ad..40cdcf4a45 100644 --- a/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h +++ b/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h @@ -6,6 +6,10 @@ #ifndef __ASM_ARCH_DDR_RK3368_H__ #define __ASM_ARCH_DDR_RK3368_H__ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + /* * The RK3368 DDR PCTL differs from the incarnation in the RK3288 only * in a few details. Most notably, it has an additional field to track diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3368.h b/arch/arm/include/asm/arch-rockchip/grf_rk3368.h index 45e882b3c9..0079d20078 100644 --- a/arch/arm/include/asm/arch-rockchip/grf_rk3368.h +++ b/arch/arm/include/asm/arch-rockchip/grf_rk3368.h @@ -6,6 +6,10 @@ #ifndef _ASM_ARCH_GRF_RK3368_H #define _ASM_ARCH_GRF_RK3368_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + struct rk3368_grf { u32 gpio1a_iomux; u32 gpio1b_iomux; diff --git a/arch/arm/include/asm/arch-rockchip/lvds_rk3288.h b/arch/arm/include/asm/arch-rockchip/lvds_rk3288.h index 0f00df6bf5..fb25504b12 100644 --- a/arch/arm/include/asm/arch-rockchip/lvds_rk3288.h +++ b/arch/arm/include/asm/arch-rockchip/lvds_rk3288.h @@ -6,6 +6,10 @@ #ifndef _ASM_ARCH_LVDS_RK3288_H #define _ASM_ARCH_LVDS_RK3288_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define RK3288_LVDS_CH0_REG0 0x00 #define RK3288_LVDS_CH0_REG0_LVDS_EN BIT(7) #define RK3288_LVDS_CH0_REG0_TTL_EN BIT(6) diff --git a/arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h b/arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h index 9781881738..3a3657789f 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h @@ -7,6 +7,10 @@ #define _ASM_ARCH_SDRAM_PCTL_PX30_H #include <asm/arch-rockchip/sdram_common.h> +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + struct ddr_pctl_regs { u32 pctl[30][2]; }; diff --git a/arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h b/arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h index c75a633c91..a033a18538 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h @@ -8,6 +8,10 @@ #include <asm/arch-rockchip/sdram_common.h> #include <asm/arch-rockchip/sdram_phy_ron_rtt_px30.h> +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + struct ddr_phy_regs { u32 phy[5][2]; }; diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h index 99942e6aac..6f6c5c9954 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h @@ -5,6 +5,10 @@ #ifndef _ASM_ARCH_SDRAM_RK322X_H #define _ASM_ARCH_SDRAM_RK322X_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + struct rk322x_sdram_channel { /* * bit width in address, eg: diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h index 267649fda4..c76372ee82 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h @@ -7,6 +7,9 @@ #define _ASM_ARCH_SDRAM_RK3399_H #include <asm/arch-rockchip/sdram_common.h> #include <asm/arch-rockchip/sdram_msch.h> +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif struct rk3399_ddr_pctl_regs { u32 denali_ctl[332]; diff --git a/arch/arm/include/asm/arch-stih410/sdhci.h b/arch/arm/include/asm/arch-stih410/sdhci.h index 105d3580ef..d5557b89fc 100644 --- a/arch/arm/include/asm/arch-stih410/sdhci.h +++ b/arch/arm/include/asm/arch-stih410/sdhci.h @@ -7,6 +7,10 @@ #ifndef __STI_SDHCI_H__ #define __STI_SDHCI_H__ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define FLASHSS_MMC_CORE_CONFIG_1 0x400 #define FLASHSS_MMC_CORECFG_TIMEOUT_CLK_UNIT_MHZ BIT(24) #define FLASHSS_MMC_CORECFG_TIMEOUT_CLK_FREQ_MIN BIT(12) diff --git a/arch/arm/include/asm/arch-stm32f4/stm32_pwr.h b/arch/arm/include/asm/arch-stm32f4/stm32_pwr.h index de42996037..8af6de220d 100644 --- a/arch/arm/include/asm/arch-stm32f4/stm32_pwr.h +++ b/arch/arm/include/asm/arch-stm32f4/stm32_pwr.h @@ -5,6 +5,11 @@ */ #ifndef __STM32_PWR_H_ +#define __STM32_PWR_H_ + +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif /* * Offsets of some PWR registers diff --git a/arch/arm/include/asm/arch-stm32f7/stm32_pwr.h b/arch/arm/include/asm/arch-stm32f7/stm32_pwr.h index c93fc5a7e3..02faaeb663 100644 --- a/arch/arm/include/asm/arch-stm32f7/stm32_pwr.h +++ b/arch/arm/include/asm/arch-stm32f7/stm32_pwr.h @@ -5,6 +5,11 @@ */ #ifndef __STM32_PWR_H_ +#define __STM32_PWR_H_ + +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif /* * Offsets of some PWR registers diff --git a/arch/arm/include/asm/arch-stm32f7/syscfg.h b/arch/arm/include/asm/arch-stm32f7/syscfg.h index ce2a952f78..985ae2544d 100644 --- a/arch/arm/include/asm/arch-stm32f7/syscfg.h +++ b/arch/arm/include/asm/arch-stm32f7/syscfg.h @@ -7,6 +7,10 @@ #ifndef _STM32_SYSCFG_H #define _STM32_SYSCFG_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + struct stm32_syscfg_regs { u32 memrmp; u32 pmc; diff --git a/arch/arm/include/asm/arch-sunxi/ccu.h b/arch/arm/include/asm/arch-sunxi/ccu.h index 5dd97ab227..cac5c5faf0 100644 --- a/arch/arm/include/asm/arch-sunxi/ccu.h +++ b/arch/arm/include/asm/arch-sunxi/ccu.h @@ -7,6 +7,10 @@ #ifndef _ASM_ARCH_CCU_H #define _ASM_ARCH_CCU_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + /** * enum ccu_flags - ccu clock/reset flags * diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h b/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h index e36937059b..426069fc69 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h @@ -9,6 +9,10 @@ #ifndef _SUNXI_CLOCK_SUN50I_H6_H #define _SUNXI_CLOCK_SUN50I_H6_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + struct sunxi_ccm_reg { u32 pll1_cfg; /* 0x000 pll1 (cpux) control */ u8 reserved_0x004[12]; diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun9i.h b/arch/arm/include/asm/arch-sunxi/clock_sun9i.h index 530e0dd73b..fe6b8ba273 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun9i.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun9i.h @@ -8,6 +8,10 @@ #ifndef _SUNXI_CLOCK_SUN9I_H #define _SUNXI_CLOCK_SUN9I_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + struct sunxi_ccm_reg { u32 pll1_c0_cfg; /* 0x00 c0cpu# pll configuration */ u32 pll2_c1_cfg; /* 0x04 c1cpu# pll configuration */ diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h index 49a8a66f7b..be02655cdd 100644 --- a/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h +++ b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h @@ -10,6 +10,9 @@ #define _SUNXI_DRAM_SUN50I_H6_H #include <stdbool.h> +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif enum sunxi_dram_type { SUNXI_DRAM_TYPE_DDR3 = 3, diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun6i.h b/arch/arm/include/asm/arch-sunxi/dram_sun6i.h index 929450fc67..b66d58cd73 100644 --- a/arch/arm/include/asm/arch-sunxi/dram_sun6i.h +++ b/arch/arm/include/asm/arch-sunxi/dram_sun6i.h @@ -13,6 +13,10 @@ #ifndef _SUNXI_DRAM_SUN6I_H #define _SUNXI_DRAM_SUN6I_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + struct sunxi_mctl_com_reg { u32 cr; /* 0x00 */ u32 ccr; /* 0x04 controller configuration register */ diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h index 49a6108c19..3f65306cc6 100644 --- a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h +++ b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h @@ -11,6 +11,10 @@ #ifndef _SUNXI_DRAM_SUN8I_A33_H #define _SUNXI_DRAM_SUN8I_A33_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + struct sunxi_mctl_com_reg { u32 cr; /* 0x00 */ u32 ccr; /* 0x04 controller configuration register */ diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h index d4634e55e4..2a87996354 100644 --- a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h +++ b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h @@ -11,6 +11,10 @@ #ifndef _SUNXI_DRAM_SUN8I_A83T_H #define _SUNXI_DRAM_SUN8I_A83T_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + struct sunxi_mctl_com_reg { u32 cr; /* 0x00 */ u32 ccr; /* 0x04 controller configuration register */ diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun9i.h b/arch/arm/include/asm/arch-sunxi/dram_sun9i.h index 603850b9ff..41df5fe5b6 100644 --- a/arch/arm/include/asm/arch-sunxi/dram_sun9i.h +++ b/arch/arm/include/asm/arch-sunxi/dram_sun9i.h @@ -11,6 +11,10 @@ #ifndef _SUNXI_DRAM_SUN9I_H #define _SUNXI_DRAM_SUN9I_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + struct sunxi_mctl_com_reg { u32 cr; /* 0x00 */ u32 ccr; /* 0x04 controller configuration register */ diff --git a/arch/arm/include/asm/arch-sunxi/pwm.h b/arch/arm/include/asm/arch-sunxi/pwm.h index dca283c7a9..b89bddd2e8 100644 --- a/arch/arm/include/asm/arch-sunxi/pwm.h +++ b/arch/arm/include/asm/arch-sunxi/pwm.h @@ -6,6 +6,10 @@ #ifndef _SUNXI_PWM_H #define _SUNXI_PWM_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define SUNXI_PWM_CTRL_REG (SUNXI_PWM_BASE + 0) #define SUNXI_PWM_CH0_PERIOD (SUNXI_PWM_BASE + 4) diff --git a/arch/arm/include/asm/arch-tegra/dc.h b/arch/arm/include/asm/arch-tegra/dc.h index 59347dd3d8..6444af2993 100644 --- a/arch/arm/include/asm/arch-tegra/dc.h +++ b/arch/arm/include/asm/arch-tegra/dc.h @@ -7,6 +7,10 @@ #ifndef __ASM_ARCH_TEGRA_DC_H #define __ASM_ARCH_TEGRA_DC_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + /* Register definitions for the Tegra display controller */ /* CMD register 0x000 ~ 0x43 */ diff --git a/arch/arm/include/asm/arch-tegra/pmc.h b/arch/arm/include/asm/arch-tegra/pmc.h index 1524bf2911..e1f5a73813 100644 --- a/arch/arm/include/asm/arch-tegra/pmc.h +++ b/arch/arm/include/asm/arch-tegra/pmc.h @@ -7,6 +7,10 @@ #ifndef _PMC_H_ #define _PMC_H_ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + /* Power Management Controller (APBDEV_PMC_) registers */ struct pmc_ctlr { uint pmc_cntrl; /* _CNTRL_0, offset 00 */ diff --git a/arch/arm/include/asm/arch-tegra124/flow.h b/arch/arm/include/asm/arch-tegra124/flow.h index 62947bf99c..ebcb22f1cb 100644 --- a/arch/arm/include/asm/arch-tegra124/flow.h +++ b/arch/arm/include/asm/arch-tegra124/flow.h @@ -7,6 +7,10 @@ #ifndef _TEGRA124_FLOW_H_ #define _TEGRA124_FLOW_H_ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + struct flow_ctlr { u32 halt_cpu_events; /* offset 0x00 */ u32 halt_cop_events; /* offset 0x04 */ diff --git a/arch/arm/include/asm/arch-vf610/imx-regs.h b/arch/arm/include/asm/arch-vf610/imx-regs.h index 03def8e3c5..97211f4b12 100644 --- a/arch/arm/include/asm/arch-vf610/imx-regs.h +++ b/arch/arm/include/asm/arch-vf610/imx-regs.h @@ -302,6 +302,7 @@ #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) #include <asm/types.h> +#include <linux/bitops.h> /* System Reset Controller (SRC) */ struct src { diff --git a/arch/arm/include/asm/armv7_mpu.h b/arch/arm/include/asm/armv7_mpu.h index 8f77ec42a6..16b9d0d1ae 100644 --- a/arch/arm/include/asm/armv7_mpu.h +++ b/arch/arm/include/asm/armv7_mpu.h @@ -7,6 +7,10 @@ #ifndef _ASM_ARMV7_MPU_H #define _ASM_ARMV7_MPU_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #ifdef CONFIG_CPU_V7M #define AP_SHIFT 24 #define XN_SHIFT 28 diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h index b02c454d04..fa8548624a 100644 --- a/arch/arm/include/asm/bitops.h +++ b/arch/arm/include/asm/bitops.h @@ -16,9 +16,15 @@ #define __ASM_ARM_BITOPS_H #include <asm-generic/bitops/__ffs.h> +#include <asm-generic/bitops/__fls.h> +#include <asm-generic/bitops/fls.h> +#include <asm-generic/bitops/fls64.h> #ifdef __KERNEL__ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif #include <asm/proc-armv/system.h> #define smp_mb__before_clear_bit() do { } while (0) @@ -176,8 +182,4 @@ found_middle: #endif /* __KERNEL__ */ -#include <asm-generic/bitops/__fls.h> -#include <asm-generic/bitops/fls.h> -#include <asm-generic/bitops/fls64.h> - #endif /* _ARM_BITOPS_H */ diff --git a/arch/arm/include/asm/gic-v3.h b/arch/arm/include/asm/gic-v3.h index ac6c9e7013..5131fabec4 100644 --- a/arch/arm/include/asm/gic-v3.h +++ b/arch/arm/include/asm/gic-v3.h @@ -6,6 +6,10 @@ #ifndef __GIC_V3_H__ #define __GIC_V3_H__ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define GICR_CTLR_ENABLE_LPIS BIT(0) #define GICR_CTLR_RWP BIT(3) diff --git a/arch/arm/include/asm/omap_mmc.h b/arch/arm/include/asm/omap_mmc.h index 6d31cc4422..7933ad5a86 100644 --- a/arch/arm/include/asm/omap_mmc.h +++ b/arch/arm/include/asm/omap_mmc.h @@ -26,6 +26,9 @@ #define OMAP_MMC_H_ #include <mmc.h> +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif struct hsmmc { #ifndef CONFIG_OMAP34XX diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index ac0ab6253f..67e9234066 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -100,6 +100,7 @@ #ifndef __ASSEMBLY__ #include <asm/types.h> +#include <linux/bitops.h> /* These 3 helper functions assume cpu < CONFIG_ARMV7_PSCI_NR_CPUS */ u32 psci_get_target_pc(int cpu); diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h index bba1048499..0852ce80a6 100644 --- a/arch/arm/include/asm/ti-common/keystone_net.h +++ b/arch/arm/include/asm/ti-common/keystone_net.h @@ -11,6 +11,9 @@ #include <asm/io.h> #include <phy.h> +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif /* EMAC */ #ifdef CONFIG_KSNET_NETCP_V1_0 diff --git a/arch/arm/include/asm/ti-common/omap_wdt.h b/arch/arm/include/asm/ti-common/omap_wdt.h index fbc421b630..42d7e4c989 100644 --- a/arch/arm/include/asm/ti-common/omap_wdt.h +++ b/arch/arm/include/asm/ti-common/omap_wdt.h @@ -10,6 +10,10 @@ #ifndef __OMAP_WDT_H__ #define __OMAP_WDT_H__ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + /* * Watchdog: * Using the prescaler, the OMAP watchdog could go for many diff --git a/arch/arm/include/asm/ti-common/ti-edma3.h b/arch/arm/include/asm/ti-common/ti-edma3.h index 96c8a31fb8..9abdbc88e4 100644 --- a/arch/arm/include/asm/ti-common/ti-edma3.h +++ b/arch/arm/include/asm/ti-common/ti-edma3.h @@ -9,6 +9,9 @@ #ifndef _EDMA3_H_ #define _EDMA3_H_ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif #include <linux/stddef.h> #define EDMA3_PARSET_NULL_LINK 0xffff diff --git a/arch/arm/lib/gic-v3-its.c b/arch/arm/lib/gic-v3-its.c index 6ee22d2944..90f37a123c 100644 --- a/arch/arm/lib/gic-v3-its.c +++ b/arch/arm/lib/gic-v3-its.c @@ -6,6 +6,7 @@ #include <asm/gic.h> #include <asm/gic-v3.h> #include <asm/io.h> +#include <linux/bitops.h> #include <linux/sizes.h> static u32 lpi_id_bits; diff --git a/arch/arm/lib/image.c b/arch/arm/lib/image.c index 9cf4a67406..94590d3049 100644 --- a/arch/arm/lib/image.c +++ b/arch/arm/lib/image.c @@ -7,6 +7,7 @@ #include <common.h> #include <image.h> #include <mapmem.h> +#include <linux/bitops.h> #include <linux/sizes.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-at91/include/mach/at91_pmc.h b/arch/arm/mach-at91/include/mach/at91_pmc.h index f423afd0ad..2ce99d956c 100644 --- a/arch/arm/mach-at91/include/mach/at91_pmc.h +++ b/arch/arm/mach-at91/include/mach/at91_pmc.h @@ -24,6 +24,7 @@ #else #include <asm/types.h> +#include <linux/bitops.h> typedef struct at91_pmc { u32 scer; /* 0x00 System Clock Enable Register */ diff --git a/arch/arm/mach-at91/include/mach/at91_sfr.h b/arch/arm/mach-at91/include/mach/at91_sfr.h index 0300c336dd..4517df41bc 100644 --- a/arch/arm/mach-at91/include/mach/at91_sfr.h +++ b/arch/arm/mach-at91/include/mach/at91_sfr.h @@ -9,6 +9,7 @@ #ifndef __AT91_SFR_H #define __AT91_SFR_H +#include <linux/bitops.h> struct atmel_sfr { u32 reserved1; /* 0x00 */ union { diff --git a/arch/arm/mach-at91/include/mach/atmel_pio4.h b/arch/arm/mach-at91/include/mach/atmel_pio4.h index 7a03d6d3c7..f348b05bc8 100644 --- a/arch/arm/mach-at91/include/mach/atmel_pio4.h +++ b/arch/arm/mach-at91/include/mach/atmel_pio4.h @@ -9,6 +9,7 @@ #ifndef __ASSEMBLY__ +#include <linux/bitops.h> struct atmel_pio4_port { u32 mskr; /* 0x00 PIO Mask Register */ u32 cfgr; /* 0x04 PIO Configuration Register */ diff --git a/arch/arm/mach-exynos/include/mach/clock.h b/arch/arm/mach-exynos/include/mach/clock.h index e4c706adea..9d23c476f9 100644 --- a/arch/arm/mach-exynos/include/mach/clock.h +++ b/arch/arm/mach-exynos/include/mach/clock.h @@ -8,6 +8,7 @@ #define __ASM_ARM_ARCH_CLOCK_H_ #ifndef __ASSEMBLY__ +#include <linux/bitops.h> struct exynos4_clock { unsigned char res1[0x4200]; unsigned int src_leftbus; diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mm.c b/arch/arm/mach-imx/imx8m/clock_imx8mm.c index 8ea7f016c2..aafe2ed084 100644 --- a/arch/arm/mach-imx/imx8m/clock_imx8mm.c +++ b/arch/arm/mach-imx/imx8m/clock_imx8mm.c @@ -12,6 +12,7 @@ #include <asm/io.h> #include <div64.h> #include <errno.h> +#include <linux/bitops.h> #include <linux/delay.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 137b9f3b59..1d2c8e6db2 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -22,6 +22,7 @@ #include <fdt_support.h> #include <fsl_wdog.h> #include <imx_sip.h> +#include <linux/bitops.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-imx/imxrt/soc.c b/arch/arm/mach-imx/imxrt/soc.c index 8d5fae9a97..8e7d15160d 100644 --- a/arch/arm/mach-imx/imxrt/soc.c +++ b/arch/arm/mach-imx/imxrt/soc.c @@ -8,6 +8,7 @@ #include <init.h> #include <asm/io.h> #include <asm/armv7_mpu.h> +#include <linux/bitops.h> int arch_cpu_init(void) { diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c index 0936522283..8dd6b4d40e 100644 --- a/arch/arm/mach-imx/mx7ulp/soc.c +++ b/arch/arm/mach-imx/mx7ulp/soc.c @@ -13,6 +13,7 @@ #include <asm/arch/sys_proto.h> #include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/hab.h> +#include <linux/bitops.h> #define PMC0_BASE_ADDR 0x410a1000 #define PMC0_CTRL 0x28 diff --git a/arch/arm/mach-k3/include/mach/am6_hardware.h b/arch/arm/mach-k3/include/mach/am6_hardware.h index 6df7631545..a91ef5f735 100644 --- a/arch/arm/mach-k3/include/mach/am6_hardware.h +++ b/arch/arm/mach-k3/include/mach/am6_hardware.h @@ -8,6 +8,9 @@ #define __ASM_ARCH_AM6_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) diff --git a/arch/arm/mach-k3/include/mach/j721e_hardware.h b/arch/arm/mach-k3/include/mach/j721e_hardware.h index ead136ed63..0deed66eff 100644 --- 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> +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif #define CTRL_MMR0_BASE 0x00100000 #define CTRLMMR_MAIN_DEVSTAT (CTRL_MMR0_BASE + 0x30) diff --git a/arch/arm/mach-k3/include/mach/j721e_spl.h b/arch/arm/mach-k3/include/mach/j721e_spl.h index 475278bd04..959bdd4358 100644 --- a/arch/arm/mach-k3/include/mach/j721e_spl.h +++ b/arch/arm/mach-k3/include/mach/j721e_spl.h @@ -7,6 +7,7 @@ #define _ASM_ARCH_J721E_SPL_H_ /* With BootMode B = 0 */ +#include <linux/bitops.h> #define BOOT_DEVICE_HYPERFLASH 0x00 #define BOOT_DEVICE_OSPI 0x01 #define BOOT_DEVICE_QSPI 0x02 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 { diff --git a/arch/arm/mach-mediatek/mt7629/init.c b/arch/arm/mach-mediatek/mt7629/init.c index aa9ff2bdba..c260413a57 100644 --- a/arch/arm/mach-mediatek/mt7629/init.c +++ b/arch/arm/mach-mediatek/mt7629/init.c @@ -14,6 +14,7 @@ #include <asm/arch/misc.h> #include <asm/sections.h> #include <dm/uclass.h> +#include <linux/bitops.h> #include <linux/io.h> #include <dt-bindings/clock/mt7629-clk.h> diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c index bfae0c36ea..3abb27e03b 100644 --- a/arch/arm/mach-meson/board-info.c +++ b/arch/arm/mach-meson/board-info.c @@ -11,6 +11,7 @@ #include <linux/bitfield.h> #include <regmap.h> #include <syscon.h> +#include <linux/bitops.h> #include <linux/err.h> #define AO_SEC_SD_CFG8 0xe0 diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c index dd660769e2..ebbb880b71 100644 --- a/arch/arm/mach-meson/sm.c +++ b/arch/arm/mach-meson/sm.c @@ -12,6 +12,7 @@ #include <asm/arch/sm.h> #include <asm/cache.h> #include <asm/ptrace.h> +#include <linux/bitops.h> #include <linux/err.h> #include <linux/kernel.h> #include <dm.h> diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c index d6e84f1e20..e438b4922e 100644 --- a/arch/arm/mach-mvebu/armada3700/cpu.c +++ b/arch/arm/mach-mvebu/armada3700/cpu.c @@ -9,6 +9,7 @@ #include <dm.h> #include <fdtdec.h> #include <init.h> +#include <linux/bitops.h> #include <linux/libfdt.h> #include <asm/io.h> #include <asm/system.h> diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index c56b0aeb79..3a63dafde4 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -7,6 +7,7 @@ #include <ahci.h> #include <cpu_func.h> #include <init.h> +#include <linux/bitops.h> #include <linux/delay.h> #include <linux/mbus.h> #include <asm/io.h> diff --git a/arch/arm/mach-mvebu/efuse.c b/arch/arm/mach-mvebu/efuse.c index 304be95703..c79eee98fe 100644 --- a/arch/arm/mach-mvebu/efuse.c +++ b/arch/arm/mach-mvebu/efuse.c @@ -10,6 +10,7 @@ #include <asm/arch/cpu.h> #include <asm/arch/efuse.h> #include <asm/arch/soc.h> +#include <linux/bitops.h> #include <linux/delay.h> #include <linux/mbus.h> diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index acb9257c90..3f3b15aa8a 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -10,6 +10,10 @@ #ifndef _MVEBU_SOC_H #define _MVEBU_SOC_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define SOC_MV78230_ID 0x7823 #define SOC_MV78260_ID 0x7826 #define SOC_MV78460_ID 0x7846 diff --git a/arch/arm/mach-mvebu/mbus.c b/arch/arm/mach-mvebu/mbus.c index 39bd200c83..f29abe5911 100644 --- a/arch/arm/mach-mvebu/mbus.c +++ b/arch/arm/mach-mvebu/mbus.c @@ -48,6 +48,7 @@ #include <common.h> #include <malloc.h> +#include <linux/bitops.h> #include <linux/errno.h> #include <asm/io.h> #include <asm/arch/cpu.h> diff --git a/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c b/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c index af50cbc4f4..adef3331a7 100644 --- a/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c +++ b/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c @@ -8,6 +8,7 @@ #include <asm/io.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h> +#include <linux/bitops.h> #include <linux/delay.h> #include "ctrl_pex.h" diff --git a/arch/arm/mach-mvebu/timer.c b/arch/arm/mach-mvebu/timer.c index 50b78cb07b..43b3ed15d0 100644 --- a/arch/arm/mach-mvebu/timer.c +++ b/arch/arm/mach-mvebu/timer.c @@ -10,6 +10,7 @@ #include <init.h> #include <asm/io.h> #include <asm/arch/soc.h> +#include <linux/bitops.h> #define TIMER_LOAD_VAL 0xffffffff diff --git a/arch/arm/mach-omap2/abb.c b/arch/arm/mach-omap2/abb.c index 108c93542d..722e6db056 100644 --- a/arch/arm/mach-omap2/abb.c +++ b/arch/arm/mach-omap2/abb.c @@ -13,6 +13,7 @@ #include <asm/arch/clock.h> #include <asm/io.h> #include <asm/arch/sys_proto.h> +#include <linux/bitops.h> __weak s8 abb_setup_ldovbb(u32 fuse, u32 ldovbb) { diff --git a/arch/arm/mach-omap2/am33xx/clock_ti816x.c b/arch/arm/mach-omap2/am33xx/clock_ti816x.c index e9c7b2d996..ec4cc75381 100644 --- a/arch/arm/mach-omap2/am33xx/clock_ti816x.c +++ b/arch/arm/mach-omap2/am33xx/clock_ti816x.c @@ -27,6 +27,7 @@ #include <asm/arch/clock.h> #include <asm/arch/hardware.h> #include <asm/io.h> +#include <linux/bitops.h> #include <asm/emif.h> diff --git a/arch/arm/mach-omap2/omap5/abb.c b/arch/arm/mach-omap2/omap5/abb.c index 446f99f634..2f9f8e65d0 100644 --- a/arch/arm/mach-omap2/omap5/abb.c +++ b/arch/arm/mach-omap2/omap5/abb.c @@ -11,6 +11,7 @@ #include <common.h> #include <asm/omap_common.h> #include <asm/io.h> +#include <linux/bitops.h> /* * Setup LDOVBB for OMAP5. diff --git a/arch/arm/mach-omap2/pipe3-phy.c b/arch/arm/mach-omap2/pipe3-phy.c index 94332b7ede..35ec81d314 100644 --- a/arch/arm/mach-omap2/pipe3-phy.c +++ b/arch/arm/mach-omap2/pipe3-phy.c @@ -11,6 +11,7 @@ #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> #include <asm/io.h> +#include <linux/bitops.h> #include <linux/delay.h> #include <linux/errno.h> #include "pipe3-phy.h" diff --git a/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h b/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h index ecd02b9be0..5cd8a8c787 100644 --- a/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h +++ b/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h @@ -79,6 +79,7 @@ #ifndef __ASSEMBLY__ #include <asm/types.h> +#include <linux/bitops.h> /* RWDT */ struct rcar_rwdt { diff --git a/arch/arm/mach-rmobile/include/mach/sh_sdhi.h b/arch/arm/mach-rmobile/include/mach/sh_sdhi.h index be9b233747..7741718be1 100644 --- a/arch/arm/mach-rmobile/include/mach/sh_sdhi.h +++ b/arch/arm/mach-rmobile/include/mach/sh_sdhi.h @@ -11,6 +11,7 @@ #ifndef _SH_SDHI_H #define _SH_SDHI_H +#include <linux/bitops.h> #define SDHI_CMD (0x0000 >> 1) #define SDHI_PORTSEL (0x0004 >> 1) #define SDHI_ARG0 (0x0008 >> 1) diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c index 35a5c79728..8e8214cf7e 100644 --- a/arch/arm/mach-rockchip/rk3308/rk3308.c +++ b/arch/arm/mach-rockchip/rk3308/rk3308.c @@ -10,6 +10,7 @@ #include <asm/arch-rockchip/hardware.h> #include <asm/gpio.h> #include <debug_uart.h> +#include <linux/bitops.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-rockchip/rk3368/rk3368.c b/arch/arm/mach-rockchip/rk3368/rk3368.c index c865afa5f2..1c6d65a588 100644 --- a/arch/arm/mach-rockchip/rk3368/rk3368.c +++ b/arch/arm/mach-rockchip/rk3368/rk3368.c @@ -14,6 +14,7 @@ #include <asm/arch-rockchip/cru_rk3368.h> #include <asm/arch-rockchip/grf_rk3368.h> #include <asm/arch-rockchip/hardware.h> +#include <linux/bitops.h> #include <linux/delay.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index f263f7e8b2..09b0d6ebe8 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -17,6 +17,7 @@ #include <asm/arch-rockchip/gpio.h> #include <asm/arch-rockchip/grf_rk3399.h> #include <asm/arch-rockchip/hardware.h> +#include <linux/bitops.h> #include <power/regulator.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c index f5a0ac473b..ec2f66d188 100644 --- a/arch/arm/mach-rockchip/spl.c +++ b/arch/arm/mach-rockchip/spl.c @@ -14,6 +14,7 @@ #include <spl.h> #include <asm/arch-rockchip/bootrom.h> #include <asm/io.h> +#include <linux/bitops.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c index 74f185c87f..88f80b05a9 100644 --- a/arch/arm/mach-rockchip/tpl.c +++ b/arch/arm/mach-rockchip/tpl.c @@ -14,6 +14,7 @@ #include <version.h> #include <asm/io.h> #include <asm/arch-rockchip/bootrom.h> +#include <linux/bitops.h> #define TIMER_LOAD_COUNT_L 0x00 #define TIMER_LOAD_COUNT_H 0x04 diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c index 9ba8fdd729..442d236255 100644 --- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c +++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c @@ -11,6 +11,7 @@ #include <errno.h> #include <asm/io.h> #include <dm/pinctrl.h> +#include <linux/bitops.h> #include "pinctrl-snapdragon.h" struct msm_pinctrl_priv { diff --git a/arch/arm/mach-socfpga/include/mach/clock_manager_arria10.h b/arch/arm/mach-socfpga/include/mach/clock_manager_arria10.h index 8d62d75432..11ddee5cb6 100644 --- a/arch/arm/mach-socfpga/include/mach/clock_manager_arria10.h +++ b/arch/arm/mach-socfpga/include/mach/clock_manager_arria10.h @@ -8,6 +8,8 @@ #ifndef __ASSEMBLY__ +#include <linux/bitops.h> + /* Clock manager group */ #define CLKMGR_A10_CTRL 0x00 #define CLKMGR_A10_INTR 0x04 @@ -64,6 +66,7 @@ int cm_basic_init(const void *blob); #endif +#include <linux/bitops.h> unsigned int cm_get_l4_sp_clk_hz(void); unsigned long cm_get_mpu_clk_hz(void); diff --git a/arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h b/arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h index fc6d230156..5c9abe619b 100644 --- a/arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h +++ b/arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h @@ -8,6 +8,8 @@ #ifndef __ASSEMBLY__ +#include <linux/bitops.h> + struct cm_config { /* main group */ u32 main_vco_base; @@ -109,6 +111,7 @@ int cm_basic_init(const struct cm_config * const cfg); const struct cm_config * const cm_get_default_config(void); #endif /* __ASSEMBLY__ */ +#include <linux/bitops.h> #define LOCKED_MASK \ (CLKMGR_INTER_SDRPLLLOCKED_MASK | \ CLKMGR_INTER_PERPLLLOCKED_MASK | \ diff --git a/arch/arm/mach-socfpga/include/mach/clock_manager_s10.h b/arch/arm/mach-socfpga/include/mach/clock_manager_s10.h index 9d2b3babab..cb7923baef 100644 --- a/arch/arm/mach-socfpga/include/mach/clock_manager_s10.h +++ b/arch/arm/mach-socfpga/include/mach/clock_manager_s10.h @@ -8,6 +8,7 @@ #define _CLOCK_MANAGER_S10_ #include <asm/arch/clock_manager_soc64.h> +#include <linux/bitops.h> /* Clock speed accessors */ unsigned long cm_get_mpu_clk_hz(void); diff --git a/arch/arm/mach-socfpga/include/mach/firewall.h b/arch/arm/mach-socfpga/include/mach/firewall.h index 430341bea1..adab65bc96 100644 --- a/arch/arm/mach-socfpga/include/mach/firewall.h +++ b/arch/arm/mach-socfpga/include/mach/firewall.h @@ -7,6 +7,8 @@ #ifndef _FIREWALL_H_ #define _FIREWALL_H_ +#include <linux/bitops.h> + struct socfpga_firwall_l4_per { u32 nand; /* 0x00 */ u32 nand_data; diff --git a/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h b/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h index 62249b3695..048708202c 100644 --- a/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +++ b/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h @@ -7,6 +7,7 @@ #include <asm/cache.h> #include <altera.h> #include <image.h> +#include <linux/bitops.h> #ifndef _FPGA_MANAGER_ARRIA10_H_ #define _FPGA_MANAGER_ARRIA10_H_ diff --git a/arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h b/arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h index c8ec5d4c3c..e08c005628 100644 --- a/arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h +++ b/arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h @@ -7,6 +7,7 @@ #ifndef _FPGA_MANAGER_GEN5_H_ #define _FPGA_MANAGER_GEN5_H_ +#include <linux/bitops.h> #define FPGAMGRREGS_STAT_MODE_MASK 0x7 #define FPGAMGRREGS_STAT_MSEL_MASK 0xf8 #define FPGAMGRREGS_STAT_MSEL_LSB 3 diff --git a/arch/arm/mach-socfpga/include/mach/mailbox_s10.h b/arch/arm/mach-socfpga/include/mach/mailbox_s10.h index ae728a5df5..55707ab9c5 100644 --- a/arch/arm/mach-socfpga/include/mach/mailbox_s10.h +++ b/arch/arm/mach-socfpga/include/mach/mailbox_s10.h @@ -8,6 +8,7 @@ #define _MAILBOX_S10_H_ /* user define Uboot ID */ +#include <linux/bitops.h> #define MBOX_CLIENT_ID_UBOOT 0xB #define MBOX_ID_UBOOT 0x1 diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h b/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h index 22e4eb33de..19507c292d 100644 --- a/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h +++ b/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h @@ -7,6 +7,7 @@ #define _RESET_MANAGER_ARRIA10_H_ #include <dt-bindings/reset/altr,rst-mgr-a10.h> +#include <linux/bitops.h> void socfpga_watchdog_disable(void); void socfpga_reset_deassert_noc_ddr_scheduler(void); diff --git a/arch/arm/mach-socfpga/include/mach/sdram_arria10.h b/arch/arm/mach-socfpga/include/mach/sdram_arria10.h index f2773883fd..ff05994ccc 100644 --- a/arch/arm/mach-socfpga/include/mach/sdram_arria10.h +++ b/arch/arm/mach-socfpga/include/mach/sdram_arria10.h @@ -7,6 +7,7 @@ #define _SOCFPGA_SDRAM_ARRIA10_H_ #ifndef __ASSEMBLY__ +#include <linux/bitops.h> int ddr_calibration_sequence(void); struct socfpga_ecc_hmc { diff --git a/arch/arm/mach-socfpga/include/mach/system_manager.h b/arch/arm/mach-socfpga/include/mach/system_manager.h index 6de0a08131..f816954717 100644 --- a/arch/arm/mach-socfpga/include/mach/system_manager.h +++ b/arch/arm/mach-socfpga/include/mach/system_manager.h @@ -94,5 +94,6 @@ phys_addr_t socfpga_get_sysmgr_addr(void); #define SYSMGR_GET_BOOTINFO_BSEL(bsel) \ (((bsel) >> SYSMGR_BOOTINFO_BSEL_SHIFT) & 7) +#include <linux/bitops.h> #endif #endif /* _SYSTEM_MANAGER_H_ */ diff --git a/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h b/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h index 3a6c9515c6..c90f63a754 100644 --- a/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h +++ b/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h @@ -6,6 +6,7 @@ #ifndef _SYSTEM_MANAGER_SOC64_H_ #define _SYSTEM_MANAGER_SOC64_H_ +#include <linux/bitops.h> void sysmgr_pinmux_init(void); void populate_sysmgr_fpgaintf_module(void); void populate_sysmgr_pinmux(void); diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c index 39acc8cfdb..7209e8d6db 100644 --- a/arch/arm/mach-socfpga/misc_gen5.c +++ b/arch/arm/mach-socfpga/misc_gen5.c @@ -10,6 +10,7 @@ #include <env.h> #include <errno.h> #include <fdtdec.h> +#include <linux/bitops.h> #include <linux/libfdt.h> #include <altera.h> #include <miiphy.h> diff --git a/arch/arm/mach-socfpga/reset_manager_gen5.c b/arch/arm/mach-socfpga/reset_manager_gen5.c index 1008a78dc8..a65860ef02 100644 --- a/arch/arm/mach-socfpga/reset_manager_gen5.c +++ b/arch/arm/mach-socfpga/reset_manager_gen5.c @@ -9,6 +9,7 @@ #include <asm/arch/fpga_manager.h> #include <asm/arch/reset_manager.h> #include <asm/arch/system_manager.h> +#include <linux/bitops.h> /* Assert or de-assert SoCFPGA reset manager reset. */ void socfpga_per_reset(u32 reset, int set) diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c index 91bc9df70a..5a7c5ef76d 100644 --- a/arch/arm/mach-socfpga/spl_gen5.c +++ b/arch/arm/mach-socfpga/spl_gen5.c @@ -24,6 +24,7 @@ #include <fdtdec.h> #include <watchdog.h> #include <dm/uclass.h> +#include <linux/bitops.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c index 82f94191fa..472b140321 100644 --- a/arch/arm/mach-stm32mp/cpu.c +++ b/arch/arm/mach-stm32mp/cpu.c @@ -16,6 +16,7 @@ #include <asm/arch/sys_proto.h> #include <dm/device.h> #include <dm/uclass.h> +#include <linux/bitops.h> /* RCC register */ #define RCC_TZCR (STM32_RCC_BASE + 0x00) diff --git a/arch/arm/mach-stm32mp/include/mach/stm32.h b/arch/arm/mach-stm32mp/include/mach/stm32.h index efa5ac335e..5fdb893b0e 100644 --- a/arch/arm/mach-stm32mp/include/mach/stm32.h +++ b/arch/arm/mach-stm32mp/include/mach/stm32.h @@ -6,6 +6,10 @@ #ifndef _MACH_STM32_H_ #define _MACH_STM32_H_ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + /* * Peripheral memory map * only address used before device tree parsing diff --git a/arch/arm/mach-stm32mp/psci.c b/arch/arm/mach-stm32mp/psci.c index 19f1acfe23..155aa79cd5 100644 --- a/arch/arm/mach-stm32mp/psci.c +++ b/arch/arm/mach-stm32mp/psci.c @@ -11,6 +11,7 @@ #include <asm/io.h> #include <asm/psci.h> #include <asm/secure.h> +#include <linux/bitops.h> #define BOOT_API_A7_CORE0_MAGIC_NUMBER 0xCA7FACE0 #define BOOT_API_A7_CORE1_MAGIC_NUMBER 0xCA7FACE1 diff --git a/arch/arm/mach-stm32mp/pwr_regulator.c b/arch/arm/mach-stm32mp/pwr_regulator.c index b52e1e85d5..900dee4c38 100644 --- a/arch/arm/mach-stm32mp/pwr_regulator.c +++ b/arch/arm/mach-stm32mp/pwr_regulator.c @@ -9,6 +9,7 @@ #include <syscon.h> #include <asm/io.h> #include <dm/device_compat.h> +#include <linux/bitops.h> #include <linux/err.h> #include <power/pmic.h> #include <power/regulator.h> diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c index b46083e9db..8e84062bd7 100644 --- a/arch/arm/mach-sunxi/clock_sun6i.c +++ b/arch/arm/mach-sunxi/clock_sun6i.c @@ -14,6 +14,7 @@ #include <asm/arch/clock.h> #include <asm/arch/prcm.h> #include <asm/arch/sys_proto.h> +#include <linux/bitops.h> #include <linux/delay.h> #ifdef CONFIG_SPL_BUILD diff --git a/arch/arm/mach-sunxi/spl_spi_sunxi.c b/arch/arm/mach-sunxi/spl_spi_sunxi.c index d369df93d4..15e86cbac8 100644 --- a/arch/arm/mach-sunxi/spl_spi_sunxi.c +++ b/arch/arm/mach-sunxi/spl_spi_sunxi.c @@ -9,6 +9,7 @@ #include <spl.h> #include <asm/gpio.h> #include <asm/io.h> +#include <linux/bitops.h> #include <linux/delay.h> #include <linux/libfdt.h> diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c index 4fe6df4812..ccc64eb77b 100644 --- a/arch/arm/mach-tegra/tegra210/clock.c +++ b/arch/arm/mach-tegra/tegra210/clock.c @@ -19,6 +19,7 @@ #include <asm/arch-tegra/timer.h> #include <div64.h> #include <fdtdec.h> +#include <linux/bitops.h> #include <linux/delay.h> /* diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c b/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c index 2edf66d5c1..4aee50f5d3 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c @@ -6,6 +6,7 @@ #include <common.h> #include <spl.h> +#include <linux/bitops.h> #include <linux/io.h> #include <linux/kernel.h> diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c index 43b28f8b86..2fb625535b 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device.c @@ -8,6 +8,7 @@ #include <command.h> #include <spl.h> #include <stdio.h> +#include <linux/bitops.h> #include <linux/bug.h> #include <linux/io.h> #include <linux/log2.h> diff --git a/arch/arm/mach-uniphier/dram/ddrphy-regs.h b/arch/arm/mach-uniphier/dram/ddrphy-regs.h index 6a041c500b..8b342921bf 100644 --- a/arch/arm/mach-uniphier/dram/ddrphy-regs.h +++ b/arch/arm/mach-uniphier/dram/ddrphy-regs.h @@ -9,6 +9,7 @@ #ifndef ARCH_DDRPHY_REGS_H #define ARCH_DDRPHY_REGS_H +#include <linux/bitops.h> #define PHY_REG_SHIFT 2 #define PHY_RIDR (0x000 << PHY_REG_SHIFT) diff --git a/arch/arm/mach-uniphier/dram/umc-pxs2.c b/arch/arm/mach-uniphier/dram/umc-pxs2.c index 7de6b7fbde..3f7e5f30ba 100644 --- a/arch/arm/mach-uniphier/dram/umc-pxs2.c +++ b/arch/arm/mach-uniphier/dram/umc-pxs2.c @@ -9,6 +9,7 @@ #include <init.h> #include <log.h> +#include <linux/bitops.h> #include <linux/delay.h> #include <linux/errno.h> #include <linux/io.h> diff --git a/arch/arm/mach-uniphier/init.h b/arch/arm/mach-uniphier/init.h index 3c77f48853..622303786c 100644 --- a/arch/arm/mach-uniphier/init.h +++ b/arch/arm/mach-uniphier/init.h @@ -7,6 +7,7 @@ #ifndef __MACH_INIT_H #define __MACH_INIT_H +#include <linux/bitops.h> #include <linux/types.h> #define UNIPHIER_MAX_NR_DRAM_CH 3 diff --git a/arch/arm/mach-versal/include/mach/hardware.h b/arch/arm/mach-versal/include/mach/hardware.h index e26beab2e9..9af5afd3f3 100644 --- a/arch/arm/mach-versal/include/mach/hardware.h +++ b/arch/arm/mach-versal/include/mach/hardware.h @@ -3,6 +3,10 @@ * Copyright 2016 - 2018 Xilinx, Inc. */ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define VERSAL_CRL_APB_BASEADDR 0xFF5E0000 #define CRL_APB_TIMESTAMP_REF_CTRL_CLKACT_BIT BIT(25) diff --git a/arch/arm/mach-zynqmp/include/mach/hardware.h b/arch/arm/mach-zynqmp/include/mach/hardware.h index a0acfa2ff1..c5ba42124b 100644 --- a/arch/arm/mach-zynqmp/include/mach/hardware.h +++ b/arch/arm/mach-zynqmp/include/mach/hardware.h @@ -7,6 +7,10 @@ #ifndef _ASM_ARCH_HARDWARE_H #define _ASM_ARCH_HARDWARE_H +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + #define ZYNQMP_TCM_BASE_ADDR 0xFFE00000 #define ZYNQMP_TCM_SIZE 0x40000 diff --git a/arch/mips/include/asm/cm.h b/arch/mips/include/asm/cm.h index 8f37471f81..3878171607 100644 --- a/arch/mips/include/asm/cm.h +++ b/arch/mips/include/asm/cm.h @@ -39,6 +39,7 @@ #ifndef __ASSEMBLY__ #include <asm/io.h> +#include <linux/bitops.h> static inline void *mips_cm_base(void) { diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h index f80311e64e..7538e6b2e0 100644 --- a/arch/mips/include/asm/mipsregs.h +++ b/arch/mips/include/asm/mipsregs.h @@ -27,6 +27,7 @@ #ifdef __ASSEMBLY__ #define _ULCAST_ #else +#include <linux/bitops.h> #define _ULCAST_ (unsigned long) #endif diff --git a/arch/mips/lib/reloc.c b/arch/mips/lib/reloc.c index 1e3cfadd2d..ffc8c7a1b7 100644 --- a/arch/mips/lib/reloc.c +++ b/arch/mips/lib/reloc.c @@ -31,6 +31,7 @@ #include <init.h> #include <asm/relocs.h> #include <asm/sections.h> +#include <linux/bitops.h> /** * read_uint() - Read an unsigned integer from the buffer diff --git a/arch/mips/mach-ath79/ar933x/ddr.c b/arch/mips/mach-ath79/ar933x/ddr.c index 2cf0b2cb1f..09166ecf8f 100644 --- a/arch/mips/mach-ath79/ar933x/ddr.c +++ b/arch/mips/mach-ath79/ar933x/ddr.c @@ -8,6 +8,7 @@ #include <asm/io.h> #include <asm/addrspace.h> #include <asm/types.h> +#include <linux/bitops.h> #include <mach/ar71xx_regs.h> #include <mach/ath79.h> diff --git a/arch/mips/mach-ath79/ar934x/clk.c b/arch/mips/mach-ath79/ar934x/clk.c index bb972b3a60..9fa2225ed2 100644 --- a/arch/mips/mach-ath79/ar934x/clk.c +++ b/arch/mips/mach-ath79/ar934x/clk.c @@ -10,6 +10,7 @@ #include <asm/io.h> #include <asm/addrspace.h> #include <asm/types.h> +#include <linux/bitops.h> #include <linux/delay.h> #include <mach/ar71xx_regs.h> #include <mach/ath79.h> diff --git a/arch/mips/mach-ath79/ar934x/ddr.c b/arch/mips/mach-ath79/ar934x/ddr.c index 9c5a6b68ec..218f60a96c 100644 --- a/arch/mips/mach-ath79/ar934x/ddr.c +++ b/arch/mips/mach-ath79/ar934x/ddr.c @@ -9,6 +9,7 @@ #include <asm/io.h> #include <asm/addrspace.h> #include <asm/types.h> +#include <linux/bitops.h> #include <linux/delay.h> #include <mach/ar71xx_regs.h> #include <mach/ath79.h> diff --git a/arch/mips/mach-ath79/qca953x/ddr.c b/arch/mips/mach-ath79/qca953x/ddr.c index 3a009bb532..78f2370e09 100644 --- a/arch/mips/mach-ath79/qca953x/ddr.c +++ b/arch/mips/mach-ath79/qca953x/ddr.c @@ -8,6 +8,7 @@ #include <asm/io.h> #include <asm/addrspace.h> #include <asm/types.h> +#include <linux/bitops.h> #include <linux/delay.h> #include <mach/ar71xx_regs.h> #include <mach/ath79.h> diff --git a/arch/mips/mach-ath79/reset.c b/arch/mips/mach-ath79/reset.c index 62330a6575..6cd5e77fd1 100644 --- a/arch/mips/mach-ath79/reset.c +++ b/arch/mips/mach-ath79/reset.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <linux/bitops.h> #include <linux/delay.h> #include <linux/errno.h> #include <asm/io.h> diff --git a/arch/mips/mach-jz47xx/include/mach/jz4780_dram.h b/arch/mips/mach-jz47xx/include/mach/jz4780_dram.h index 92d431bd04..61cc148988 100644 --- a/arch/mips/mach-jz47xx/include/mach/jz4780_dram.h +++ b/arch/mips/mach-jz47xx/include/mach/jz4780_dram.h @@ -12,6 +12,7 @@ /* * DDR */ +#include <linux/bitops.h> #define DDRC_ST 0x0 #define DDRC_CFG 0x4 #define DDRC_CTRL 0x8 diff --git a/arch/mips/mach-jz47xx/jz4780/gpio.c b/arch/mips/mach-jz47xx/jz4780/gpio.c index cee2328ab1..d4884e7fa9 100644 --- a/arch/mips/mach-jz47xx/jz4780/gpio.c +++ b/arch/mips/mach-jz47xx/jz4780/gpio.c @@ -3,6 +3,7 @@ #include <config.h> #include <common.h> #include <asm/io.h> +#include <linux/bitops.h> #include <mach/jz4780.h> int jz47xx_gpio_get_value(unsigned int gpio) diff --git a/arch/mips/mach-jz47xx/jz4780/pll.c b/arch/mips/mach-jz47xx/jz4780/pll.c index 43827d1967..323c634fb3 100644 --- a/arch/mips/mach-jz47xx/jz4780/pll.c +++ b/arch/mips/mach-jz47xx/jz4780/pll.c @@ -9,6 +9,7 @@ #include <config.h> #include <common.h> #include <asm/io.h> +#include <linux/bitops.h> #include <linux/delay.h> #include <mach/jz4780.h> diff --git a/arch/mips/mach-jz47xx/jz4780/reset.c b/arch/mips/mach-jz47xx/jz4780/reset.c index 73af34721f..bf6addccb5 100644 --- a/arch/mips/mach-jz47xx/jz4780/reset.c +++ b/arch/mips/mach-jz47xx/jz4780/reset.c @@ -9,6 +9,7 @@ #include <config.h> #include <common.h> #include <asm/io.h> +#include <linux/bitops.h> #include <mach/jz4780.h> /* WDT */ diff --git a/arch/mips/mach-jz47xx/jz4780/sdram.c b/arch/mips/mach-jz47xx/jz4780/sdram.c index efbb82f62b..690f3c5601 100644 --- a/arch/mips/mach-jz47xx/jz4780/sdram.c +++ b/arch/mips/mach-jz47xx/jz4780/sdram.c @@ -13,6 +13,7 @@ #include <hang.h> #include <init.h> #include <asm/io.h> +#include <linux/bitops.h> #include <linux/delay.h> #include <mach/jz4780.h> #include <mach/jz4780_dram.h> diff --git a/arch/mips/mach-jz47xx/jz4780/timer.c b/arch/mips/mach-jz47xx/jz4780/timer.c index 70db74d3a0..82bb9e8c3b 100644 --- a/arch/mips/mach-jz47xx/jz4780/timer.c +++ b/arch/mips/mach-jz47xx/jz4780/timer.c @@ -14,6 +14,7 @@ #include <time.h> #include <asm/io.h> #include <asm/mipsregs.h> +#include <linux/bitops.h> #include <linux/delay.h> #include <mach/jz4780.h> diff --git a/arch/mips/mach-mscc/cpu.c b/arch/mips/mach-mscc/cpu.c index 8273a0f5aa..b4ffd44ea4 100644 --- a/arch/mips/mach-mscc/cpu.c +++ b/arch/mips/mach-mscc/cpu.c @@ -5,6 +5,7 @@ #include <common.h> #include <init.h> +#include <linux/bitops.h> #include <asm/io.h> #include <asm/types.h> diff --git a/arch/mips/mach-mscc/gpio.c b/arch/mips/mach-mscc/gpio.c index 5e3a53372d..d6b4c5d768 100644 --- a/arch/mips/mach-mscc/gpio.c +++ b/arch/mips/mach-mscc/gpio.c @@ -5,6 +5,7 @@ #include <common.h> #include <asm/io.h> +#include <linux/bitops.h> void mscc_gpio_set_alternate(int gpio, int mode) { diff --git a/arch/mips/mach-mscc/include/mach/ddr.h b/arch/mips/mach-mscc/include/mach/ddr.h index bf75e52ec3..d52eabbd2b 100644 --- a/arch/mips/mach-mscc/include/mach/ddr.h +++ b/arch/mips/mach-mscc/include/mach/ddr.h @@ -9,6 +9,7 @@ #include <asm/cacheops.h> #include <asm/io.h> #include <asm/reboot.h> +#include <linux/bitops.h> #include <mach/common.h> #define MIPS_VCOREIII_MEMORY_DDR3 diff --git a/arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb.h b/arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb.h index 4a1228d29f..8d1d21b9b1 100644 --- a/arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb.h +++ b/arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb.h @@ -6,6 +6,8 @@ #ifndef _MSCC_JR2_DEVCPU_GCB_H_ #define _MSCC_JR2_DEVCPU_GCB_H_ +#include <linux/bitops.h> + #define PERF_GPR 0x4 #define PERF_SOFT_RST 0x8 diff --git a/arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb_miim_regs.h b/arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb_miim_regs.h index 3c84edc18a..e11ad8788f 100644 --- a/arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb_miim_regs.h +++ b/arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb_miim_regs.h @@ -6,6 +6,8 @@ #ifndef _MSCC_JR2_DEVCPU_GCB_MIIM_REGS_H_ #define _MSCC_JR2_DEVCPU_GCB_MIIM_REGS_H_ +#include <linux/bitops.h> + #define MIIM_MII_STATUS(gi) (0xc8 + (gi * 36)) #define MIIM_MII_CMD(gi) (0xd0 + (gi * 36)) #define MIIM_MII_DATA(gi) (0xd4 + (gi * 36)) diff --git a/arch/mips/mach-mscc/include/mach/jr2/jr2_icpu_cfg.h b/arch/mips/mach-mscc/include/mach/jr2/jr2_icpu_cfg.h index 6e0bbe2746..151bb3e6d4 100644 --- a/arch/mips/mach-mscc/include/mach/jr2/jr2_icpu_cfg.h +++ b/arch/mips/mach-mscc/include/mach/jr2/jr2_icpu_cfg.h @@ -6,6 +6,8 @@ #ifndef _MSCC_JR2_ICPU_CFG_H_ #define _MSCC_JR2_ICPU_CFG_H_ +#include <linux/bitops.h> + #define ICPU_GPR(x) (0x4 * (x)) #define ICPU_GPR_RSZ 0x4 diff --git a/arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb.h b/arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb.h index a74a68593d..750a8013d1 100644 --- a/arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb.h +++ b/arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb.h @@ -6,6 +6,7 @@ #ifndef _MSCC_OCELOT_DEVCPU_GCB_H_ #define _MSCC_OCELOT_DEVCPU_GCB_H_ +#include <linux/bitops.h> #define PERF_SOFT_RST 0x90 #define PERF_SOFT_RST_SOFT_SWC_RST BIT(1) diff --git a/arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb_miim_regs.h b/arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb_miim_regs.h index 2303734894..07c4f9aeb6 100644 --- a/arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb_miim_regs.h +++ b/arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb_miim_regs.h @@ -8,6 +8,7 @@ #ifndef _MSCC_LUTON_MIIM_REGS_H_ #define _MSCC_LUTON_MIIM_REGS_H_ +#include <linux/bitops.h> #define MIIM_MII_STATUS(gi) (0xa0 + (gi * 36)) #define MIIM_MII_CMD(gi) (0xa8 + (gi * 36)) #define MIIM_MII_DATA(gi) (0xac + (gi * 36)) diff --git a/arch/mips/mach-mscc/include/mach/luton/luton_icpu_cfg.h b/arch/mips/mach-mscc/include/mach/luton/luton_icpu_cfg.h index 9233f037bb..ded7c5fa77 100644 --- a/arch/mips/mach-mscc/include/mach/luton/luton_icpu_cfg.h +++ b/arch/mips/mach-mscc/include/mach/luton/luton_icpu_cfg.h @@ -6,6 +6,7 @@ #ifndef _MSCC_OCELOT_ICPU_CFG_H_ #define _MSCC_OCELOT_ICPU_CFG_H_ +#include <linux/bitops.h> #define ICPU_GPR(x) (0x4 * (x)) #define ICPU_GPR_RSZ 0x4 diff --git a/arch/mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb.h b/arch/mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb.h index b2a4203644..5715ec164c 100644 --- a/arch/mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb.h +++ b/arch/mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb.h @@ -6,6 +6,7 @@ #ifndef _MSCC_OCELOT_DEVCPU_GCB_H_ #define _MSCC_OCELOT_DEVCPU_GCB_H_ +#include <linux/bitops.h> #define PERF_SOFT_RST 0x8 #define PERF_SOFT_RST_SOFT_NON_CFG_RST BIT(2) diff --git a/arch/mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb_miim_regs.h b/arch/mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb_miim_regs.h index 4ad92214a3..50cf073eab 100644 --- a/arch/mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb_miim_regs.h +++ b/arch/mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb_miim_regs.h @@ -6,6 +6,7 @@ #ifndef _MSCC_OCELOT_DEVCPU_GCB_MIIM_REGS_H_ #define _MSCC_OCELOT_DEVCPU_GCB_MIIM_REGS_H_ +#include <linux/bitops.h> #define MIIM_MII_STATUS(gi) (0x9c + (gi * 36)) #define MIIM_MII_CMD(gi) (0xa4 + (gi * 36)) #define MIIM_MII_DATA(gi) (0xa8 + (gi * 36)) diff --git a/arch/mips/mach-mscc/include/mach/ocelot/ocelot_icpu_cfg.h b/arch/mips/mach-mscc/include/mach/ocelot/ocelot_icpu_cfg.h index 04cf70bec3..fb10bf2c26 100644 --- a/arch/mips/mach-mscc/include/mach/ocelot/ocelot_icpu_cfg.h +++ b/arch/mips/mach-mscc/include/mach/ocelot/ocelot_icpu_cfg.h @@ -6,6 +6,7 @@ #ifndef _MSCC_OCELOT_ICPU_CFG_H_ #define _MSCC_OCELOT_ICPU_CFG_H_ +#include <linux/bitops.h> #define ICPU_GPR(x) (0x4 * (x)) #define ICPU_GPR_RSZ 0x4 diff --git a/arch/mips/mach-mscc/include/mach/serval/serval_devcpu_gcb.h b/arch/mips/mach-mscc/include/mach/serval/serval_devcpu_gcb.h index 9b80fdb574..43d40be716 100644 --- a/arch/mips/mach-mscc/include/mach/serval/serval_devcpu_gcb.h +++ b/arch/mips/mach-mscc/include/mach/serval/serval_devcpu_gcb.h @@ -6,6 +6,7 @@ #ifndef _MSCC_SERVAL_DEVCPU_GCB_H_ #define _MSCC_SERVAL_DEVCPU_GCB_H_ +#include <linux/bitops.h> #define CHIP_ID 0x0 #define PERF_GPR 0x4 diff --git a/arch/mips/mach-mscc/include/mach/serval/serval_devcpu_gcb_miim_regs.h b/arch/mips/mach-mscc/include/mach/serval/serval_devcpu_gcb_miim_regs.h index a3abbc4015..e8cb1dcf9a 100644 --- a/arch/mips/mach-mscc/include/mach/serval/serval_devcpu_gcb_miim_regs.h +++ b/arch/mips/mach-mscc/include/mach/serval/serval_devcpu_gcb_miim_regs.h @@ -6,6 +6,7 @@ #ifndef _MSCC_SERVAL_DEVCPU_GCB_MIIM_REGS_H_ #define _MSCC_SERVAL_DEVCPU_GCB_MIIM_REGS_H_ +#include <linux/bitops.h> #define MIIM_MII_STATUS(gi) (0x5c + (gi * 36)) #define MIIM_MII_CMD(gi) (0x64 + (gi * 36)) #define MIIM_MII_DATA(gi) (0x68 + (gi * 36)) diff --git a/arch/mips/mach-mscc/include/mach/serval/serval_icpu_cfg.h b/arch/mips/mach-mscc/include/mach/serval/serval_icpu_cfg.h index b8c9d5ca49..4d4151b3d5 100644 --- a/arch/mips/mach-mscc/include/mach/serval/serval_icpu_cfg.h +++ b/arch/mips/mach-mscc/include/mach/serval/serval_icpu_cfg.h @@ -6,6 +6,7 @@ #ifndef _MSCC_SERVAL_ICPU_CFG_H_ #define _MSCC_SERVAL_ICPU_CFG_H_ +#include <linux/bitops.h> #define ICPU_GPR(x) (0x4 * (x)) #define ICPU_GPR_RSZ 0x8 diff --git a/arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb.h b/arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb.h index 493eaad1df..7d6c64f316 100644 --- a/arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb.h +++ b/arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb.h @@ -6,6 +6,7 @@ #ifndef _MSCC_SERVALT_DEVCPU_GCB_H_ #define _MSCC_SERVALT_DEVCPU_GCB_H_ +#include <linux/bitops.h> #define PERF_GPR 0x4 #define PERF_SOFT_RST 0x8 diff --git a/arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb_miim_regs.h b/arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb_miim_regs.h index 8c67190ecb..72d7c4d08d 100644 --- a/arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb_miim_regs.h +++ b/arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb_miim_regs.h @@ -6,6 +6,7 @@ #ifndef _MSCC_SERVALT_DEVCPU_GCB_MIIM_REGS_H_ #define _MSCC_SERVALT_DEVCPU_GCB_MIIM_REGS_H_ +#include <linux/bitops.h> #define MIIM_MII_STATUS(gi) (0xc4 + (gi * 36)) #define MIIM_MII_CMD(gi) (0xcc + (gi * 36)) #define MIIM_MII_DATA(gi) (0xd0 + (gi * 36)) diff --git a/arch/mips/mach-mscc/include/mach/servalt/servalt_icpu_cfg.h b/arch/mips/mach-mscc/include/mach/servalt/servalt_icpu_cfg.h index 491ead169f..13967f66b0 100644 --- a/arch/mips/mach-mscc/include/mach/servalt/servalt_icpu_cfg.h +++ b/arch/mips/mach-mscc/include/mach/servalt/servalt_icpu_cfg.h @@ -6,6 +6,7 @@ #ifndef _MSCC_SERVALT_ICPU_CFG_H_ #define _MSCC_SERVALT_ICPU_CFG_H_ +#include <linux/bitops.h> #define ICPU_GPR(x) (0x4 * (x)) #define ICPU_GPR_RSZ 0x8 diff --git a/arch/mips/mach-mscc/include/mach/tlb.h b/arch/mips/mach-mscc/include/mach/tlb.h index fdb554f551..ebd8ad0dc1 100644 --- a/arch/mips/mach-mscc/include/mach/tlb.h +++ b/arch/mips/mach-mscc/include/mach/tlb.h @@ -7,6 +7,7 @@ #define __ASM_MACH_TLB_H #include <asm/mipsregs.h> +#include <linux/bitops.h> #include <mach/common.h> #include <linux/sizes.h> diff --git a/arch/mips/mach-mtmips/cpu.c b/arch/mips/mach-mtmips/cpu.c index 9ee5c7fdf6..2ddf8cb096 100644 --- a/arch/mips/mach-mtmips/cpu.c +++ b/arch/mips/mach-mtmips/cpu.c @@ -6,6 +6,7 @@ #include <common.h> #include <init.h> #include <malloc.h> +#include <linux/bitops.h> #include <linux/io.h> #include <linux/sizes.h> diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c index 756535a0b4..7f5e731a0f 100644 --- a/arch/nios2/cpu/cpu.c +++ b/arch/nios2/cpu/cpu.c @@ -13,6 +13,7 @@ #include <init.h> #include <irq_func.h> #include <asm/cache.h> +#include <asm/system.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c index 74f824d2bc..f017985ae9 100644 --- a/arch/powerpc/cpu/mpc83xx/pci.c +++ b/arch/powerpc/cpu/mpc83xx/pci.c @@ -9,6 +9,7 @@ #include <common.h> #include <init.h> #include <pci.h> +#include <asm/bitops.h> #include <linux/delay.h> #if defined(CONFIG_OF_LIBFDT) diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c index c28e4425ee..aeff007fb0 100644 --- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c +++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c @@ -23,6 +23,7 @@ #include <spd.h> #include <asm/mmu.h> #include <spd_sdram.h> +#include <asm/bitops.h> #include <linux/delay.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc85xx/pci.c b/arch/powerpc/cpu/mpc85xx/pci.c index 1d0213a513..9a6fc13b73 100644 --- a/arch/powerpc/cpu/mpc85xx/pci.c +++ b/arch/powerpc/cpu/mpc85xx/pci.c @@ -9,6 +9,7 @@ * PCI Configuration space access support for MPC85xx PCI Bridge */ #include <common.h> +#include <asm/bitops.h> #include <asm/cpm_85xx.h> #include <pci.h> diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c index 808d953c52..4465ae7565 100644 --- a/arch/powerpc/cpu/mpc85xx/tlb.c +++ b/arch/powerpc/cpu/mpc85xx/tlb.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <asm/bitops.h> #include <asm/processor.h> #include <asm/mmu.h> #ifdef CONFIG_ADDR_MAP diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c index 3d00de3181..2c378b7615 100644 --- a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c +++ b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c @@ -7,6 +7,7 @@ #include <common.h> #include <log.h> +#include <linux/bitops.h> #include <linux/log2.h> #include <malloc.h> #include <asm/fsl_pamu.h> diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c index ca9e6aa8eb..e388386ad4 100644 --- a/arch/powerpc/cpu/mpc8xxx/law.c +++ b/arch/powerpc/cpu/mpc8xxx/law.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <asm/bitops.h> #include <linux/compiler.h> #include <asm/fsl_law.h> #include <asm/io.h> diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h index 82e5f9ffc7..353dc4e874 100644 --- a/arch/powerpc/include/asm/mmu.h +++ b/arch/powerpc/include/asm/mmu.h @@ -7,6 +7,7 @@ #ifndef __ASSEMBLY__ /* Hardware Page Table Entry */ +#include <linux/bitops.h> typedef struct _PTE { #ifdef CONFIG_PPC64BRIDGE unsigned long long vsid:52; diff --git a/arch/powerpc/include/asm/u-boot.h b/arch/powerpc/include/asm/u-boot.h index 1841565d0a..19b3c0db5f 100644 --- a/arch/powerpc/include/asm/u-boot.h +++ b/arch/powerpc/include/asm/u-boot.h @@ -13,6 +13,8 @@ #ifndef __U_BOOT_H__ #define __U_BOOT_H__ +#include <config.h> + /* For image.h:image_check_target_arch() */ #define IH_ARCH_DEFAULT IH_ARCH_PPC diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c index 1cebb0322e..5804aa8e73 100644 --- a/arch/riscv/cpu/cpu.c +++ b/arch/riscv/cpu/cpu.c @@ -10,6 +10,7 @@ #include <log.h> #include <asm/encoding.h> #include <dm/uclass-internal.h> +#include <linux/bitops.h> /* * The variables here must be stored in the data section since they are used diff --git a/arch/riscv/include/asm/encoding.h b/arch/riscv/include/asm/encoding.h index a0695da936..edafad36b3 100644 --- a/arch/riscv/include/asm/encoding.h +++ b/arch/riscv/include/asm/encoding.h @@ -8,6 +8,9 @@ #define RISCV_CSR_ENCODING_H #include <asm/csr.h> +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif #if CONFIG_IS_ENABLED(RISCV_SMODE) #define MODE_PREFIX(__suffix) s##__suffix diff --git a/arch/sh/lib/time.c b/arch/sh/lib/time.c index d09f782f5f..f951544728 100644 --- a/arch/sh/lib/time.c +++ b/arch/sh/lib/time.c @@ -14,6 +14,7 @@ #include <init.h> #include <asm/processor.h> #include <asm/io.h> +#include <linux/bitops.h> #if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_RMOBILE) #define TSTR 0x4 diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c index 7d62af9cc0..3e303f8f32 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 c82cbdca6a..192dec7109 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 f2e48f401f..f73738ce5c 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 2a538cf12e..3420f03cca 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 860eaf91f3..ec35d04ae5 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 d72c0d637a..5448f064fc 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 5d2adad319..977b7eccd8 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 206d8903fa..9e7bd62751 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 eb825ce1c0..a5a1f73bf4 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 5e98eaf53f..ff09278b96 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 806f787381..4ca0f79bff 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 6894298526..47c1da80d7 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 72fd9246cb..e2524b089d 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 246c14f815..94e6b18e21 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 41e6739236..d29d701631 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> |