Merge branch 'for-rmk/samsung6' of git://git.fluff.org/bjdooks/linux into devel-stable
This commit is contained in:
commit
004c1c7096
@ -42,23 +42,14 @@
|
||||
|
||||
#define S3C2443_PLLCON_OFF (1<<24)
|
||||
|
||||
#define S3C2443_CLKSRC_I2S_EXT (1<<14)
|
||||
#define S3C2443_CLKSRC_I2S_EPLLDIV (0<<14)
|
||||
#define S3C2443_CLKSRC_I2S_EPLLREF (2<<14)
|
||||
#define S3C2443_CLKSRC_I2S_EPLLREF3 (3<<14)
|
||||
#define S3C2443_CLKSRC_I2S_MASK (3<<14)
|
||||
|
||||
#define S3C2443_CLKSRC_EPLLREF_XTAL (2<<7)
|
||||
#define S3C2443_CLKSRC_EPLLREF_EXTCLK (3<<7)
|
||||
#define S3C2443_CLKSRC_EPLLREF_MPLLREF (0<<7)
|
||||
#define S3C2443_CLKSRC_EPLLREF_MPLLREF2 (1<<7)
|
||||
#define S3C2443_CLKSRC_EPLLREF_MASK (3<<7)
|
||||
|
||||
#define S3C2443_CLKSRC_ESYSCLK_EPLL (1<<6)
|
||||
#define S3C2443_CLKSRC_MSYSCLK_MPLL (1<<4)
|
||||
#define S3C2443_CLKSRC_EXTCLK_DIV (1<<3)
|
||||
|
||||
#define S3C2443_CLKDIV0_DVS (1<<13)
|
||||
#define S3C2443_CLKDIV0_HALF_HCLK (1<<3)
|
||||
#define S3C2443_CLKDIV0_HALF_PCLK (1<<2)
|
||||
|
||||
@ -81,28 +72,7 @@
|
||||
#define S3C2443_CLKDIV0_ARMDIV_12 (13<<9)
|
||||
#define S3C2443_CLKDIV0_ARMDIV_16 (15<<9)
|
||||
|
||||
/* S3C2443_CLKDIV1 */
|
||||
|
||||
#define S3C2443_CLKDIV1_CAMDIV_MASK (15<<26)
|
||||
#define S3C2443_CLKDIV1_CAMDIV_SHIFT (26)
|
||||
|
||||
#define S3C2443_CLKDIV1_HSSPIDIV_MASK (3<<24)
|
||||
#define S3C2443_CLKDIV1_HSSPIDIV_SHIFT (24)
|
||||
|
||||
#define S3C2443_CLKDIV1_DISPDIV_MASK (0xff<<16)
|
||||
#define S3C2443_CLKDIV1_DISPDIV_SHIFT (16)
|
||||
|
||||
#define S3C2443_CLKDIV1_I2SDIV_MASK (15<<12)
|
||||
#define S3C2443_CLKDIV1_I2SDIV_SHIFT (12)
|
||||
|
||||
#define S3C2443_CLKDIV1_UARTDIV_MASK (15<<8)
|
||||
#define S3C2443_CLKDIV1_UARTDIV_SHIFT (8)
|
||||
|
||||
#define S3C2443_CLKDIV1_HSMMCDIV_MASK (3<<6)
|
||||
#define S3C2443_CLKDIV1_HSMMCDIV_SHIFT (6)
|
||||
|
||||
#define S3C2443_CLKDIV1_USBHOSTDIV_MASK (3<<4)
|
||||
#define S3C2443_CLKDIV1_USBHOSTDIV_SHIFT (4)
|
||||
/* S3C2443_CLKDIV1 removed, only used in clock.c code */
|
||||
|
||||
#define S3C2443_CLKCON_NAND
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* arch/arm/plat-s3c24xx/s3c2440-pll-12000000.c
|
||||
/* arch/arm/mach-s3c2440/s3c2440-pll-12000000.c
|
||||
*
|
||||
* Copyright (c) 2006-2007 Simtec Electronics
|
||||
* http://armlinux.simtec.co.uk/
|
@ -1,4 +1,4 @@
|
||||
/* arch/arm/plat-s3c24xx/s3c2440-pll-16934400.c
|
||||
/* arch/arm/mach-s3c2440/s3c2440-pll-16934400.c
|
||||
*
|
||||
* Copyright (c) 2006-2008 Simtec Electronics
|
||||
* http://armlinux.simtec.co.uk/
|
@ -7,6 +7,7 @@ config CPU_S3C2443
|
||||
depends on ARCH_S3C2410
|
||||
select S3C2443_DMA if S3C2410_DMA
|
||||
select CPU_LLSERIAL_S3C2440
|
||||
select SAMSUNG_CLKSRC
|
||||
help
|
||||
Support for the S3C2443 SoC from the S3C24XX line
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -57,6 +57,6 @@ obj-$(CONFIG_MACH_HMT) += mach-hmt.o
|
||||
|
||||
obj-y += dev-uart.o
|
||||
obj-y += dev-rtc.o
|
||||
obj-y += dev-audio.o
|
||||
obj-$(CONFIG_S3C_ADC) += dev-adc.o
|
||||
obj-$(CONFIG_SND_S3C24XX_SOC) += dev-audio.o
|
||||
obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
|
||||
|
@ -30,7 +30,7 @@
|
||||
|
||||
#include <plat/regs-usb-hsotg-phy.h>
|
||||
#include <plat/regs-usb-hsotg.h>
|
||||
#include <plat/regs-sys.h>
|
||||
#include <mach/regs-sys.h>
|
||||
#include <plat/udc-hs.h>
|
||||
|
||||
#define DMA_ADDR_INVALID (~((dma_addr_t)0))
|
||||
|
@ -28,8 +28,8 @@
|
||||
#include <sound/soc.h>
|
||||
|
||||
#include <plat/regs-s3c2412-iis.h>
|
||||
#include <plat/gpio-bank-d.h>
|
||||
#include <plat/gpio-bank-e.h>
|
||||
#include <mach/gpio-bank-d.h>
|
||||
#include <mach/gpio-bank-e.h>
|
||||
#include <plat/gpio-cfg.h>
|
||||
|
||||
#include <mach/map.h>
|
||||
|
Loading…
Reference in New Issue
Block a user