diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-01 17:25:59 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-01 17:25:59 +0100 |
| commit | 6cbf70a01a0d40280acc2eb32508327d00317476 (patch) | |
| tree | 316581a993ea6e9b7b581290c5feb61c9cbf3eb2 /board | |
| parent | e4ee34a829a00e058828f3daade04f4141ea3ef9 (diff) | |
| parent | 7d3da14a7e187d05ee42fb7e628fb4091207b5e3 (diff) | |
| download | barebox-6cbf70a01a0d40280acc2eb32508327d00317476.tar.gz barebox-6cbf70a01a0d40280acc2eb32508327d00317476.tar.xz | |
Merge branch 'pu'
Diffstat (limited to 'board')
| -rw-r--r-- | board/ipe337/cmd_alternate.c | 2 | ||||
| -rw-r--r-- | board/pcm043/lowlevel_init.S | 2 | ||||
| -rw-r--r-- | board/pcm043/pcm043.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/board/ipe337/cmd_alternate.c b/board/ipe337/cmd_alternate.c index 538f0bfd67..2883c77d32 100644 --- a/board/ipe337/cmd_alternate.c +++ b/board/ipe337/cmd_alternate.c @@ -6,7 +6,7 @@ #define MAGIC 0x19691228 -static int do_alternate (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_alternate(struct command *cmdtp, int argc, char *argv[]) { void *buf; size_t size; diff --git a/board/pcm043/lowlevel_init.S b/board/pcm043/lowlevel_init.S index 9df064cb49..abbc72c9c6 100644 --- a/board/pcm043/lowlevel_init.S +++ b/board/pcm043/lowlevel_init.S @@ -96,7 +96,7 @@ board_init_lowlevel: ldr r2, CCM_CCMR_W str r2, [r0, #CCM_CCMR] - ldr r3, MPCTL_PARAM_399_W /* consumer path*/ + ldr r3, MPCTL_PARAM_532_W /* consumer path*/ /*Set MPLL , arm clock and ahb clock*/ str r3, [r0, #CCM_MPCTL] diff --git a/board/pcm043/pcm043.c b/board/pcm043/pcm043.c index 0e7f6d3bf3..7b0bad1fb3 100644 --- a/board/pcm043/pcm043.c +++ b/board/pcm043/pcm043.c @@ -353,7 +353,7 @@ core_initcall(pcm043_core_setup); #define MPCTL_PARAM_399 (IMX_PLL_PD(0) | IMX_PLL_MFD(15) | IMX_PLL_MFI(8) | IMX_PLL_MFN(5)) #define MPCTL_PARAM_532 ((1 << 31) | IMX_PLL_PD(0) | IMX_PLL_MFD(11) | IMX_PLL_MFI(11) | IMX_PLL_MFN(1)) -static int do_cpufreq(cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_cpufreq(struct command *cmdtp, int argc, char *argv[]) { unsigned long freq; |