diff options
| author | Joakim Axelsson <joakim.axelsson@stericsson.com> | 2010-12-03 15:14:19 +0800 |
|---|---|---|
| committer | Michael BRANDT <michael.brandt@stericsson.com> | 2010-12-08 16:20:16 +0100 |
| commit | c6b4e8c0340357c795f5898cf5e4141e845a2801 (patch) | |
| tree | 888b24c9c41122ef77dd66f47e1f6dcc962375c0 /include | |
| parent | af78cad05fbf943619f6446b12203552b02aba11 (diff) | |
db8500: Clean up PRCMU code in db8500 SoC code
Clean up of PRCMU code in db8500 SoC code. Move things from cpu.c
and clock.h to prcmu.c. Also remove duplicate #defines and have
prcmu.c use the #defines in prcmu.h.
ST-Ericsson ID: None
Signed-off-by: Joakim Axelsson <joakim.axelsson@stericsson.com>
Change-Id: Ieffb0094b3f43f0c88f3ed457c6cb296fa0ce378
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/9899
Reviewed-by: QATOOLS
Reviewed-by: Michael BRANDT <michael.brandt@stericsson.com>
Tested-by: Michael BRANDT <michael.brandt@stericsson.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-db8500/clock.h | 44 | ||||
| -rw-r--r-- | include/asm-arm/arch-db8500/prcmu.h | 13 |
2 files changed, 9 insertions, 48 deletions
diff --git a/include/asm-arm/arch-db8500/clock.h b/include/asm-arm/arch-db8500/clock.h index 76d35eb86..f9deba524 100644 --- a/include/asm-arm/arch-db8500/clock.h +++ b/include/asm-arm/arch-db8500/clock.h @@ -23,50 +23,6 @@ #ifndef __ASM_ARCH_CLOCK #define __ASM_ARCH_CLOCK -struct prcmu { - unsigned int armclkfix_mgt; - unsigned int armclk_mgt; - unsigned int svammdspclk_mgt; - unsigned int siammdspclk_mgt; - unsigned int reserved; - unsigned int sgaclk_mgt; - unsigned int uartclk_mgt; - unsigned int msp02clk_mgt; - unsigned int i2cclk_mgt; - unsigned int sdmmcclk_mgt; - unsigned int slimclk_mgt; - unsigned int per1clk_mgt; - unsigned int per2clk_mgt; - unsigned int per3clk_mgt; - unsigned int per5clk_mgt; - unsigned int per6clk_mgt; - unsigned int per7clk_mgt; - unsigned int lcdclk_mgt; - unsigned int reserved1; - unsigned int bmlclk_mgt; - unsigned int hsitxclk_mgt; - unsigned int hsirxclk_mgt; - unsigned int hdmiclk_mgt; - unsigned int apeatclk_mgt; - unsigned int apetraceclk_mgt; - unsigned int mcdeclk_mgt; - unsigned int ipi2cclk_mgt; - unsigned int dsialtclk_mgt; - unsigned int spare2clk_mgt; - unsigned int dmaclk_mgt; - unsigned int b2r2clk_mgt; - unsigned int tvclk_mgt; - unsigned int unused[82]; - unsigned int tcr; - unsigned int unused1[23]; - unsigned int ape_softrst; -}; - -static inline void u8500_prcmu_enable(unsigned int *reg) -{ - writel(readl(reg) | (1 << 8), reg); -} - /* Enable all clocks u-boot needs in db8500 SoC platform */ void db8500_clocks_init(void); diff --git a/include/asm-arm/arch-db8500/prcmu.h b/include/asm-arm/arch-db8500/prcmu.h index 45f800038..f7709e2d7 100644 --- a/include/asm-arm/arch-db8500/prcmu.h +++ b/include/asm-arm/arch-db8500/prcmu.h @@ -12,6 +12,8 @@ #ifndef __PRCMU_H__ #define __PRCMU_H__ +#include <asm/arch/hardware.h> + /* Power, Reset, Clock Management Unit */ /* * SVA: Smart Video Accelerator @@ -19,8 +21,8 @@ * SGA: Smart Graphic accelerator * B2R2: Graphic blitter */ -#define PRCMU_BASE CFG_PRCMU_BASE /* 0x80157000 for U8500 */ -#define PRCM_ARMCLKFIX_MGT_REG (PRCMU_BASE + 0x000) +#define PRCMU_BASE U8500_PRCMU_BASE +#define PRCM_ARMCLKFIX_MGT_REG (PRCMU_BASE + 0x000) #define PRCM_ACLK_MGT_REG (PRCMU_BASE + 0x004) #define PRCM_SVAMMDSPCLK_MGT_REG (PRCMU_BASE + 0x008) #define PRCM_SIAMMDSPCLK_MGT_REG (PRCMU_BASE + 0x00C) @@ -29,7 +31,7 @@ #define PRCM_UARTCLK_MGT_REG (PRCMU_BASE + 0x018) #define PRCM_MSPCLK_MGT_REG (PRCMU_BASE + 0x01C) #define PRCM_I2CCLK_MGT_REG (PRCMU_BASE + 0x020) -#define PRCM_SDMMCCLK_MGT_REG (PRCMU_BASE + 0x024) +#define PRCM_SDMMCCLK_MGT_REG (PRCMU_BASE + 0x024) #define PRCM_SLIMCLK_MGT_REG (PRCMU_BASE + 0x028) #define PRCM_PER1CLK_MGT_REG (PRCMU_BASE + 0x02C) #define PRCM_PER2CLK_MGT_REG (PRCMU_BASE + 0x030) @@ -44,9 +46,12 @@ #define PRCM_PLLSOC1_FREQ_REG (PRCMU_BASE + 0x084) #define PRCM_PLLARM_FREQ_REG (PRCMU_BASE + 0x088) #define PRCM_PLLDDR_FREQ_REG (PRCMU_BASE + 0x08C) -#define PRCM_ARM_CHGCLKREQ_REG (PRCMU_BASE + 0x114) +#define PRCM_ARM_CHGCLKREQ_REG (PRCMU_BASE + 0x114) #define PRCM_TCR (PRCMU_BASE + 0x1C8) +/* Init PRCMU relatated things in db8500 SoC platform */ +void db8500_prcmu_init(void); + #endif /* __PRCMU_H__ */ |