diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-04-05 21:32:58 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-04-05 21:32:58 +0000 |
commit | f1eaead1186210f84301793beeae584a180cfe02 (patch) | |
tree | 1248b36c05415104eed619e0c2cb41875bbef16b /nuttx/arch/arm/src/imx | |
parent | 5c70af10a514c0ef2b39278cd9f895b953881e40 (diff) | |
download | px4-nuttx-f1eaead1186210f84301793beeae584a180cfe02.tar.gz px4-nuttx-f1eaead1186210f84301793beeae584a180cfe02.tar.bz2 px4-nuttx-f1eaead1186210f84301793beeae584a180cfe02.zip |
fix some names
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1687 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/imx')
-rwxr-xr-x | nuttx/arch/arm/src/imx/imx_system.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/imx/imx_system.h b/nuttx/arch/arm/src/imx/imx_system.h index c7781b74a..ed3b4faa8 100755 --- a/nuttx/arch/arm/src/imx/imx_system.h +++ b/nuttx/arch/arm/src/imx/imx_system.h @@ -65,8 +65,8 @@ /* PLL Register Offsets *************************************************************/
#define PLL_CSCR_OFFSET 0x0000 /* Clock Source Control Register */
-#define PLL_MCTL0_OFFSET 0x0004 /* MCU PLL Control Register 0 */
-#define PLL_MCTL1_OFFSET 0x0008 /* MCU PLL Control Register 1 */
+#define PLL_MPCTL0_OFFSET 0x0004 /* MCU PLL Control Register 0 */
+#define PLL_MPCTL1_OFFSET 0x0008 /* MCU PLL & System Clock Control Register 1 */
#define PLL_SPCTL0_OFFSET 0x000c /* System PLL Control Register 0 */
#define PLL_SPCTL1_OFFSET 0x0010 /* System PLL Control Register 1 */
#define PLL_PCDR_OFFSET 0x0020 /* Peripherial Clock Divider Register */
@@ -74,8 +74,8 @@ /* PLL Register Addresses ***********************************************************/
#define IMX_PLL_CSCR (IMX_PLL_VBASE + PLL_CSCR_OFFSET)
-#define IMX_PLL_MCTL0 (IMX_PLL_VBASE + PLL_MCTL0_OFFSET)
-#define IMX_PLL_MCTL1 (IMX_PLL_VBASE + PLL_MCTL1_OFFSET)
+#define IMX_PLL_MPCTL0 (IMX_PLL_VBASE + PLL_MPCTL0_OFFSET)
+#define IMX_PLL_MPCTL1 (IMX_PLL_VBASE + PLL_MPCTL1_OFFSET)
#define IMX_PLL_SPCTL0 (IMX_PLL_VBASE + PLL_SPCTL0_OFFSET)
#define IMX_PLL_SPCTL1 (IMX_PLL_VBASE + PLL_SPCTL1_OFFSET)
#define IMX_PLL_PCDR (IMX_PLL_VBASE + PLL_PCDR_OFFSET)
@@ -87,7 +87,7 @@ #define SC_RSR_OFFSET 0x0000 /* Reset Source Register */
#define SC_SIDR_OFFSET 0x0004 /* Silicon ID Register */
#define SC_FMCR_OFFSET 0x0008 /* Function Muxing Control Register */
-#define SC_GPCR_OFFSET 0x000c /* Global Peripherial Control Regiser */
+#define SC_GPCR_OFFSET 0x000c /* Global Peripheral Control Regiser */
/* SC Register Addresses ************************************************************/
|