diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 07:20:08 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 07:20:08 -0400 |
| commit | 86f82da586098f16d92b5637808c323f5455e935 (patch) | |
| tree | 6397eb5550172b89d383254c7e4bca87ae4a8659 /arch/arm/mach-s3c2410 | |
| parent | db3c94a7edc6b29f8d52ba5884dec6a15feeadad (diff) | |
| parent | e90a0f3c460406d6a5a698016bc525c3e6968cb6 (diff) | |
Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2
Conflicts:
arch/arm/plat-s5p/include/plat/pll.h
Diffstat (limited to 'arch/arm/mach-s3c2410')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index 2a2fa0620133..a9201eaeb0f1 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.c | |||
| @@ -696,9 +696,9 @@ static void __init h1940_init(void) | |||
| 696 | S3C2410_MISCCR_USBSUSPND0 | | 696 | S3C2410_MISCCR_USBSUSPND0 | |
| 697 | S3C2410_MISCCR_USBSUSPND1, 0x0); | 697 | S3C2410_MISCCR_USBSUSPND1, 0x0); |
| 698 | 698 | ||
| 699 | tmp = (0x78 << S3C24XX_PLLCON_MDIVSHIFT) | 699 | tmp = (0x78 << S3C24XX_PLL_MDIV_SHIFT) |
| 700 | | (0x02 << S3C24XX_PLLCON_PDIVSHIFT) | 700 | | (0x02 << S3C24XX_PLL_PDIV_SHIFT) |
| 701 | | (0x03 << S3C24XX_PLLCON_SDIVSHIFT); | 701 | | (0x03 << S3C24XX_PLL_SDIV_SHIFT); |
| 702 | writel(tmp, S3C2410_UPLLCON); | 702 | writel(tmp, S3C2410_UPLLCON); |
| 703 | 703 | ||
| 704 | gpio_request(S3C2410_GPC(0), "LCD power"); | 704 | gpio_request(S3C2410_GPC(0), "LCD power"); |