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

Commit 30d38542 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (85 commits)
  [ARM] pxa: add base support for PXA930 Handheld Platform (aka SAAR)
  [ARM] pxa: add base support for PXA930 Evaluation Board (aka TavorEVB)
  [ARM] pxa: add base support for PXA930 (aka Tavor-P)
  [ARM] Update mach-types
  [ARM] pxa: make littleton to use the new smc91x platform data
  [ARM] pxa: make zylonite to use the new smc91x platform data
  [ARM] pxa: make mainstone to use the new smc91x platform data
  [ARM] pxa: make lubbock to use new smc91x platform data
  [NET] smc91x: prepare SMC_USE_PXA_DMA to be specified in platform data
  [NET] smc91x: prepare for SMC_IO_SHIFT to be a platform configurable variable
  [NET] smc91x: add SMC91X_NOWAIT flag to platform data
  [NET] smc91x: favor the use of SMC91X_USE_* instead of SMC_CAN_USE_*
  [NET] smc91x: remove "irq_flags" from "struct smc91x_platdata"
  [ARM] 5146/1: pxa2xx: convert all boards to call pxa2xx_transceiver_mode helper
  Support for LCD on e740 e750 e400 and e800 e-series PDAs
  E-series UDC support
  PXA UDC - allow use of inverted GPIO for pullup
  Add e350 support
  Fix broken e-series build
  E-series GPIO / IRQ definitions.
  ...
parents 20b7997e 044e5f45

MAINTAINERS

+25 −0
Original line number Original line Diff line number Diff line
@@ -480,11 +480,28 @@ M: kernel@wantstofly.org 
L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained

S:	Maintained





ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT

P:	Mike Rapoport

M:	mike@compulab.co.il

L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained



ARM/CORGI MACHINE SUPPORT

ARM/CORGI MACHINE SUPPORT

P:	Richard Purdie

P:	Richard Purdie

M:	rpurdie@rpsys.net

M:	rpurdie@rpsys.net

S:	Maintained

S:	Maintained





ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)

P:	Daniel Ribeiro

M:	drwyrm@gmail.com

P:	Stefan Schmidt

M:	stefan@openezx.org

P:	Harald Welte

M:	laforge@openezx.org

L:	openezx-devel@lists.openezx.org (subscribers-only)

W:	http://www.openezx.org/

S:	Maintained



ARM/GLOMATION GESBC9312SX MACHINE SUPPORT

ARM/GLOMATION GESBC9312SX MACHINE SUPPORT

P:	Lennert Buytenhek

P:	Lennert Buytenhek

M:	kernel@wantstofly.org

M:	kernel@wantstofly.org
@@ -572,10 +589,18 @@ L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 
S:	Maintained

S:	Maintained





ARM/TOSA MACHINE SUPPORT

ARM/TOSA MACHINE SUPPORT

P:	Dmitry Baryshkov

M:	dbaryshkov@gmail.com

P:	Dirk Opfer

P:	Dirk Opfer

M:	dirk@opfer-online.de

M:	dirk@opfer-online.de

S:	Maintained

S:	Maintained





ARM/PALMTX SUPPORT

P:	Marek Vasut

M:	marek.vasut@gmail.com

W:	http://hackndev.com

S:	Maintained



ARM/PLEB SUPPORT

ARM/PLEB SUPPORT

P:	Peter Chubb

P:	Peter Chubb

M:	pleb@gelato.unsw.edu.au

M:	pleb@gelato.unsw.edu.au

arch/arm/common/sa1111.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -627,7 +627,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) 
	if (!sachip)

	if (!sachip)

		return -ENOMEM;

		return -ENOMEM;





	sachip->clk = clk_get(me, "GPIO27_CLK");

	sachip->clk = clk_get(me, "SA1111_CLK");

	if (!sachip->clk) {

	if (!sachip->clk) {

		ret = PTR_ERR(sachip->clk);

		ret = PTR_ERR(sachip->clk);

		goto err_free;

		goto err_free;

arch/arm/configs/ezx_defconfig

0 → 100644
+1614 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-pxa/Kconfig

+137 −82
Original line number Original line Diff line number Diff line
@@ -16,18 +16,24 @@ config CPU_PXA310 
config CPU_PXA320

config CPU_PXA320

	bool "PXA320 (codename Monahans-P)"

	bool "PXA320 (codename Monahans-P)"





config CPU_PXA930

	bool "PXA930 (codename Tavor-P)"



endmenu

endmenu





endif

endif





menu "Select target boards"



config ARCH_GUMSTIX

config ARCH_GUMSTIX

	bool "Gumstix XScale boards"

	bool "Gumstix XScale boards"

	help

	help

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

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

	  Gumstix Full Function Minature Computer.

	  Gumstix Full Function Minature Computer.





config MACH_GUMSTIX_F

	bool "Basix, Connex, ws-200ax, ws-400ax systems"

	depends on ARCH_GUMSTIX

	select PXA25x



config ARCH_LUBBOCK

config ARCH_LUBBOCK

	bool "Intel DBPXA250 Development Platform"

	bool "Intel DBPXA250 Development Platform"

	select PXA25x

	select PXA25x
@@ -58,6 +64,57 @@ config PXA_SHARPSL 
	  SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)

	  SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)

	  handheld computer.

	  handheld computer.





config MACH_POODLE

	bool "Enable Sharp SL-5600 (Poodle) Support"

	depends on PXA_SHARPSL

	select PXA25x

	select SHARP_LOCOMO

	select PXA_SSP



config MACH_CORGI

	bool "Enable Sharp SL-C700 (Corgi) Support"

	depends on PXA_SHARPSL

	select PXA25x

	select PXA_SHARP_C7xx



config MACH_SHEPHERD

	bool "Enable Sharp SL-C750 (Shepherd) Support"

	depends on PXA_SHARPSL

	select PXA25x

	select PXA_SHARP_C7xx



config MACH_HUSKY

	bool "Enable Sharp SL-C760 (Husky) Support"

	depends on PXA_SHARPSL

	select PXA25x

	select PXA_SHARP_C7xx



config MACH_AKITA

	bool "Enable Sharp SL-1000 (Akita) Support"

	depends on PXA_SHARPSL

	select PXA27x

	select PXA_SHARP_Cxx00

	select MACH_SPITZ

	select I2C

	select I2C_PXA



config MACH_SPITZ

	bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"

	depends on PXA_SHARPSL

	select PXA27x

	select PXA_SHARP_Cxx00



config MACH_BORZOI

	bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"

	depends on PXA_SHARPSL

	select PXA27x

	select PXA_SHARP_Cxx00



config MACH_TOSA

	bool "Enable Sharp SL-6000x (Tosa) Support"

	depends on PXA_SHARPSL

	select PXA25x



config ARCH_PXA_ESERIES

config ARCH_PXA_ESERIES

	bool "PXA based Toshiba e-series PDAs"

	bool "PXA based Toshiba e-series PDAs"

	select PXA25x

	select PXA25x
@@ -70,10 +127,19 @@ config MACH_E330 
	  Say Y here if you intend to run this kernel on a Toshiba

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

	  e330 family PDA.

	  e330 family PDA.





config MACH_E350

	bool "Toshiba e350"

	default y

	depends on ARCH_PXA_ESERIES

	help

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

	  e350 family PDA.



config MACH_E740

config MACH_E740

	bool "Toshiba e740"

	bool "Toshiba e740"

	default y

	default y

	depends on ARCH_PXA_ESERIES

	depends on ARCH_PXA_ESERIES

	select FB_W100

	help

	help

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

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

	  e740 family PDA.

	  e740 family PDA.
@@ -82,6 +148,7 @@ config MACH_E750 
	bool "Toshiba e750"

	bool "Toshiba e750"

	default y

	default y

	depends on ARCH_PXA_ESERIES

	depends on ARCH_PXA_ESERIES

	select FB_W100

	help

	help

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

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

	  e750 family PDA.

	  e750 family PDA.
@@ -98,6 +165,7 @@ config MACH_E800 
	bool "Toshiba e800"

	bool "Toshiba e800"

	default y

	default y

	depends on ARCH_PXA_ESERIES

	depends on ARCH_PXA_ESERIES

	select FB_W100

	help

	help

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

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

	  e800 family PDA.

	  e800 family PDA.
@@ -106,6 +174,10 @@ config MACH_TRIZEPS4 
	bool "Keith und Koep Trizeps4 DIMM-Module"

	bool "Keith und Koep Trizeps4 DIMM-Module"

	select PXA27x

	select PXA27x





config MACH_TRIZEPS4_CONXS

	bool "ConXS Eval Board"

	depends on MACH_TRIZEPS4



config MACH_EM_X270

config MACH_EM_X270

	bool "CompuLab EM-x270 platform"

	bool "CompuLab EM-x270 platform"

	select PXA27x

	select PXA27x
@@ -115,7 +187,7 @@ config MACH_COLIBRI 
	select PXA27x

	select PXA27x





config MACH_ZYLONITE

config MACH_ZYLONITE

	bool "PXA3xx Development Platform"

	bool "PXA3xx Development Platform (aka Zylonite)"

	select PXA3xx

	select PXA3xx

	select HAVE_PWM

	select HAVE_PWM
@@ -124,6 +196,16 @@ config MACH_LITTLETON 
	select PXA3xx

	select PXA3xx

	select PXA_SSP

	select PXA_SSP





config MACH_TAVOREVB

	bool "PXA930 Evaluation Board (aka TavorEVB)"

	select PXA3xx

	select PXA930



config MACH_SAAR

	bool "PXA930 Handheld Platform (aka SAAR)"

	select PXA3xx

	select PXA930



config MACH_ARMCORE

config MACH_ARMCORE

	bool "CompuLab CM-X270 modules"

	bool "CompuLab CM-X270 modules"

	select PXA27x

	select PXA27x
@@ -131,7 +213,6 @@ config MACH_ARMCORE 




config MACH_MAGICIAN

config MACH_MAGICIAN

	bool "Enable HTC Magician Support"

	bool "Enable HTC Magician Support"

	depends on ARCH_PXA

	select PXA27x

	select PXA27x

	select IWMMXT

	select IWMMXT
@@ -139,18 +220,26 @@ config MACH_PCM027 
	bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"

	bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"

	select PXA27x

	select PXA27x

	select IWMMXT

	select IWMMXT

	select PXA_SSP





endmenu

config ARCH_PXA_PALM

	bool "PXA based Palm PDAs"

	select HAVE_PWM





choice

config MACH_PALMTX

	prompt "Used baseboard"

	bool "Palm T|X"

	depends on MACH_PCM027

	default y

	depends on ARCH_PXA_PALM

	select PXA27x

	select IWMMXT

	help

	  Say Y here if you intend to run this kernel on a Palm T|X

	  handheld computer.





config MACH_PCM990_BASEBOARD

config MACH_PCM990_BASEBOARD

	bool "PHYTEC PCM-990 development board"

	bool "PHYTEC PCM-990 development board"

	select HAVE_PWM

	select HAVE_PWM



	depends on MACH_PCM027

endchoice





choice

choice

	prompt "display on pcm990"

	prompt "display on pcm990"
@@ -167,88 +256,45 @@ config PCM990_DISPLAY_NONE 




endchoice

endchoice





if ARCH_GUMSTIX



choice

	prompt "Select target Gumstix board"



config MACH_GUMSTIX_F

	bool "Basix, Connex, ws-200ax, ws-400ax systems"

	select PXA25x



endchoice



endif





config PXA_EZX

	bool "Motorola EZX Platform"

	select PXA27x

	select IWMMXT

	select HAVE_PWM





if MACH_TRIZEPS4

config MACH_EZX_A780

	bool "Motorola EZX A780"

	default y

	depends on PXA_EZX





choice

config MACH_EZX_E680

	prompt "Select base board for Trizeps 4 module"

	bool "Motorola EZX E680"

	default y

	depends on PXA_EZX





config MACH_TRIZEPS4_CONXS

config MACH_EZX_A1200

	bool "ConXS Eval Board"

	bool "Motorola EZX A1200"

	default y

	depends on PXA_EZX





config MACH_TRIZEPS4_ANY

config MACH_EZX_A910

	bool "another Board"

	bool "Motorola EZX A910"

	default y

	depends on PXA_EZX





endchoice

config MACH_EZX_E6

	bool "Motorola EZX E6"

	default y

	depends on PXA_EZX





endif

config MACH_EZX_E2

	bool "Motorola EZX E2"

	default y

	depends on PXA_EZX





endmenu

endmenu





config MACH_POODLE

	bool "Enable Sharp SL-5600 (Poodle) Support"

	depends on PXA_SHARPSL

	select PXA25x

	select SHARP_LOCOMO

	select PXA_SSP



config MACH_CORGI

	bool "Enable Sharp SL-C700 (Corgi) Support"

	depends on PXA_SHARPSL

	select PXA25x

	select PXA_SHARP_C7xx



config MACH_SHEPHERD

	bool "Enable Sharp SL-C750 (Shepherd) Support"

	depends on PXA_SHARPSL

	select PXA25x

	select PXA_SHARP_C7xx



config MACH_HUSKY

	bool "Enable Sharp SL-C760 (Husky) Support"

	depends on PXA_SHARPSL

	select PXA25x

	select PXA_SHARP_C7xx



config MACH_AKITA

	bool "Enable Sharp SL-1000 (Akita) Support"

	depends on PXA_SHARPSL

	select PXA27x

	select PXA_SHARP_Cxx00

	select MACH_SPITZ

	select I2C

	select I2C_PXA



config MACH_SPITZ

	bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"

	depends on PXA_SHARPSL

	select PXA27x

	select PXA_SHARP_Cxx00



config MACH_BORZOI

	bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"

	depends on PXA_SHARPSL

	select PXA27x

	select PXA_SHARP_Cxx00



config MACH_TOSA

	bool "Enable Sharp SL-6000x (Tosa) Support"

	depends on PXA_SHARPSL

	select PXA25x



config PXA25x

config PXA25x

	bool

	bool

	help

	help
@@ -288,4 +334,13 @@ config PXA_PWM 
	default BACKLIGHT_PWM

	default BACKLIGHT_PWM

	help

	help

	  Enable support for PXA2xx/PXA3xx PWM controllers

	  Enable support for PXA2xx/PXA3xx PWM controllers



config TOSA_BT

	tristate "Control the state of built-in bluetooth chip on Sharp SL-6000"

	depends on MACH_TOSA

	select RFKILL

	help

	  This is a simple driver that is able to control

	  the state of built in bluetooth chip on tosa.



endif
 
endif

arch/arm/mach-pxa/Makefile

+13 −2
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 




# Common support (must be linked before board specific support)

# Common support (must be linked before board specific support)

obj-y				+= clock.o devices.o generic.o irq.o dma.o \

obj-y				+= clock.o devices.o generic.o irq.o dma.o \

				   time.o gpio.o

				   time.o gpio.o reset.o

obj-$(CONFIG_PM)		+= pm.o sleep.o standby.o

obj-$(CONFIG_PM)		+= pm.o sleep.o standby.o

obj-$(CONFIG_CPU_FREQ)		+= cpu-pxa.o

obj-$(CONFIG_CPU_FREQ)		+= cpu-pxa.o
@@ -18,6 +18,7 @@ obj-$(CONFIG_PXA27x) += mfp-pxa2xx.o pxa2xx.o pxa27x.o 
obj-$(CONFIG_PXA3xx)		+= mfp-pxa3xx.o pxa3xx.o smemc.o

obj-$(CONFIG_PXA3xx)		+= mfp-pxa3xx.o pxa3xx.o smemc.o

obj-$(CONFIG_CPU_PXA300)	+= pxa300.o

obj-$(CONFIG_CPU_PXA300)	+= pxa300.o

obj-$(CONFIG_CPU_PXA320)	+= pxa320.o

obj-$(CONFIG_CPU_PXA320)	+= pxa320.o

obj-$(CONFIG_CPU_PXA930)	+= pxa930.o





# Specific board support

# Specific board support

obj-$(CONFIG_ARCH_GUMSTIX)	+= gumstix.o

obj-$(CONFIG_ARCH_GUMSTIX)	+= gumstix.o
@@ -36,7 +37,12 @@ obj-$(CONFIG_MACH_PCM990_BASEBOARD) += pcm990-baseboard.o 
obj-$(CONFIG_MACH_TOSA)		+= tosa.o

obj-$(CONFIG_MACH_TOSA)		+= tosa.o

obj-$(CONFIG_MACH_EM_X270)	+= em-x270.o

obj-$(CONFIG_MACH_EM_X270)	+= em-x270.o

obj-$(CONFIG_MACH_MAGICIAN)	+= magician.o

obj-$(CONFIG_MACH_MAGICIAN)	+= magician.o

obj-$(CONFIG_ARCH_PXA_ESERIES)	+= eseries.o

obj-$(CONFIG_ARCH_PXA_ESERIES)	+= eseries.o eseries_udc.o

obj-$(CONFIG_MACH_E740)		+= e740_lcd.o

obj-$(CONFIG_MACH_E750)		+= e750_lcd.o

obj-$(CONFIG_MACH_E400)		+= e400_lcd.o

obj-$(CONFIG_MACH_E800)		+= e800_lcd.o

obj-$(CONFIG_MACH_PALMTX)	+= palmtx.o





ifeq ($(CONFIG_MACH_ZYLONITE),y)

ifeq ($(CONFIG_MACH_ZYLONITE),y)

  obj-y				+= zylonite.o

  obj-y				+= zylonite.o
@@ -44,8 +50,11 @@ ifeq ($(CONFIG_MACH_ZYLONITE),y) 
  obj-$(CONFIG_CPU_PXA320)	+= zylonite_pxa320.o

  obj-$(CONFIG_CPU_PXA320)	+= zylonite_pxa320.o

endif

endif

obj-$(CONFIG_MACH_LITTLETON)	+= littleton.o

obj-$(CONFIG_MACH_LITTLETON)	+= littleton.o

obj-$(CONFIG_MACH_TAVOREVB)	+= tavorevb.o

obj-$(CONFIG_MACH_SAAR)		+= saar.o





obj-$(CONFIG_MACH_ARMCORE)      += cm-x270.o

obj-$(CONFIG_MACH_ARMCORE)      += cm-x270.o

obj-$(CONFIG_PXA_EZX)           += ezx.o





# Support for blinky lights

# Support for blinky lights

led-y := leds.o

led-y := leds.o
@@ -59,3 +68,5 @@ obj-$(CONFIG_LEDS) += $(led-y) 
ifeq ($(CONFIG_PCI),y)

ifeq ($(CONFIG_PCI),y)

obj-$(CONFIG_MACH_ARMCORE) += cm-x270-pci.o

obj-$(CONFIG_MACH_ARMCORE) += cm-x270-pci.o

endif

endif



obj-$(CONFIG_TOSA_BT)		+= tosa-bt.o