Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 07:31:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

bitops: collect BIT macros to include/linux/bitops.h

Browse source 
Same macros are defined in various places.  Collect them into
include/linux/bitops.h like Linux.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2017-11-22 02:38:11 +09:00
parent ab5502bf56
commit ed3986ca30
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h
View file

@ -13,6 +13,8 @@
#ifndef _SUNXI_DRAM_SUN8I_H3_H #ifndef _SUNXI_DRAM_SUN8I_H3_H
#define _SUNXI_DRAM_SUN8I_H3_H #define _SUNXI_DRAM_SUN8I_H3_H
#include <linux/bitops.h>
struct sunxi_mctl_com_reg { struct sunxi_mctl_com_reg {
u32 cr; /* 0x00 control register */ u32 cr; /* 0x00 control register */
u32 cr_r1; /* 0x04 rank 1 control register (R40 only) */ u32 cr_r1; /* 0x04 rank 1 control register (R40 only) */
@ -211,7 +213,6 @@ struct sunxi_mctl_ctl_reg {
* the 32-bit wide access consists of. Also three control signals can be * the 32-bit wide access consists of. Also three control signals can be
* adjusted individually. * adjusted individually.
*/ */
#define BITS_PER_BYTE 8
#define NR_OF_BYTE_LANES (32 / BITS_PER_BYTE) #define NR_OF_BYTE_LANES (32 / BITS_PER_BYTE)
/* The eight data lines (DQn) plus DM, DQS and DQSN */ /* The eight data lines (DQn) plus DM, DQS and DQSN */
#define LINES_PER_BYTE_LANE (BITS_PER_BYTE + 3) #define LINES_PER_BYTE_LANE (BITS_PER_BYTE + 3)

4
arch/arm/mach-kirkwood/include/mach/gpio.h
View file

@ -15,10 +15,6 @@
#ifndef __KIRKWOOD_GPIO_H #ifndef __KIRKWOOD_GPIO_H
#define __KIRKWOOD_GPIO_H #define __KIRKWOOD_GPIO_H
/* got from kernel include/linux/bitops.h */
#define BITS_PER_BYTE 8
#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))
#define GPIO_MAX 50 #define GPIO_MAX 50
#define GPIO_OFF(pin) (((pin) >> 5) ? 0x0040 : 0x0000) #define GPIO_OFF(pin) (((pin) >> 5) ? 0x0040 : 0x0000)
#define GPIO_OUT(pin) (MVEBU_GPIO0_BASE + GPIO_OFF(pin) + 0x00) #define GPIO_OUT(pin) (MVEBU_GPIO0_BASE + GPIO_OFF(pin) + 0x00)

2
drivers/gpio/kw_gpio.c
View file

@ -14,7 +14,7 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/bitops.h> #include <linux/bitops.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/soc.h> #include <asm/arch/soc.h>
#include <asm/arch/gpio.h> #include <asm/arch/gpio.h>

2
drivers/mtd/nand/nand_base.c
View file

@ -901,8 +901,6 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip)
return status; return status;
} }
#define BITS_PER_BYTE 8
/** /**
* nand_check_erased_buf - check if a buffer contains (almost) only 0xff data * nand_check_erased_buf - check if a buffer contains (almost) only 0xff data
* @buf: buffer to test * @buf: buffer to test

7
include/linux/bitops.h
View file

@ -5,9 +5,16 @@
#include <asm-generic/bitsperlong.h> #include <asm-generic/bitsperlong.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#ifdef __KERNEL__
#define BIT(nr) (1UL << (nr)) #define BIT(nr) (1UL << (nr))
#define BIT_ULL(nr) (1ULL << (nr))
#define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) #define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG))
#define BIT_WORD(nr) ((nr) / BITS_PER_LONG) #define BIT_WORD(nr) ((nr) / BITS_PER_LONG)
#define BIT_ULL_MASK(nr) (1ULL << ((nr) % BITS_PER_LONG_LONG))
#define BIT_ULL_WORD(nr) ((nr) / BITS_PER_LONG_LONG)
#define BITS_PER_BYTE 8
#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))
#endif
/* /*
* Create a contiguous bitmask starting at bit position @l and ending at * Create a contiguous bitmask starting at bit position @l and ending at

4
include/usb/lin_gadget_compat.h
View file

@ -10,12 +10,10 @@
#ifndef __LIN_COMPAT_H__ #ifndef __LIN_COMPAT_H__
#define __LIN_COMPAT_H__ #define __LIN_COMPAT_H__
#include <linux/bitops.h>
#include <linux/compat.h> #include <linux/compat.h>
/* common */ /* common */
#define BITS_PER_BYTE 8
#define BITS_TO_LONGS(nr) \
DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))
#define DECLARE_BITMAP(name, bits) \ #define DECLARE_BITMAP(name, bits) \
unsigned long name[BITS_TO_LONGS(bits)] unsigned long name[BITS_TO_LONGS(bits)]