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

[oweals/u-boot.git] / arch / arm / include / asm / arch-omap5 / mux_dra7xx.h

diff --git a/arch/arm/include/asm/arch-omap5/mux_dra7xx.h b/arch/arm/include/asm/arch-omap5/mux_dra7xx.h
index 13c288b5d31296b472e4f34922b9f7397c6772f7..55f49c784857ec353d6fcfbc161822e88247d444 100644 (file)
--- a/arch/arm/include/asm/arch-omap5/mux_dra7xx.h
+++ b/arch/arm/include/asm/arch-omap5/mux_dra7xx.h
@@ -12,20 +12,6 @@
 
 #include <asm/types.h>
 
-#define FSC    (1 << 19)
-#define SSC    (0 << 19)
-
-#define IEN    (1 << 18)
-#define IDIS   (0 << 18)
-
-#define PTU    (1 << 17)
-#define PTD    (0 << 17)
-#define PEN    (1 << 16)
-#define PDIS   (0 << 16)
-
-#define WKEN   (1 << 24)
-#define WKDIS  (0 << 24)
-
 #define PULL_ENA               (0 << 16)
 #define PULL_DIS               (1 << 16)
 #define PULL_UP                        (1 << 17)
@@ -61,6 +47,8 @@
 #define MODE_SELECT            (1 << 8)
 #define DELAYMODE_SHIFT                4
 
+#define MANUAL_MODE    MODE_SELECT
+
 #define VIRTUAL_MODE0  (MODE_SELECT | (0x0 << DELAYMODE_SHIFT))
 #define VIRTUAL_MODE1  (MODE_SELECT | (0x1 << DELAYMODE_SHIFT))
 #define VIRTUAL_MODE2  (MODE_SELECT | (0x2 << DELAYMODE_SHIFT))
@@ -360,7 +348,7 @@
 #define EMU3           0x454
 #define EMU4           0x458
 #define RESETN         0x45C
-#define NMIN           0x460
+#define NMIN_DSP       0x460
 #define RSTOUTN                0x464
 
 #endif /* _MUX_DRA7XX_H_ */