Merge pull request #790 from masahir0y/utils

add utility macros to utils.h

drivers/arm/pl061/pl061_gpio.c

@@ -39,6 +39,7 @@
 #include <gpio.h>
 #include <mmio.h>
 #include <pl061_gpio.h>
+#include <utils.h>
 
 #if !PLAT_PL061_MAX_GPIOS
 # define PLAT_PL061_MAX_GPIOS	32
@@ -52,7 +53,6 @@ CASSERT(PLAT_PL061_MAX_GPIOS > 0, assert_plat_pl061_max_gpios);
 #define PL061_GPIO_DIR		0x400
 
 #define GPIOS_PER_PL061		8
-#define BIT(nr)			(1UL << (nr))
 
 static int pl061_get_direction(int gpio);
 static void pl061_set_direction(int gpio, int direction);

include/lib/utils.h

@@ -40,6 +40,8 @@
 
 #define SIZE_FROM_LOG2_WORDS(n)		(4 << (n))
 
+#define BIT(nr)				(1UL << (nr))
+
 /*
  * The round_up() macro rounds up a value to the given boundary in a
  * type-agnostic yet type-safe manner. The boundary must be a power of two.

plat/rockchip/common/include/plat_private.h

@@ -75,10 +75,6 @@ struct rockchip_pm_ops_cb {
  ******************************************************************************/
 #define REG_MSK_SHIFT	16
 
-#ifndef BIT
-#define BIT(nr)			(1 << (nr))
-#endif
-
 #ifndef WMSK_BIT
 #define WMSK_BIT(nr)		BIT((nr) + REG_MSK_SHIFT)
 #endif

plat/rockchip/rk3399/drivers/soc/soc.h

@@ -31,6 +31,8 @@
 #ifndef __SOC_H__
 #define __SOC_H__
 
+#include <utils.h>
+
 #define GLB_SRST_FST_CFG_VAL	0xfdb9
 #define GLB_SRST_SND_CFG_VAL	0xeca8