summaryrefslogtreecommitdiff
path: root/drivers/staging/olpc_dcon
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-18 13:09:50 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-18 13:09:50 +0200
commitb125a1b2b9d4692a0f17435101cf3cdaae1d5b25 (patch)
tree4ac6fc1e87317e1bc24dc811a9033e2d9c629c2e /drivers/staging/olpc_dcon
parent7cfae24953fa79c69f1bf4edbf44546648de55ba (diff)
Revert "staging: olpc_dcon: Replace a bit shift by a use of BIT."
This reverts commit ed88363e6aebb91df820e1a8898d2a07b18d2bc9. It was incorrect :( Cc: Anchal Jain <anchalj109@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/olpc_dcon')
-rw-r--r--drivers/staging/olpc_dcon/olpc_dcon.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.h b/drivers/staging/olpc_dcon/olpc_dcon.h
index 23a48a189dbc..215e7ec4dea2 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon.h
+++ b/drivers/staging/olpc_dcon/olpc_dcon.h
@@ -9,18 +9,18 @@
#define DCON_REG_ID 0
#define DCON_REG_MODE 1
-#define MODE_PASSTHRU bit(0)
-#define MODE_SLEEP bit(1)
-#define MODE_SLEEP_AUTO bit(2)
-#define MODE_BL_ENABLE bit(3)
-#define MODE_BLANK bit(4)
-#define MODE_CSWIZZLE bit(5)
-#define MODE_COL_AA bit(6)
-#define MODE_MONO_LUMA bit(7)
-#define MODE_SCAN_INT bit(8)
-#define MODE_CLOCKDIV bit(9)
-#define MODE_DEBUG bit(14)
-#define MODE_SELFTEST bit(15)
+#define MODE_PASSTHRU (1<<0)
+#define MODE_SLEEP (1<<1)
+#define MODE_SLEEP_AUTO (1<<2)
+#define MODE_BL_ENABLE (1<<3)
+#define MODE_BLANK (1<<4)
+#define MODE_CSWIZZLE (1<<5)
+#define MODE_COL_AA (1<<6)
+#define MODE_MONO_LUMA (1<<7)
+#define MODE_SCAN_INT (1<<8)
+#define MODE_CLOCKDIV (1<<9)
+#define MODE_DEBUG (1<<14)
+#define MODE_SELFTEST (1<<15)
#define DCON_REG_HRES 0x2
#define DCON_REG_HTOTAL 0x3
@@ -35,11 +35,11 @@
#define DCON_REG_MEM_OPT_B 0x42
/* Load Delay Locked Loop (DLL) settings for clock delay */
-#define MEM_DLL_CLOCK_DELAY bit(0)
+#define MEM_DLL_CLOCK_DELAY (1<<0)
/* Memory controller power down function */
-#define MEM_POWER_DOWN bit(8)
+#define MEM_POWER_DOWN (1<<8)
/* Memory controller software reset */
-#define MEM_SOFT_RESET bit(0)
+#define MEM_SOFT_RESET (1<<0)
/* Status values */