arm: sc8830: fix redefined macro warnings

[profile/mobile/platform/kernel/u-boot-tm1.git] / arch / arm / include / asm / arch-sc8830 / ldo.h

diff --git a/arch/arm/include/asm/arch-sc8830/ldo.h b/arch/arm/include/asm/arch-sc8830/ldo.h
index 24e7089..2d9f34c 100644 (file)
--- a/arch/arm/include/asm/arch-sc8830/ldo.h
+++ b/arch/arm/include/asm/arch-sc8830/ldo.h
@@ -18,6 +18,9 @@
 #include <asm/arch/adi_hal_internal.h>
 
 /* set or clear the bit of register in reg_addr address */
+#ifdef REG_SETCLRBIT
+#undef REG_SETCLRBIT
+#endif
 #define REG_SETCLRBIT(_reg_addr, _set_bit, _clr_bit)   \
        do {                                            \
                unsigned int reg_val = 0;                       \
@@ -31,6 +34,9 @@
 #define REG_SETBIT(_reg_addr, _bit_mask, _bit_set) ANA_REG_MSK_OR(_reg_addr, _bit_set, _bit_mask);
 
 /* macro used to get voltage level(one bit level) */
+#ifdef GET_LEVELBIT
+#undef GET_LEVELBIT
+#endif
 #define GET_LEVELBIT(_reg_addr, _bit_mask, _bit_set, _level_var)   \
        do {                                                    \
                (_level_var) |= \
@@ -38,6 +44,9 @@
        } while (0)
 
 /* macro used to get voltage level */
+#ifdef GET_LEVEL
+#undef GET_LEVEL
+#endif
 #define GET_LEVEL(_reg_addr, _bit0_mask, _bit1_mask, _level_var)    \
        do {                                                    \
                (_level_var) |= \