From 300bac799e19a013e1e03cbd1feb14dbb2da41e2 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Thu, 28 Sep 2017 20:36:41 +0900 Subject: [PATCH] arm: sc8830: common: remove the redefined macros BIT_XX wan redefined in bits.h. Just include the bits header file in common.h Change-Id: I67b4dacad0353b2d0b9783dd0c2bf3f111fa6449 Signed-off-by: Jaehoon Chung --- arch/arm/include/asm/arch-sc8830/common.h | 37 ++--------------------- 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/arch/arm/include/asm/arch-sc8830/common.h b/arch/arm/include/asm/arch-sc8830/common.h index 33724bc..b25ed0b 100644 --- a/arch/arm/include/asm/arch-sc8830/common.h +++ b/arch/arm/include/asm/arch-sc8830/common.h @@ -22,6 +22,8 @@ #include "linux/string.h" #include "sci_types.h" #include "sc_fdl_reg.h" +#include "bits.h" + /**---------------------------------------------------------------------------* ** Compiler Flag * **---------------------------------------------------------------------------*/ @@ -36,41 +38,6 @@ extern "C" #define DISABLE 0 //#define REG32(x) (*((volatile uint32 *)(x))) -/* - Bit define -*/ -#define BIT_0 0x00000001 -#define BIT_1 0x00000002 -#define BIT_2 0x00000004 -#define BIT_3 0x00000008 -#define BIT_4 0x00000010 -#define BIT_5 0x00000020 -#define BIT_6 0x00000040 -#define BIT_7 0x00000080 -#define BIT_8 0x00000100 -#define BIT_9 0x00000200 -#define BIT_10 0x00000400 -#define BIT_11 0x00000800 -#define BIT_12 0x00001000 -#define BIT_13 0x00002000 -#define BIT_14 0x00004000 -#define BIT_15 0x00008000 -#define BIT_16 0x00010000 -#define BIT_17 0x00020000 -#define BIT_18 0x00040000 -#define BIT_19 0x00080000 -#define BIT_20 0x00100000 -#define BIT_21 0x00200000 -#define BIT_22 0x00400000 -#define BIT_23 0x00800000 -#define BIT_24 0x01000000 -#define BIT_25 0x02000000 -#define BIT_26 0x04000000 -#define BIT_27 0x08000000 -#define BIT_28 0x10000000 -#define BIT_29 0x20000000 -#define BIT_30 0x40000000 -#define BIT_31 0x80000000 /**----------------------------------------------------------------------------* ** Data Prototype ** **----------------------------------------------------------------------------*/ -- 2.34.1