summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2012-08-13 11:51:45 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2012-08-20 10:10:25 +0200
commit25a8c022585114e247e1b34ffa8a6af472263ef3 (patch)
tree3db2dd060e033e0b5804e62f87ff058310ae3636 /c
parentbsp/lpc32xx: Add lpc32xx_select_nand_controller() (diff)
downloadrtems-25a8c022585114e247e1b34ffa8a6af472263ef3.tar.bz2
bsp/lpc32xx: Fix clock name
Rename lpc32xx_dram_clk() in lpc32xx_ddram_clk()
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libbsp/arm/lpc32xx/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/arm/lpc32xx/misc/system-clocks.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/bsp.h b/c/src/lib/libbsp/arm/lpc32xx/include/bsp.h
index c1fcec3c75..429adc7dc2 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/bsp.h
+++ b/c/src/lib/libbsp/arm/lpc32xx/include/bsp.h
@@ -136,7 +136,7 @@ uint32_t lpc32xx_hclk(void);
uint32_t lpc32xx_arm_clk(void);
-uint32_t lpc32xx_dram_clk(void);
+uint32_t lpc32xx_ddram_clk(void);
typedef enum {
LPC32XX_NAND_CONTROLLER_NONE,
diff --git a/c/src/lib/libbsp/arm/lpc32xx/misc/system-clocks.c b/c/src/lib/libbsp/arm/lpc32xx/misc/system-clocks.c
index f324ef869f..c816912849 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/misc/system-clocks.c
+++ b/c/src/lib/libbsp/arm/lpc32xx/misc/system-clocks.c
@@ -118,23 +118,23 @@ uint32_t lpc32xx_arm_clk(void)
return arm_clk;
}
-uint32_t lpc32xx_dram_clk(void)
+uint32_t lpc32xx_ddram_clk(void)
{
uint32_t hclkdiv_ctrl = LPC32XX_HCLKDIV_CTRL;
uint32_t div = HCLK_DIV_DDRAM_CLK_GET(hclkdiv_ctrl);
- uint32_t dram_clk = 0;
+ uint32_t ddram_clk = 0;
if (div != 0) {
uint32_t pwr_ctrl = LPC32XX_PWR_CTRL;
if ((pwr_ctrl & PWR_NORMAL_RUN_MODE) != 0) {
- dram_clk = lpc32xx_hclkpll_clk();
+ ddram_clk = lpc32xx_hclkpll_clk();
} else {
- dram_clk = lpc32xx_sysclk();
+ ddram_clk = lpc32xx_sysclk();
}
- dram_clk /= div;
+ ddram_clk /= div;
}
- return dram_clk;
+ return ddram_clk;
}