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

Commit 49ea7fc0 authored by Haojian Zhuang's avatar Haojian Zhuang Committed by Arnd Bergmann
Browse files

ARM: pxa: remove pxa95x support 



PXA95x isn't widely used. And it adds the effort on supporting
multiple platform. So remove it.

The assumption is that nobody will miss this support. If you are
reading this text because you actually require pxa95x support on
a new kernel, we can work out a way to revert this patch or add
support to the mmp platform.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent b5932cc8

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1154,7 +1154,7 @@ config ARM_NR_BANKS 
config IWMMXT

	bool "Enable iWMMXt support"

	depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4

	default y if PXA27x || PXA3xx || PXA95x || ARCH_MMP

	default y if PXA27x || PXA3xx || ARCH_MMP

	help

	  Enable support for iWMMXt context switching at run time if

	  running on a CPU that supports it.

arch/arm/mach-pxa/Kconfig

+0 −34
Original line number Diff line number Diff line
@@ -2,27 +2,6 @@ if ARCH_PXA 


menu "Intel PXA2xx/PXA3xx Implementations"



config ARCH_PXA_V7

	bool "ARMv7 (PXA95x) based systems"



if ARCH_PXA_V7

comment "Marvell Dev Platforms (sorted by hardware release time)"

config MACH_TAVOREVB3

	bool "PXA95x Development Platform (aka TavorEVB III)"

	select CPU_PXA955



config MACH_SAARB

	bool "PXA955 Handheld Platform (aka SAARB)"

	select CPU_PXA955

endif



config PXA_V7_MACH_AUTO

	def_bool y

	depends on ARCH_PXA_V7

	depends on !MACH_SAARB

	select MACH_TAVOREVB3



if !ARCH_PXA_V7

comment "Intel/Marvell Dev Platforms (sorted by hardware release time)"



config MACH_PXA3XX_DT
@@ -630,7 +609,6 @@ config MACH_ZIPIT2 
	bool "Zipit Z2 Handheld"

	select HAVE_PWM

	select PXA27x

endif

endmenu



config PXA25x
@@ -688,18 +666,6 @@ config CPU_PXA935 
	help

	  PXA935 (codename Tavor-P65)



config PXA95x

	bool

	select CPU_PJ4

	help

	  Select code specific to PXA95x variants



config CPU_PXA955

	bool

	select PXA95x

	help

	  PXA950 (codename MG1)



config PXA_SHARP_C7xx

	bool

	select SHARPSL_PM

arch/arm/mach-pxa/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ endif 
obj-$(CONFIG_PXA25x)		+= mfp-pxa2xx.o clock-pxa2xx.o pxa2xx.o pxa25x.o

obj-$(CONFIG_PXA27x)		+= mfp-pxa2xx.o clock-pxa2xx.o pxa2xx.o pxa27x.o

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

obj-$(CONFIG_PXA95x)		+= mfp-pxa3xx.o clock-pxa3xx.o pxa3xx.o pxa95x.o smemc.o

obj-$(CONFIG_CPU_PXA300)	+= pxa300.o

obj-$(CONFIG_CPU_PXA320)	+= pxa320.o

obj-$(CONFIG_CPU_PXA930)	+= pxa930.o
@@ -36,9 +35,7 @@ obj-$(CONFIG_MACH_ZYLONITE300) += zylonite.o zylonite_pxa300.o 
obj-$(CONFIG_MACH_ZYLONITE320)	+= zylonite.o zylonite_pxa320.o

obj-$(CONFIG_MACH_LITTLETON)	+= littleton.o

obj-$(CONFIG_MACH_TAVOREVB)	+= tavorevb.o

obj-$(CONFIG_MACH_TAVOREVB3)	+= tavorevb3.o

obj-$(CONFIG_MACH_SAAR)		+= saar.o

obj-$(CONFIG_MACH_SAARB)	+= saarb.o



# 3rd Party Dev Platforms

obj-$(CONFIG_ARCH_PXA_IDP)	+= idp.o

arch/arm/mach-pxa/clock.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ void clk_pxa2xx_cken_disable(struct clk *clk); 


extern struct syscore_ops pxa2xx_clock_syscore_ops;



#if defined(CONFIG_PXA3xx) || defined(CONFIG_PXA95x)

#if defined(CONFIG_PXA3xx)

#define DEFINE_PXA3_CKEN(_name, _cken, _rate, _delay)	\

struct clk clk_##_name = {				\

		.ops	= &clk_pxa3xx_cken_ops,		\

arch/arm/mach-pxa/devices.c

+4 −4
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ void __init pxa_set_ohci_info(struct pxaohci_platform_data *info) 
}

#endif /* CONFIG_PXA27x || CONFIG_PXA3xx */



#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) || defined(CONFIG_PXA95x)

#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)

static struct resource pxa27x_resource_keypad[] = {

	[0] = {

		.start	= 0x41500000,
@@ -872,7 +872,7 @@ struct platform_device pxa27x_device_pwm1 = { 
	.resource	= pxa27x_resource_pwm1,

	.num_resources	= ARRAY_SIZE(pxa27x_resource_pwm1),

};

#endif /* CONFIG_PXA27x || CONFIG_PXA3xx || CONFIG_PXA95x*/

#endif /* CONFIG_PXA27x || CONFIG_PXA3xx */



#ifdef CONFIG_PXA3xx

static struct resource pxa3xx_resources_mci2[] = {
@@ -981,7 +981,7 @@ struct platform_device pxa3xx_device_gcu = { 


#endif /* CONFIG_PXA3xx */



#if defined(CONFIG_PXA3xx) || defined(CONFIG_PXA95x)

#if defined(CONFIG_PXA3xx)

static struct resource pxa3xx_resources_i2c_power[] = {

	{

		.start  = 0x40f500c0,
@@ -1082,7 +1082,7 @@ struct platform_device pxa3xx_device_ssp4 = { 
	.resource	= pxa3xx_resource_ssp4,

	.num_resources	= ARRAY_SIZE(pxa3xx_resource_ssp4),

};

#endif /* CONFIG_PXA3xx || CONFIG_PXA95x */

#endif /* CONFIG_PXA3xx */



struct resource pxa_resource_gpio[] = {

	{