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

Commit 28f9f19d authored by Russell King's avatar Russell King
Browse files

Merge branch 'devel' of... 

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
parents 40262b2b 52a7a1ce

MAINTAINERS

+6 −2
Original line number Diff line number Diff line
@@ -738,18 +738,22 @@ M: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> 
M:	Dirk Opfer <dirk@opfer-online.de>

S:	Maintained



ARM/PALMTX,PALMT5,PALMLD,PALMTE2 SUPPORT

M:	Marek Vasut <marek.vasut@gmail.com>

ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT

P:	Marek Vasut

M:	marek.vasut@gmail.com

L:	linux-arm-kernel@lists.infradead.org

W:	http://hackndev.com

S:	Maintained



ARM/PALM TREO 680 SUPPORT

M:	Tomas Cech <sleep_walker@suse.cz>

L:	linux-arm-kernel@lists.infradead.org

W:	http://hackndev.com

S:	Maintained



ARM/PALMZ72 SUPPORT

M:	Sergey Lapin <slapin@ossfans.org>

L:	linux-arm-kernel@lists.infradead.org

W:	http://hackndev.com

S:	Maintained

arch/arm/configs/littleton_defconfig→arch/arm/configs/pxa3xx_defconfig

+1332 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/zylonite_defconfig→arch/arm/configs/xcep_defconfig

+1129 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.

arch/arm/include/asm/cputype.h

+4 −1
Original line number Diff line number Diff line
@@ -78,7 +78,10 @@ static inline unsigned int __attribute_const__ read_cpuid_tcmstatus(void) 
#else

static inline int cpu_is_xsc3(void)

{

	if ((read_cpuid_id() & 0xffffe000) == 0x69056000)

	unsigned int id;

	id = read_cpuid_id() & 0xffffe000;

	/* It covers both Intel ID and Marvell ID */

	if ((id == 0x69056000) || (id == 0x56056000))

		return 1;



	return 0;

arch/arm/mach-pxa/Kconfig

+36 −0
Original line number Diff line number Diff line
@@ -21,6 +21,11 @@ config CPU_PXA930 


config CPU_PXA935

	bool "PXA935 (codename Tavor-P65)"

	select CPU_PXA930



config CPU_PXA950

	bool "PXA950 (codename Tavor-PV2)"

	select CPU_PXA930



endmenu
@@ -79,6 +84,12 @@ config MACH_MP900C 
	bool "Nec Mobilepro 900/c"

	select PXA25x



config MACH_BALLOON3

	bool "Balloon 3 board"

	select PXA27x

	select IWMMXT

	select PXA_HAVE_BOARD_IRQS



config ARCH_PXA_IDP

	bool "Accelent Xscale IDP"

	select PXA25x
@@ -371,6 +382,15 @@ config MACH_PALMTE2 
	  Say Y here if you intend to run this kernel on a Palm Tungsten|E2

	  handheld computer.



config MACH_PALMTC

	bool "Palm Tungsten|C"

	default y

	depends on ARCH_PXA_PALM

	select PXA25x

	help

	  Say Y here if you intend to run this kernel on a Palm Tungsten|C

	  handheld computer.



config MACH_PALMT5

	bool "Palm Tungsten|T5"

	default y
@@ -458,6 +478,7 @@ config PXA_EZX 
	select PXA27x

	select IWMMXT

	select HAVE_PWM

	select PXA_HAVE_BOARD_IRQS



config MACH_EZX_A780

	bool "Motorola EZX A780"
@@ -489,6 +510,21 @@ config MACH_EZX_E2 
	default y

	depends on PXA_EZX



config MACH_XCEP

	bool "Iskratel Electronics XCEP"

	select PXA25x

	select MTD

	select MTD_PARTITIONS

	select MTD_PHYSMAP

	select MTD_CFI_INTELEXT

	select MTD_CFI

	select MTD_CHAR

	select SMC91X

	select PXA_SSP

	help

	  PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash.

	  Tuned for usage in Libera instruments for particle accelerators.



endmenu



config PXA25x