From 03c609f69b12dca47b9422595fdde29be1fb35c9 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 21 Sep 2011 12:40:02 +0000 Subject: tegra2: Rename CLOCK_PLL_ID to CLOCK_ID Rename CLOCK_PLL_ID to CLOCK_ID which takes account of the fact that the code now deals with both PLL clocks and source clocks. This also tidied up the assert() to match the one sent upstream, and fixes an error in the PWM id. Signed-off-by: Simon Glass Tested-by: Tom Warren --- board/nvidia/common/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board') diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index 160dac8..32d3cfb 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -77,7 +77,7 @@ int timer_init(void) static void clock_init_uart(void) { struct clk_rst_ctlr *clkrst = (struct clk_rst_ctlr *)NV_PA_CLK_RST_BASE; - struct clk_pll *pll = &clkrst->crc_pll[CLOCK_PLL_ID_PERIPH]; + struct clk_pll *pll = &clkrst->crc_pll[CLOCK_ID_PERIPH]; u32 reg; reg = readl(&pll->pll_base); -- cgit v1.1