summaryrefslogtreecommitdiff
path: root/arch/arm/mach-integrator/include/mach/cm.h
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-06-16 00:44:27 (GMT)
committerLinus Walleij <linus.walleij@linaro.org>2013-10-16 12:09:56 (GMT)
commitbb4dbefe4c6ae3685152d03e318e093d5f6f795a (patch)
treea35a87afcae726267ec39ecfaa9549e3d719109b /arch/arm/mach-integrator/include/mach/cm.h
parent578fdfdf32a84ca17ed2090dba4ff2c8e688cc89 (diff)
downloadlinux-fsl-qoriq-bb4dbefe4c6ae3685152d03e318e093d5f6f795a.tar.xz
ARM: integrator: move CM base into device tree
This moves the core module (CM) control base into the device tree. It is a simple memory range of 0x200 bytes. Move the cm header down into the machine directory and unexport the cm_control() symbol as no modules are using it. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-integrator/include/mach/cm.h')
-rw-r--r--arch/arm/mach-integrator/include/mach/cm.h39
1 files changed, 0 insertions, 39 deletions
diff --git a/arch/arm/mach-integrator/include/mach/cm.h b/arch/arm/mach-integrator/include/mach/cm.h
deleted file mode 100644
index ae6085f..0000000
--- a/arch/arm/mach-integrator/include/mach/cm.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * access the core module control register.
- */
-u32 cm_get(void);
-void cm_control(u32, u32);
-
-#define CM_CTRL __io_address(INTEGRATOR_HDR_CTRL)
-
-#define CM_CTRL_LED (1 << 0)
-#define CM_CTRL_nMBDET (1 << 1)
-#define CM_CTRL_REMAP (1 << 2)
-#define CM_CTRL_RESET (1 << 3)
-
-/*
- * Integrator/AP,PP2 specific
- */
-#define CM_CTRL_HIGHVECTORS (1 << 4)
-#define CM_CTRL_BIGENDIAN (1 << 5)
-#define CM_CTRL_FASTBUS (1 << 6)
-#define CM_CTRL_SYNC (1 << 7)
-
-/*
- * ARM926/946/966 Integrator/CP specific
- */
-#define CM_CTRL_LCDBIASEN (1 << 8)
-#define CM_CTRL_LCDBIASUP (1 << 9)
-#define CM_CTRL_LCDBIASDN (1 << 10)
-#define CM_CTRL_LCDMUXSEL_MASK (7 << 11)
-#define CM_CTRL_LCDMUXSEL_GENLCD (1 << 11)
-#define CM_CTRL_LCDMUXSEL_VGA565_TFT555 (2 << 11)
-#define CM_CTRL_LCDMUXSEL_SHARPLCD (3 << 11)
-#define CM_CTRL_LCDMUXSEL_VGA555_TFT555 (4 << 11)
-#define CM_CTRL_LCDEN0 (1 << 14)
-#define CM_CTRL_LCDEN1 (1 << 15)
-#define CM_CTRL_STATIC1 (1 << 16)
-#define CM_CTRL_STATIC2 (1 << 17)
-#define CM_CTRL_STATIC (1 << 18)
-#define CM_CTRL_n24BITEN (1 << 19)
-#define CM_CTRL_EBIWP (1 << 20)