summaryrefslogtreecommitdiff
path: root/include/asm-arm/arch-pxa/pxa-regs.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-07-13 23:45:02 +0200
committerWolfgang Denk <wd@denx.de>2009-07-13 23:45:02 +0200
commitc3ae126c2cad03f04be36c92dd9437b9ee2385b6 (patch)
treec10c50a9f5369cc8d955869ed4b8e34ffe14969a /include/asm-arm/arch-pxa/pxa-regs.h
parent227ad917c5510f595bed29c996a3411b50118959 (diff)
parent986922714ffd21ad39f48522d285fffc7aed56b1 (diff)
downloadu-boot-imx-c3ae126c2cad03f04be36c92dd9437b9ee2385b6.zip
u-boot-imx-c3ae126c2cad03f04be36c92dd9437b9ee2385b6.tar.gz
u-boot-imx-c3ae126c2cad03f04be36c92dd9437b9ee2385b6.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/asm-arm/arch-pxa/pxa-regs.h')
-rw-r--r--include/asm-arm/arch-pxa/pxa-regs.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/include/asm-arm/arch-pxa/pxa-regs.h
index 5a0885a..2a723dc 100644
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/include/asm-arm/arch-pxa/pxa-regs.h
@@ -1952,12 +1952,13 @@ typedef void (*ExcpHndlr) (void) ;
#define CKENA_2_USBHOST (1 << 2) /* USB Host Unit Clock Enable */
#define CKENA_1_LCD (1 << 1) /* LCD Unit Clock Enable */
-#define CKENB_8_1WIRE ((1 << 8) + 32) /* One Wire Interface Unit Clock Enable */
-#define CKENB_7_GPIO ((1 << 7) + 32) /* GPIO Clock Enable */
-#define CKENB_6_IRQ ((1 << 6) + 32) /* Interrupt Controller Clock Enable */
-#define CKENB_4_I2C ((1 << 4) + 32) /* I2C Unit Clock Enable */
-#define CKENB_1_PWM1 ((1 << 1) + 32) /* PWM2 & PWM3 Clock Enable */
-#define CKENB_0_PWM0 ((1 << 0) + 32) /* PWM0 & PWM1 Clock Enable */
+#define CKENB_9_SYSBUS2 (1 << 9) /* System bus 2 */
+#define CKENB_8_1WIRE (1 << 8) /* One Wire Interface Unit Clock Enable */
+#define CKENB_7_GPIO (1 << 7) /* GPIO Clock Enable */
+#define CKENB_6_IRQ (1 << 6) /* Interrupt Controller Clock Enable */
+#define CKENB_4_I2C (1 << 4) /* I2C Unit Clock Enable */
+#define CKENB_1_PWM1 (1 << 1) /* PWM2 & PWM3 Clock Enable */
+#define CKENB_0_PWM0 (1 << 0) /* PWM0 & PWM1 Clock Enable */
#else /* if defined CONFIG_CPU_MONAHANS */