diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-01-30 11:57:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-01-30 12:08:43 +0100 |
| commit | 9e00177172a056ac5fe1d18575f07efebf1b7949 (patch) | |
| tree | 86270ef32c3d965f67d88d927371f8084a32415b | |
| parent | 4d19a68f35fe668372fe0c4e7bac09cc2f168ccb (diff) | |
| download | barebox-9e00177172a056ac5fe1d18575f07efebf1b7949.tar.gz barebox-9e00177172a056ac5fe1d18575f07efebf1b7949.tar.xz | |
[MX31] Use common PLL defines
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | board/pcm037/lowlevel_init.S | 5 | ||||
| -rw-r--r-- | include/asm-arm/arch-imx/imx31-regs.h | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/board/pcm037/lowlevel_init.S b/board/pcm037/lowlevel_init.S index 612cb015d1..ae903a14d8 100644 --- a/board/pcm037/lowlevel_init.S +++ b/board/pcm037/lowlevel_init.S @@ -22,6 +22,7 @@ */ #include <asm/arch/imx-regs.h> +#include <asm/arch/imx-pll.h> #define writel(val, reg) \ ldr r0, =reg; \ @@ -61,8 +62,8 @@ board_init_lowlevel: PDR0_MCU_PODF(0), \ CCM_PDR0) - writel(PLL_PD(0) | PLL_MFD(0xe) | PLL_MFI(9) | PLL_MFN(0xd), CCM_MPCTL) - writel(PLL_PD(1) | PLL_MFD(0x43) | PLL_MFI(12) | PLL_MFN(1), CCM_SPCTL) + writel(IMX_PLL_PD(0) | IMX_PLL_MFD(0xe) | IMX_PLL_MFI(9) | IMX_PLL_MFN(0xd), CCM_MPCTL) + writel(IMX_PLL_PD(1) | IMX_PLL_MFD(0x43) | IMX_PLL_MFI(12) | IMX_PLL_MFN(1), CCM_SPCTL) /* Skip SDRAM initialization if we run from RAM */ cmp pc, #0x80000000 diff --git a/include/asm-arm/arch-imx/imx31-regs.h b/include/asm-arm/arch-imx/imx31-regs.h index 5bbff16e92..1cda4dc3cc 100644 --- a/include/asm-arm/arch-imx/imx31-regs.h +++ b/include/asm-arm/arch-imx/imx31-regs.h @@ -161,11 +161,6 @@ #define PDR0_MAX_PODF(x) (((x) & 0x7) << 3) #define PDR0_MCU_PODF(x) ((x) & 0x7) -#define PLL_PD(x) (((x) & 0xf) << 26) -#define PLL_MFD(x) (((x) & 0x3ff) << 16) -#define PLL_MFI(x) (((x) & 0xf) << 10) -#define PLL_MFN(x) (((x) & 0x3ff) << 0) - #define IMX_ESD_BASE 0xb8001000 #include "esdctl.h" |