From b7f7655dc2ae979fee8b01ed894224e5c2f7c719 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sun, 22 Mar 2009 01:50:48 +0000 Subject: imx31/mc13783: Do some housekeeping with register macros, function names and other defines. No functional changes (except to alter a couple int priorities). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20442 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/imx31/debug-imx31.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'firmware/target/arm/imx31/debug-imx31.c') diff --git a/firmware/target/arm/imx31/debug-imx31.c b/firmware/target/arm/imx31/debug-imx31.c index ad436ea231..abf180cfd2 100644 --- a/firmware/target/arm/imx31/debug-imx31.c +++ b/firmware/target/arm/imx31/debug-imx31.c @@ -50,15 +50,15 @@ bool __dbg_hw_info(void) iim_system_rev()); lcd_puts(0, line++, buf); line++; - mpctl = CLKCTL_MPCTL; - spctl = CLKCTL_SPCTL; - upctl = CLKCTL_UPCTL; + mpctl = CCM_MPCTL; + spctl = CCM_SPCTL; + upctl = CCM_UPCTL; - pllref = imx31_clkctl_get_pll_ref_clk(); + pllref = ccm_get_pll_ref_clk(); - mcu_pllfreq = imx31_clkctl_get_pll(PLL_MCU); - ser_pllfreq = imx31_clkctl_get_pll(PLL_SERIAL); - usb_pllfreq = imx31_clkctl_get_pll(PLL_USB); + mcu_pllfreq = ccm_get_pll(PLL_MCU); + ser_pllfreq = ccm_get_pll(PLL_SERIAL); + usb_pllfreq = ccm_get_pll(PLL_USB); snprintf(buf, sizeof (buf), "pll_ref_clk: %u", pllref); lcd_puts(0, line++, buf); line++; @@ -70,7 +70,7 @@ bool __dbg_hw_info(void) snprintf(buf, sizeof (buf), " mpl_dpdgck_clk: %u", mcu_pllfreq); lcd_puts(0, line++, buf); line++; - regval = CLKCTL_PDR0; + regval = CCM_PDR0; snprintf(buf, sizeof (buf), " PDR0: %08lX", regval); lcd_puts(0, line++, buf); @@ -111,7 +111,7 @@ bool __dbg_hw_info(void) snprintf(buf, sizeof (buf), " upl_dpdgck_clk: %u", usb_pllfreq); lcd_puts(0, line++, buf); line++; - regval = CLKCTL_PDR1; + regval = CCM_PDR1; snprintf(buf, sizeof (buf), " PDR1: %08lX", regval); lcd_puts(0, line++, buf); @@ -120,7 +120,7 @@ bool __dbg_hw_info(void) snprintf(buf, sizeof (buf), " usb_clk: %u", freq); lcd_puts(0, line++, buf); - freq = usb_pllfreq / (((CLKCTL_PDR0 >> 16) & 0x1f) + 1); + freq = usb_pllfreq / (((CCM_PDR0 >> 16) & 0x1f) + 1); snprintf(buf, sizeof (buf), " ipg_per_baud: %u", freq); lcd_puts(0, line++, buf); -- cgit v1.2.3