Commit 591eb85e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm: (45 commits)
  [ARM] 3389/1: typo and grammar fix
  [ARM] 3386/1: AT91RM9200 Clock update
  [ARM] 3384/1: AT91RM9200: Timer
  [ARM] 3382/1: ixp2000: unify defconfigs
  [ARM] 3381/1: ixp2000: fix slowport write timing control register fields
  [ARM] 3380/1: ixp2000: simplify ixdp2x00_master_npu() check
  [ARM] 3379/1: ixp2000: use generic 8250 debug macros
  [ARM] 3378/1: ixp2000: fix gpio interrupt handling
  [ARM] Quieten spurious IRQ detection
  [ARM] Use kcalloc to allocate counter_config array rather than kmalloc
  [ARM] Oprofile: dynamically allocate counter_config
  [ARM] Oprofile: Convert semaphore to mutex
  [ARM] 3376/2: S3C2410 - update defconfig
  [ARM] 3375/1: S3C2440 - fix osiris machine build
  [ARM] 3374/1: ep93xx: gpio interrupt support
  [ARM] 3361/1: S3C24XX - add USB bus clock source
  [ARM] 3360/1: S3C2440 - add set rate methods and camera clock
  [ARM] 3359/1: S3C24XX - add support for clk_set_rate
  [ARM] Convert kmalloc+memset to kzalloc
  [ARM] 3373/1: move uengine loader to arch/arm/common
  ...
parents 4658f79b 3a2916aa

Documentation/arm/Samsung-S3C24XX/Overview.txt

+41 −1
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ Introduction 
  by the 's3c2410' architecture of ARM Linux. Currently the S3C2410 and

  the S3C2440 are supported CPUs.



  Support for the S3C2400 series is in progress.





Configuration

-------------
@@ -32,6 +34,11 @@ Machines 
    A general purpose development board, see EB2410ITX.txt for further

    details



  Simtec Electronics IM2440D20 (Osiris)



    CPU Module from Simtec Electronics, with a S3C2440A CPU, nand flash

    and a PCMCIA controller.



  Samsung SMDK2410



    Samsung's own development board, geared for PDA work.
@@ -85,6 +92,26 @@ Adding New Machines 
  mailing list information.





I2C

---



  The hardware I2C core in the CPU is supported in single master

  mode, and can be configured via platform data.





RTC

---



  Support for the onboard RTC unit, including alarm function.





Watchdog

--------



  The onchip watchdog is available via the standard watchdog

  interface.





NAND

----
@@ -121,6 +148,15 @@ Clock Management 
  various clock units





Suspend to RAM

--------------



  For boards that provide support for suspend to RAM, the

  system can be placed into low power suspend.



  See Suspend.txt for more information.





Platform Data

-------------
@@ -158,6 +194,7 @@ Platform Data 
	exported outside arch/arm/mach-s3c2410/, or exported to

	modules via EXPORT_SYMBOL() and related functions.





Port Contributors

-----------------
@@ -188,8 +225,11 @@ Document Changes 
  08 Mar 2005 - BJD - Added LCVR to list of people, updated introduction

  08 Mar 2005 - BJD - Added section on adding machines

  09 Sep 2005 - BJD - Added section on platform data

  11 Feb 2006 - BJD - Added I2C, RTC and Watchdog sections

  11 Feb 2006 - BJD - Added Osiris machine, and S3C2400 information





Document Author

---------------



Ben Dooks, (c) 2004-2005 Simtec Electronics
 
Ben Dooks, (c) 2004-2005,2006 Simtec Electronics

arch/arm/Kconfig

+16 −0
Original line number Diff line number Diff line
@@ -108,6 +108,13 @@ config ARCH_EBSA110 
	  Ethernet interface, two PCMCIA sockets, two serial ports and a

	  parallel port.



config ARCH_EP93XX

	bool "EP93xx-based"

	select ARM_AMBA

	select ARM_VIC

	help

	  This enables support for the Cirrus EP93xx series of CPUs.



config ARCH_FOOTBRIDGE

	bool "FootBridge"

	select FOOTBRIDGE
@@ -250,6 +257,8 @@ endchoice 


source "arch/arm/mach-clps711x/Kconfig"



source "arch/arm/mach-ep93xx/Kconfig"



source "arch/arm/mach-footbridge/Kconfig"



source "arch/arm/mach-integrator/Kconfig"
@@ -434,6 +443,13 @@ config NO_IDLE_HZ 
	  Currently at least OMAP, PXA2xx and SA11x0 platforms are known

	  to have accurate timekeeping with dynamic tick.



config HZ

	int

	default 128 if ARCH_L7200

	default 200 if ARCH_EBSA110 || ARCH_S3C2410

	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER

	default 100



config AEABI

	bool "Use the ARM EABI to compile the kernel"

	help

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ endif 
 machine-$(CONFIG_ARCH_AAEC2000)   := aaec2000

 machine-$(CONFIG_ARCH_REALVIEW)   := realview

 machine-$(CONFIG_ARCH_AT91RM9200) := at91rm9200

 machine-$(CONFIG_ARCH_EP93XX)     := ep93xx



ifeq ($(CONFIG_ARCH_EBSA110),y)

# This is what happens if you forget the IOCS16 line.

arch/arm/common/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -15,3 +15,4 @@ obj-$(CONFIG_SHARP_LOCOMO) += locomo.o 
obj-$(CONFIG_SHARP_PARAM)	+= sharpsl_param.o

obj-$(CONFIG_SHARPSL_PM)	+= sharpsl_pm.o

obj-$(CONFIG_SHARP_SCOOP)	+= scoop.o

obj-$(CONFIG_ARCH_IXP2000)	+= uengine.o

arch/arm/common/dmabounce.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *  limited DMA windows. These functions utilize bounce buffers to

 *  copy data to/from buffers located outside the DMA region. This

 *  only works for systems in which DMA memory is at the bottom of

 *  RAM and the remainder of memory is at the top an the DMA memory

 *  RAM, the remainder of memory is at the top and the DMA memory

 *  can be marked as ZONE_DMA. Anything beyond that such as discontigous

 *  DMA windows will require custom implementations that reserve memory

 *  areas at early bootup.

CRA Git | Maintained and supported by SUSTech CRA and CCSE