diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h')
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h index 5e06c7265835..c3feff3c0488 100644 --- a/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h | |||
| @@ -65,6 +65,7 @@ | |||
| 65 | #define S3C2443_CLKDIV0_PREDIV_MASK (3<<4) | 65 | #define S3C2443_CLKDIV0_PREDIV_MASK (3<<4) |
| 66 | #define S3C2443_CLKDIV0_PREDIV_SHIFT (4) | 66 | #define S3C2443_CLKDIV0_PREDIV_SHIFT (4) |
| 67 | 67 | ||
| 68 | #define S3C2416_CLKDIV0_ARMDIV_MASK (7 << 9) | ||
| 68 | #define S3C2443_CLKDIV0_ARMDIV_MASK (15<<9) | 69 | #define S3C2443_CLKDIV0_ARMDIV_MASK (15<<9) |
| 69 | #define S3C2443_CLKDIV0_ARMDIV_SHIFT (9) | 70 | #define S3C2443_CLKDIV0_ARMDIV_SHIFT (9) |
| 70 | #define S3C2443_CLKDIV0_ARMDIV_1 (0<<9) | 71 | #define S3C2443_CLKDIV0_ARMDIV_1 (0<<9) |
| @@ -102,6 +103,7 @@ | |||
| 102 | #define S3C2443_PCLKCON_UART3 (1<<3) | 103 | #define S3C2443_PCLKCON_UART3 (1<<3) |
| 103 | #define S3C2443_PCLKCON_IIC (1<<4) | 104 | #define S3C2443_PCLKCON_IIC (1<<4) |
| 104 | #define S3C2443_PCLKCON_SDI (1<<5) | 105 | #define S3C2443_PCLKCON_SDI (1<<5) |
| 106 | #define S3C2443_PCLKCON_HSSPI (1<<6) | ||
| 105 | #define S3C2443_PCLKCON_ADC (1<<7) | 107 | #define S3C2443_PCLKCON_ADC (1<<7) |
| 106 | #define S3C2443_PCLKCON_AC97 (1<<8) | 108 | #define S3C2443_PCLKCON_AC97 (1<<8) |
| 107 | #define S3C2443_PCLKCON_IIS (1<<9) | 109 | #define S3C2443_PCLKCON_IIS (1<<9) |