Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6e6e883 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:
  [ARM] 3657/1: S3C24XX: Documentation update of Overview.txt
  [ARM] Update mach-types
  [ARM] 3656/1: S3C2412: Add S3C2412 and S3C2413 documenation
  [ARM] 3654/1: add ajeco 1arm sbc support
  [ARM] fix drivers/mfd/ucb1x00-core.c IRQ probing bug
  [ARM] 3651/1: S3C24XX: Make arch list more detailed
  [ARM] 3650/1: S3C2412: Update s3c2410_defconfig
  [ARM] 3649/1: S3C24XX: Fix capitalisation of CPU on SMDK2440
  [ARM] 3612/1: make pci bus optional for ixp4xx platform
  [ARM] Remove MODE_(SVC|IRQ|FIQ|USR) and DEFAULT_FIQ
  [ARM] Remove save_lr/restore_pc macros
  [ARM] Remove partial non-v6 binutils compatibility
  [ARM] Remove LOADREGS macro
  [ARM] Remove RETINSTR macro
parents ba262e4a f964c303

Documentation/arm/Samsung-S3C24XX/Overview.txt

+14 −21
Original line number Diff line number Diff line
@@ -7,11 +7,13 @@ Introduction 
------------



  The Samsung S3C24XX range of ARM9 System-on-Chip CPUs are supported

  by the 's3c2410' architecture of ARM Linux. Currently the S3C2410 and

  the S3C2440 are supported CPUs.

  by the 's3c2410' architecture of ARM Linux. Currently the S3C2410,

  S3C2440 and S3C2442 devices are supported.



  Support for the S3C2400 series is in progress.



  Support for the S3C2412 and S3C2413 CPUs is being merged.





Configuration

-------------
@@ -43,9 +45,18 @@ Machines 


    Samsung's own development board, geared for PDA work.



  Samsung/Aiji SMDK2412



    The S3C2412 version of the SMDK2440.



  Samsung/Aiji SMDK2413



    The S3C2412 version of the SMDK2440.



  Samsung/Meritech SMDK2440



    The S3C2440 compatible version of the SMDK2440

    The S3C2440 compatible version of the SMDK2440, which has the

    option of an S3C2440 or S3C2442 CPU module.



  Thorcom VR1000
@@ -211,24 +222,6 @@ Port Contributors 
  Lucas Correia Villa Real (S3C2400 port)





Document Changes

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



  05 Sep 2004 - BJD - Added Document Changes section

  05 Sep 2004 - BJD - Added Klaus Fetscher to list of contributors

  25 Oct 2004 - BJD - Added Dimitry Andric to list of contributors

  25 Oct 2004 - BJD - Updated the MTD from the 2.6.9 merge

  21 Jan 2005 - BJD - Added rx3715, added Shannon to contributors

  10 Feb 2005 - BJD - Added Guillaume Gourat to contributors

  02 Mar 2005 - BJD - Added SMDK2440 to list of machines

  06 Mar 2005 - BJD - Added Christer Weinigel

  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

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

Documentation/arm/Samsung-S3C24XX/S3C2412.txt

0 → 100644
+120 −0
Original line number Diff line number Diff line 
		S3C2412 ARM Linux Overview

		==========================



Introduction

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



  The S3C2412 is part of the S3C24XX range of ARM9 System-on-Chip CPUs

  from Samsung. This part has an ARM926-EJS core, capable of running up

  to 266MHz (see data-sheet for more information)





Clock

-----



  The core clock code provides a set of clocks to the drivers, and allows

  for source selection and a number of other features.





Power

-----



  No support for suspend/resume to RAM in the current system.





DMA

---



  No current support for DMA.





GPIO

----



  There is support for setting the GPIO to input/output/special function

  and reading or writing to them.





UART

----



  The UART hardware is similar to the S3C2440, and is supported by the

  s3c2410 driver in the drivers/serial directory.





NAND

----



  The NAND hardware is similar to the S3C2440, and is supported by the

  s3c2410 driver in the drivers/mtd/nand directory.





USB Host

--------



  The USB hardware is similar to the S3C2410, with extended clock source

  control. The OHCI portion is supported by the ohci-s3c2410 driver, and

  the clock control selection is supported by the core clock code.





USB Device

----------



  No current support in the kernel





IRQs

----



  All the standard, and external interrupt sources are supported. The

  extra sub-sources are not yet supported.





RTC

---



  The RTC hardware is similar to the S3C2410, and is supported by the

  s3c2410-rtc driver.





Watchdog

--------



  The watchdog harware is the same as the S3C2410, and is supported by

  the s3c2410_wdt driver.





MMC/SD/SDIO

-----------



  No current support for the MMC/SD/SDIO block.



IIC

---



  The IIC hardware is the same as the S3C2410, and is supported by the

  i2c-s3c24xx driver.





IIS

---



  No current support for the IIS interface.





SPI

---



  No current support for the SPI interfaces.





ATA

---



  No current support for the on-board ATA block.





Document Author

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



Ben Dooks, (c) 2006 Simtec Electronics

Documentation/arm/Samsung-S3C24XX/S3C2413.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
		S3C2413 ARM Linux Overview

		==========================



Introduction

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



  The S3C2413 is an extended version of the S3C2412, with an camera

  interface and mobile DDR memory support. See the S3C2412 support

  documentation for more information.





Camera Interface

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



  This block is currently not supported.





Document Author

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



Ben Dooks, (c) 2006 Simtec Electronics

arch/arm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ config ARCH_SA1100 
	  Support for StrongARM 11x0 based boards.



config ARCH_S3C2410

	bool "Samsung S3C2410"

	bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442"

	help

	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics

	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -372,7 +372,7 @@ config ISA_DMA_API 
	bool



config PCI

	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB

	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX

	help

	  Find out whether you have a PCI motherboard. PCI is the name of a

	  bus system, i.e. the way the CPU talks to the other stuff inside

arch/arm/boot/compressed/head-at91rm9200.S

+6 −0
Original line number Diff line number Diff line
@@ -61,6 +61,12 @@ 
		cmp	r7, r3

		beq	99f



		@ Ajeco 1ARM : 1075

		mov	r3,	#(MACH_TYPE_ONEARM & 0xff)

		orr	r3, r3, #(MACH_TYPE_ONEARM & 0xff00)

		cmp	r7, r3

		beq	99f



		@ Unknown board, use the AT91RM9200DK board

		@ mov	r7, #MACH_TYPE_AT91RM9200

		mov	r7,	#(MACH_TYPE_AT91RM9200DK & 0xff)