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

Commit c39e52a7 authored by Russell King's avatar Russell King
Browse files

Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap',... 

Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa', 'spear' and 'versatile' into devel

Conflicts:
	arch/arm/Makefile
	arch/arm/common/Makefile
	arch/arm/mm/Kconfig
parents 76225374 87160113 4fec9978 de4338f4 47ab0dee 2a847513 88341334 3e9cc705 4c18e77f f417cbad

Documentation/arm/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ Samsung-S3C24XX 
	- S3C24XX ARM Linux Overview

Sharp-LH

	- Linux on Sharp LH79524 and LH7A40X System On a Chip (SOC)

SPEAr

	- ST SPEAr platform Linux Overview

VFP/

	- Release notes for Linux Kernel Vector Floating Point support code

empeg/

Documentation/arm/SPEAr/overview.txt

0 → 100644
+60 −0
Original line number Diff line number Diff line 
			SPEAr ARM Linux Overview

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



Introduction

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



  SPEAr (Structured Processor Enhanced Architecture).

  weblink : http://www.st.com/spear



  The ST Microelectronics SPEAr range of ARM9/CortexA9 System-on-Chip CPUs are

  supported by the 'spear' platform of ARM Linux. Currently SPEAr300,

  SPEAr310, SPEAr320 and SPEAr600 SOCs are supported. Support for the SPEAr13XX

  series is in progress.



  Hierarchy in SPEAr is as follows:



  SPEAr (Platform)

	- SPEAr3XX (3XX SOC series, based on ARM9)

		- SPEAr300 (SOC)

			- SPEAr300_EVB (Evaluation Board)

		- SPEAr310 (SOC)

			- SPEAr310_EVB (Evaluation Board)

		- SPEAr320 (SOC)

			- SPEAr320_EVB (Evaluation Board)

	- SPEAr6XX (6XX SOC series, based on ARM9)

		- SPEAr600 (SOC)

			- SPEAr600_EVB (Evaluation Board)

	- SPEAr13XX (13XX SOC series, based on ARM CORTEXA9)

		- SPEAr1300 (SOC)



  Configuration

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



  A generic configuration is provided for each machine, and can be used as the

  default by

	make spear600_defconfig

	make spear300_defconfig

	make spear310_defconfig

	make spear320_defconfig



  Layout

  ------



  The common files for multiple machine families (SPEAr3XX, SPEAr6XX and

  SPEAr13XX) are located in the platform code contained in arch/arm/plat-spear

  with headers in plat/.



  Each machine series have a directory with name arch/arm/mach-spear followed by

  series name. Like mach-spear3xx, mach-spear6xx and mach-spear13xx.



  Common file for machines of spear3xx family is mach-spear3xx/spear3xx.c and for

  spear6xx is mach-spear6xx/spear6xx.c. mach-spear* also contain soc/machine

  specific files, like spear300.c, spear310.c, spear320.c and spear600.c.

  mach-spear* also contains board specific files for each machine type.





  Document Author

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



  Viresh Kumar, (c) 2010 ST Microelectronics

MAINTAINERS

+40 −0
Original line number Diff line number Diff line
@@ -5229,6 +5229,46 @@ F: drivers/serial/sunsu.c 
F:	drivers/serial/sunzilog.c

F:	drivers/serial/sunzilog.h



SPEAR PLATFORM SUPPORT

M:	Viresh Kumar <viresh.kumar@st.com>

W:	http://www.st.com/spear

S:	Maintained

F:	arch/arm/plat-spear/



SPEAR3XX MACHINE SUPPORT

M:	Viresh Kumar <viresh.kumar@st.com>

W:	http://www.st.com/spear

S:	Maintained

F:	arch/arm/mach-spear3xx/



SPEAR6XX MACHINE SUPPORT

M:	Rajeev Kumar <rajeev-dlh.kumar@st.com>

W:	http://www.st.com/spear

S:	Maintained

F:	arch/arm/mach-spear6xx/



SPEAR CLOCK FRAMEWORK SUPPORT

M:	Viresh Kumar <viresh.kumar@st.com>

W:	http://www.st.com/spear

S:	Maintained

F:	arch/arm/mach-spear*/clock.c

F:	arch/arm/mach-spear*/include/mach/clkdev.h

F:	arch/arm/plat-spear/clock.c

F:	arch/arm/plat-spear/include/plat/clock.h and clkdev.h



SPEAR PAD MULTIPLEXING SUPPORT

M:	Viresh Kumar <viresh.kumar@st.com>

W:	http://www.st.com/spear

S:	Maintained

F:	arch/arm/plat-spear/include/plat/padmux.h

F:	arch/arm/plat-spear/padmux.c

F:	arch/arm/mach-spear*/spear*xx.c

F:	arch/arm/mach-spear*/include/mach/generic.h

F:	arch/arm/mach-spear3xx/spear3*0.c

F:	arch/arm/mach-spear3xx/spear3*0_evb.c

F:	arch/arm/mach-spear6xx/spear600.c

F:	arch/arm/mach-spear6xx/spear600_evb.c



SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER

M:	Roger Wolff <R.E.Wolff@BitWizard.nl>

S:	Supported

arch/arm/Kconfig

+77 −19
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ config ARM 
	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_LZMA

	select HAVE_PERF_EVENTS

	select PERF_USE_VMALLOC

	help
@@ -42,6 +43,11 @@ config GENERIC_GPIO 


config GENERIC_TIME

	bool

	default y



config ARCH_USES_GETTIMEOFFSET

	bool

	default n



config GENERIC_CLOCKEVENTS

	bool
@@ -231,6 +237,7 @@ config ARCH_AAEC2000 
	select CPU_ARM920T

	select ARM_AMBA

	select HAVE_CLK

	select ARCH_USES_GETTIMEOFFSET

	help

	  This enables support for systems based on the Agilent AAEC-2000
@@ -238,21 +245,24 @@ config ARCH_INTEGRATOR 
	bool "ARM Ltd. Integrator family"

	select ARM_AMBA

	select ARCH_HAS_CPUFREQ

	select HAVE_CLK

	select COMMON_CLKDEV

	select ICST525

	select ICST

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select PLAT_VERSATILE

	help

	  Support for ARM's Integrator platform.



config ARCH_REALVIEW

	bool "ARM Ltd. RealView family"

	select ARM_AMBA

	select HAVE_CLK

	select COMMON_CLKDEV

	select ICST307

	select ICST

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select PLAT_VERSATILE

	select ARM_TIMER_SP804

	help

	  This enables support for ARM Ltd RealView boards.
@@ -260,20 +270,36 @@ config ARCH_VERSATILE 
	bool "ARM Ltd. Versatile family"

	select ARM_AMBA

	select ARM_VIC

	select HAVE_CLK

	select COMMON_CLKDEV

	select ICST307

	select ICST

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select PLAT_VERSATILE

	select ARM_TIMER_SP804

	help

	  This enables support for ARM Ltd Versatile board.



config ARCH_VEXPRESS

	bool "ARM Ltd. Versatile Express family"

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_AMBA

	select ARM_TIMER_SP804

	select COMMON_CLKDEV

	select GENERIC_CLOCKEVENTS

	select GENERIC_TIME

	select HAVE_CLK

	select ICST

	select PLAT_VERSATILE

	help

	  This enables support for the ARM Ltd Versatile Express boards.



config ARCH_AT91

	bool "Atmel AT91"

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select ARCH_USES_GETTIMEOFFSET

	help

	  This enables support for systems based on the Atmel AT91RM9200,

	  AT91SAM9 and AT91CAP9 processors.
@@ -293,6 +319,7 @@ config ARCH_BCMRING 
config ARCH_CLPS711X

	bool "Cirrus Logic CLPS711x/EP721x-based"

	select CPU_ARM720T

	select ARCH_USES_GETTIMEOFFSET

	help

	  Support for Cirrus Logic 711x/721x based boards.
@@ -301,6 +328,7 @@ config ARCH_GEMINI 
	select CPU_FA526

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_USES_GETTIMEOFFSET

	help

	  Support for the Cortina Systems Gemini family SoCs
@@ -309,6 +337,7 @@ config ARCH_EBSA110 
	select CPU_SA110

	select ISA

	select NO_IOPORT

	select ARCH_USES_GETTIMEOFFSET

	help

	  This is an evaluation board for the StrongARM processor available

	  from Digital. It has limited hardware on-board, including an
@@ -321,10 +350,10 @@ config ARCH_EP93XX 
	select ARM_AMBA

	select ARM_VIC

	select GENERIC_GPIO

	select HAVE_CLK

	select COMMON_CLKDEV

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_USES_GETTIMEOFFSET

	help

	  This enables support for the Cirrus EP93xx series of CPUs.
@@ -332,6 +361,7 @@ config ARCH_FOOTBRIDGE 
	bool "FootBridge"

	select CPU_SA110

	select FOOTBRIDGE

	select ARCH_USES_GETTIMEOFFSET

	help

	  Support for systems based on the DC21285 companion chip

	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@ -341,7 +371,6 @@ config ARCH_MXC 
	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select COMMON_CLKDEV

	help

	  Support for Freescale MXC/iMX-based family of processors
@@ -349,7 +378,6 @@ config ARCH_MXC 
config ARCH_STMP3XXX

	bool "Freescale STMP3xxx"

	select CPU_ARM926T

	select HAVE_CLK

	select COMMON_CLKDEV

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_TIME
@@ -372,6 +400,7 @@ config ARCH_H720X 
	bool "Hynix HMS720x-based"

	select CPU_ARM720T

	select ISA_DMA_API

	select ARCH_USES_GETTIMEOFFSET

	help

	  This enables support for systems based on the Hynix HMS720x
@@ -414,6 +443,7 @@ config ARCH_IXP23XX 
	depends on MMU

	select CPU_XSC3

 	select PCI

	select ARCH_USES_GETTIMEOFFSET

	help

	  Support for Intel's IXP23xx (XScale) family of processors.
@@ -422,6 +452,7 @@ config ARCH_IXP2000 
	depends on MMU

	select CPU_XSCALE

	select PCI

	select ARCH_USES_GETTIMEOFFSET

	help

	  Support for Intel's IXP2400/2800 (XScale) family of processors.
@@ -440,6 +471,7 @@ config ARCH_L7200 
	bool "LinkUp-L7200"

	select CPU_ARM720T

	select FIQ

	select ARCH_USES_GETTIMEOFFSET

	help

	  Say Y here if you intend to run this kernel on a LinkUp Systems

	  L7200 Software Development Board which uses an ARM720T processor.
@@ -516,7 +548,6 @@ config ARCH_MMP 
	depends on MMU

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS
@@ -530,6 +561,7 @@ config ARCH_KS8695 
	select CPU_ARM922T

	select GENERIC_GPIO

        select ARCH_REQUIRE_GPIOLIB

	select ARCH_USES_GETTIMEOFFSET

	help

	  Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based

	  System-on-Chip devices.
@@ -552,7 +584,6 @@ config ARCH_W90X900 
	select CPU_ARM926T

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_GPIO

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS
@@ -568,7 +599,6 @@ config ARCH_W90X900 
config ARCH_NUC93X

	bool "Nuvoton NUC93X CPU"

	select CPU_ARM926T

	select HAVE_CLK

	select COMMON_CLKDEV

	help

	  Support for Nuvoton (Winbond logic dept.) NUC93X MCU,The NUC93X is a
@@ -577,8 +607,8 @@ config ARCH_NUC93X 
config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"

	select CPU_ARM926T

	select HAVE_CLK

	select COMMON_CLKDEV

	select ARCH_USES_GETTIMEOFFSET

	help

	  This enables support for Philips PNX4008 mobile platform.
@@ -588,7 +618,6 @@ config ARCH_PXA 
	select ARCH_MTD_XIP

	select ARCH_HAS_CPUFREQ

	select GENERIC_GPIO

	select HAVE_CLK

	select COMMON_CLKDEV

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_TIME
@@ -624,6 +653,7 @@ config ARCH_RPC 
	select ISA_DMA_API

	select NO_IOPORT

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_USES_GETTIMEOFFSET

	help

	  On the Acorn Risc-PC, Linux can support the internal IDE disk and

	  CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -650,6 +680,7 @@ config ARCH_S3C2410 
	select GENERIC_GPIO

	select ARCH_HAS_CPUFREQ

	select HAVE_CLK

	select ARCH_USES_GETTIMEOFFSET

	help

	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics

	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -663,6 +694,7 @@ config ARCH_S3C64XX 
	select ARM_VIC

	select HAVE_CLK

	select NO_IOPORT

	select ARCH_USES_GETTIMEOFFSET

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select SAMSUNG_CLKSRC
@@ -719,6 +751,7 @@ config ARCH_SHARK 
	select ISA_DMA

	select ZONE_DMA

	select PCI

	select ARCH_USES_GETTIMEOFFSET

	help

	  Support for the StrongARM based Digital DNARD machine, also known

	  as "Shark" (<http://www.shark-linux.de/shark.html>).
@@ -728,6 +761,7 @@ config ARCH_LH7A40X 
	select CPU_ARM922T

	select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM

	select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM

	select ARCH_USES_GETTIMEOFFSET

	help

	  Say Y here for systems based on one of the Sharp LH7A40X

	  System on a Chip processors.  These CPUs include an ARM922T
@@ -743,7 +777,6 @@ config ARCH_U300 
	select ARM_VIC

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_GPIO

	help
@@ -756,6 +789,7 @@ config ARCH_U8500 
	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select COMMON_CLKDEV

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for ST-Ericsson's Ux500 architecture
@@ -764,7 +798,6 @@ config ARCH_NOMADIK 
	select ARM_AMBA

	select ARM_VIC

	select CPU_ARM926T

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS
@@ -780,7 +813,6 @@ config ARCH_DAVINCI 
	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select ZONE_DMA

	select HAVE_IDE

	select COMMON_CLKDEV
@@ -801,6 +833,18 @@ config ARCH_OMAP 
	help

	  Support for TI's OMAP platform (OMAP1 and OMAP2).



config PLAT_SPEAR

	bool "ST SPEAr"

	select ARM_AMBA

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLKDEV

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select GENERIC_TIME

	select HAVE_CLK

	help

	  Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx).



endchoice



#
@@ -886,6 +930,7 @@ source "arch/arm/plat-samsung/Kconfig" 
source "arch/arm/plat-s3c24xx/Kconfig"

source "arch/arm/plat-s5p/Kconfig"

source "arch/arm/plat-s5pc1xx/Kconfig"

source "arch/arm/plat-spear/Kconfig"



if ARCH_S3C2410

source "arch/arm/mach-s3c2400/Kconfig"
@@ -919,6 +964,8 @@ source "arch/arm/mach-ux500/Kconfig" 


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



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



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



# Definitions to make life easier
@@ -936,6 +983,12 @@ config PLAT_ORION 
config PLAT_PXA

	bool



config PLAT_VERSATILE

	bool



config ARM_TIMER_SP804

	bool



source arch/arm/mm/Kconfig



config IWMMXT
@@ -1064,6 +1117,10 @@ config PCI 
	  your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or

	  VESA. If you have PCI, say Y, otherwise N.



config PCI_DOMAINS

	bool

	depends on PCI



config PCI_SYSCALL

	def_bool PCI
@@ -1092,10 +1149,11 @@ source "kernel/time/Kconfig" 
config SMP

	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || ARCH_U8500)

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\

		 ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

	depends on GENERIC_CLOCKEVENTS

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500)

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

	help

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, like most personal computers, say N. If

arch/arm/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -175,9 +175,14 @@ machine-$(CONFIG_ARCH_STMP37XX) := stmp37xx 
machine-$(CONFIG_ARCH_U300)		:= u300

machine-$(CONFIG_ARCH_U8500)		:= ux500

machine-$(CONFIG_ARCH_VERSATILE)	:= versatile

machine-$(CONFIG_ARCH_VEXPRESS)		:= vexpress

machine-$(CONFIG_ARCH_W90X900)		:= w90x900

machine-$(CONFIG_ARCH_NUC93X)		:= nuc93x

machine-$(CONFIG_FOOTBRIDGE)		:= footbridge

machine-$(CONFIG_MACH_SPEAR300)		:= spear3xx

machine-$(CONFIG_MACH_SPEAR310)		:= spear3xx

machine-$(CONFIG_MACH_SPEAR320)		:= spear3xx

machine-$(CONFIG_MACH_SPEAR600)		:= spear6xx



# Platform directory name.  This list is sorted alphanumerically

# by CONFIG_* macro name.
@@ -192,6 +197,8 @@ plat-$(CONFIG_PLAT_PXA) := pxa 
plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx samsung

plat-$(CONFIG_PLAT_S5PC1XX)	:= s5pc1xx samsung

plat-$(CONFIG_PLAT_S5P)		:= s5p samsung

plat-$(CONFIG_PLAT_SPEAR)	:= spear

plat-$(CONFIG_PLAT_VERSATILE)	:= versatile



ifeq ($(CONFIG_ARCH_EBSA110),y)

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