diff options
| author | Philippe Begnic <philippe.begnic@st.com> | 2013-05-27 08:41:30 -0400 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2013-06-06 21:16:41 -0400 |
| commit | 852bbba96773777efc2b932f2c5939c6fbf252da (patch) | |
| tree | 69f4bd43569e262aa42432b6ce58409f7c2a5396 /include/linux/mfd | |
| parent | 1237e598a94b5a44a0162a4f4534d18ef8a81a7d (diff) | |
mfd: db8500: Update register definition for u8540 clock
PRCMU and ab8500 registers updated for u8540
Signed-off-by: Philippe Begnic <philippe.begnic@st.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/abx500/ab8500-sysctrl.h | 4 | ||||
| -rw-r--r-- | include/linux/mfd/dbx500-prcmu.h | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/include/linux/mfd/abx500/ab8500-sysctrl.h b/include/linux/mfd/abx500/ab8500-sysctrl.h index 990bc93f46e1..adba89d9c660 100644 --- a/include/linux/mfd/abx500/ab8500-sysctrl.h +++ b/include/linux/mfd/abx500/ab8500-sysctrl.h | |||
| @@ -278,8 +278,8 @@ struct ab8500_sysctrl_platform_data { | |||
| 278 | 278 | ||
| 279 | #define AB9540_SYSCLK12CONFCTRL_PLL26TO38ENA BIT(0) | 279 | #define AB9540_SYSCLK12CONFCTRL_PLL26TO38ENA BIT(0) |
| 280 | #define AB9540_SYSCLK12CONFCTRL_SYSCLK12USBMUXSEL BIT(1) | 280 | #define AB9540_SYSCLK12CONFCTRL_SYSCLK12USBMUXSEL BIT(1) |
| 281 | #define AB9540_SYSCLK12CONFCTRL_INT384MHZMUXSEL_MASK 0x0C | 281 | #define AB9540_SYSCLK12CONFCTRL_INT384MHZMUXSEL0 BIT(2) |
| 282 | #define AB9540_SYSCLK12CONFCTRL_INT384MHZMUXSEL_SHIFT 2 | 282 | #define AB9540_SYSCLK12CONFCTRL_INT384MHZMUXSEL1 BIT(3) |
| 283 | #define AB9540_SYSCLK12CONFCTRL_SYSCLK12BUFMUX BIT(4) | 283 | #define AB9540_SYSCLK12CONFCTRL_SYSCLK12BUFMUX BIT(4) |
| 284 | #define AB9540_SYSCLK12CONFCTRL_SYSCLK12PLLMUX BIT(5) | 284 | #define AB9540_SYSCLK12CONFCTRL_SYSCLK12PLLMUX BIT(5) |
| 285 | #define AB9540_SYSCLK12CONFCTRL_SYSCLK2MUXVALID BIT(6) | 285 | #define AB9540_SYSCLK12CONFCTRL_SYSCLK2MUXVALID BIT(6) |
diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h index 689e6a0d9c99..d0ba355cc55f 100644 --- a/include/linux/mfd/dbx500-prcmu.h +++ b/include/linux/mfd/dbx500-prcmu.h | |||
| @@ -134,6 +134,10 @@ enum prcmu_clock { | |||
| 134 | PRCMU_SIACLK, | 134 | PRCMU_SIACLK, |
| 135 | PRCMU_SVACLK, | 135 | PRCMU_SVACLK, |
| 136 | PRCMU_ACLK, | 136 | PRCMU_ACLK, |
| 137 | PRCMU_HVACLK, /* Ux540 only */ | ||
| 138 | PRCMU_G1CLK, /* Ux540 only */ | ||
| 139 | PRCMU_SDMMCHCLK, | ||
| 140 | PRCMU_CAMCLK, | ||
| 137 | PRCMU_NUM_REG_CLOCKS, | 141 | PRCMU_NUM_REG_CLOCKS, |
| 138 | PRCMU_SYSCLK = PRCMU_NUM_REG_CLOCKS, | 142 | PRCMU_SYSCLK = PRCMU_NUM_REG_CLOCKS, |
| 139 | PRCMU_CDCLK, | 143 | PRCMU_CDCLK, |
| @@ -148,6 +152,13 @@ enum prcmu_clock { | |||
| 148 | PRCMU_DSI0ESCCLK, | 152 | PRCMU_DSI0ESCCLK, |
| 149 | PRCMU_DSI1ESCCLK, | 153 | PRCMU_DSI1ESCCLK, |
| 150 | PRCMU_DSI2ESCCLK, | 154 | PRCMU_DSI2ESCCLK, |
| 155 | /* LCD DSI PLL - Ux540 only */ | ||
| 156 | PRCMU_PLLDSI_LCD, | ||
| 157 | PRCMU_DSI0CLK_LCD, | ||
| 158 | PRCMU_DSI1CLK_LCD, | ||
| 159 | PRCMU_DSI0ESCCLK_LCD, | ||
| 160 | PRCMU_DSI1ESCCLK_LCD, | ||
| 161 | PRCMU_DSI2ESCCLK_LCD, | ||
| 151 | }; | 162 | }; |
| 152 | 163 | ||
| 153 | /** | 164 | /** |
