summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/include
diff options
context:
space:
mode:
authorMike Turquette <mturquette@linaro.org>2014-09-30 12:49:42 -0700
committerMike Turquette <mturquette@linaro.org>2014-09-30 12:49:42 -0700
commit38bf3a79785f50ecad01e0ea60bf779507032984 (patch)
treee97036f8b9accbc1a5fae496a4fab1b33f4e0b8a /arch/arm/mach-pxa/include
parent44b4aa97bea84fa8ac179155f147e3483cc7a6e0 (diff)
parent9ff25d7b58d8a4374886843ed3ed21f1ef17bf16 (diff)
downloadblackbird-op-linux-38bf3a79785f50ecad01e0ea60bf779507032984.tar.gz
blackbird-op-linux-38bf3a79785f50ecad01e0ea60bf779507032984.zip
Merge branch 'clk-pxa27x' into clk-next
Diffstat (limited to 'arch/arm/mach-pxa/include')
-rw-r--r--arch/arm/mach-pxa/include/mach/pxa2xx-regs.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h b/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h
index ee6ced1cea7f..f1dd62946b36 100644
--- a/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h
+++ b/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h
@@ -143,6 +143,16 @@
#define CCCR_M_MASK 0x0060 /* Memory Frequency to Run Mode Frequency Multiplier */
#define CCCR_L_MASK 0x001f /* Crystal Frequency to Memory Frequency Multiplier */
+#define CCCR_CPDIS_BIT (31)
+#define CCCR_PPDIS_BIT (30)
+#define CCCR_LCD_26_BIT (27)
+#define CCCR_A_BIT (25)
+
+#define CCSR_N2_MASK CCCR_N_MASK
+#define CCSR_M_MASK CCCR_M_MASK
+#define CCSR_L_MASK CCCR_L_MASK
+#define CCSR_N2_SHIFT 7
+
#define CKEN_AC97CONF (31) /* AC97 Controller Configuration */
#define CKEN_CAMERA (24) /* Camera Interface Clock Enable */
#define CKEN_SSP1 (23) /* SSP1 Unit Clock Enable */
OpenPOWER on IntegriCloud