Skip to contentSkip to conversation

ARM: pxa: remove pxa95x support

PATCH New Haojian Zhuang 2 participants 6 messages Nov 15, 2012

Subsystems (5)
Arm (32-bit) Arm sub-architectures GPIO PXA2xx/PXA3xx support +1 more subsystems
lore
Share & tools
lore

Haojian Zhuang

author maintainer
#0 lore raw

PATCH 1/1 ARM: pxa: remove pxa95x support

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

Signed-off-by Haojian Zhuang <[email protected]>
---
 arch/arm/Kconfig                          |    2 +-
 arch/arm/mach-pxa/Kconfig                 |   34 ----
 arch/arm/mach-pxa/Makefile                |    3 -
 arch/arm/mach-pxa/clock.h                 |    2 +-
 arch/arm/mach-pxa/devices.c               |    8 +-
 arch/arm/mach-pxa/include/mach/hardware.h |   28 ---
 arch/arm/mach-pxa/include/mach/irqs.h     |    1 -
 arch/arm/mach-pxa/include/mach/pxa3xx.h   |    1 -
 arch/arm/mach-pxa/include/mach/pxa95x.h   |    7 -
 arch/arm/mach-pxa/pxa95x.c                |  295 -----------------------------
 arch/arm/mach-pxa/saarb.c                 |  115 -----------
 arch/arm/mach-pxa/tavorevb3.c             |  136 -------------
 arch/arm/plat-pxa/Makefile                |    1 -
 arch/arm/plat-pxa/include/plat/mfp.h      |    4 +-
 drivers/gpio/gpio-pxa.c                   |    2 +-
 15 files changed, 9 insertions(+), 630 deletions(-)
 delete mode 100644 arch/arm/mach-pxa/include/mach/pxa95x.h
 delete mode 100644 arch/arm/mach-pxa/pxa95x.c
 delete mode 100644 arch/arm/mach-pxa/saarb.c
 delete mode 100644 arch/arm/mach-pxa/tavorevb3.c
arch/arm/Kconfig +1 -1
index ade7e92..5c7e94f 100644
@@ -1168,7 +1168,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
index 11aa739..86eec41 100644
@@ -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
index ee88d6e..12c5005 100644
@@ -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
index 3a258b1..1f65d32 100644
@@ -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
index ddaa04d..daa86d3 100644
@@ -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[] = {
 	{
arch/arm/mach-pxa/include/mach/hardware.h +0 -28
index 56d92e5..ccb06e4 100644
@@ -194,17 +194,6 @@
 #define __cpu_is_pxa935(id)	(0)
 #endif
 
-#ifdef CONFIG_CPU_PXA955
-#define __cpu_is_pxa955(id)				\
-	({						\
-		unsigned int _id = (id) >> 4 & 0xfff;	\
-		_id == 0x581 || _id == 0xc08		\
-			|| _id == 0xb76;		\
-	})
-#else
-#define __cpu_is_pxa955(id)	(0)
-#endif
-
 #define cpu_is_pxa210()					\
 	({						\
 		__cpu_is_pxa210(read_cpuid_id());	\

@@ -255,10 +244,6 @@
 		__cpu_is_pxa935(read_cpuid_id());	\
 	 })
 
-#define cpu_is_pxa955()					\
-	({						\
-		__cpu_is_pxa955(read_cpuid_id());	\
-	})
 
 
 /*

@@ -297,15 +282,6 @@
 #define __cpu_is_pxa93x(id)	(0)
 #endif
 
-#ifdef CONFIG_PXA95x
-#define __cpu_is_pxa95x(id)				\
-	({						\
-		__cpu_is_pxa955(id);			\
-	})
-#else
-#define __cpu_is_pxa95x(id)	(0)
-#endif
-
 #define cpu_is_pxa2xx()					\
 	({						\
 		__cpu_is_pxa2xx(read_cpuid_id());	\

@@ -321,10 +297,6 @@
 		__cpu_is_pxa93x(read_cpuid_id());	\
 	 })
 
-#define cpu_is_pxa95x()					\
-	({						\
-		__cpu_is_pxa95x(read_cpuid_id());	\
-	})
 
 /*
  * return current memory and LCD clock frequency in units of 10kHz
arch/arm/mach-pxa/include/mach/irqs.h +0 -1
index 8765782..48c2fd8 100644
@@ -84,7 +84,6 @@
 #define IRQ_PXA935_MMC0	PXA_IRQ(72)	/* MMC0 Controller (PXA935) */
 #define IRQ_PXA935_MMC1	PXA_IRQ(73)	/* MMC1 Controller (PXA935) */
 #define IRQ_PXA935_MMC2	PXA_IRQ(74)	/* MMC2 Controller (PXA935) */
-#define IRQ_PXA955_MMC3	PXA_IRQ(75)	/* MMC3 Controller (PXA955) */
 #define IRQ_U2P		PXA_IRQ(93)	/* USB PHY D+/D- Lines (PXA935) */
 
 #define PXA_GPIO_IRQ_BASE	PXA_IRQ(96)
arch/arm/mach-pxa/include/mach/pxa3xx.h +0 -1
index cd3e57f..6dd7fa1 100644
@@ -7,7 +7,6 @@
 
 extern void __init pxa3xx_map_io(void);
 extern void __init pxa3xx_init_irq(void);
-extern void __init pxa95x_init_irq(void);
 
 #define pxa3xx_handle_irq	ichp_handle_irq
arch/arm/mach-pxa/include/mach/pxa95x.h deleted +0 -7
deleted file mode 100644
index cbb097c..0000000
@@ -1,7 +0,0 @@
-#ifndef __MACH_PXA95X_H
-#define __MACH_PXA95X_H
-
-#include <mach/pxa3xx.h>
-#include <mach/mfp-pxa930.h>
-
-#endif /* __MACH_PXA95X_H */
arch/arm/mach-pxa/pxa95x.c deleted +0 -295

295 lines not on this page · raw message

arch/arm/mach-pxa/saarb.c deleted +0 -115

115 lines not on this page · raw message

arch/arm/mach-pxa/tavorevb3.c deleted +0 -136

136 lines not on this page · raw message

arch/arm/plat-pxa/Makefile +0 -1
index af8e484..1fc9419 100644
@@ -5,7 +5,6 @@
 obj-y	:= dma.o
 
 obj-$(CONFIG_PXA3xx)		+= mfp.o
-obj-$(CONFIG_PXA95x)		+= mfp.o
 obj-$(CONFIG_ARCH_MMP)		+= mfp.o
 
 obj-$(CONFIG_PXA_SSP)		+= ssp.o
arch/arm/plat-pxa/include/plat/mfp.h +2 -2
index 5c79c29..10bc4f3 100644
@@ -423,7 +423,7 @@ typedef unsigned long mfp_cfg_t;
 	((MFP_CFG_DEFAULT & ~(MFP_AF_MASK | MFP_DS_MASK | MFP_LPM_STATE_MASK)) |\
 	 (MFP_PIN(MFP_PIN_##pin) | MFP_##af | MFP_##drv | MFP_LPM_##lpm))
 
-#if defined(CONFIG_PXA3xx) || defined(CONFIG_PXA95x) || defined(CONFIG_ARCH_MMP)
+#if defined(CONFIG_PXA3xx) || defined(CONFIG_ARCH_MMP)
 /*
  * each MFP pin will have a MFPR register, since the offset of the
  * register varies between processors, the processor specific code

@@ -470,6 +470,6 @@ void mfp_write(int mfp, unsigned long mfpr_val);
 void mfp_config(unsigned long *mfp_cfgs, int num);
 void mfp_config_run(void);
 void mfp_config_lpm(void);
-#endif /* CONFIG_PXA3xx || CONFIG_PXA95x || CONFIG_ARCH_MMP */
+#endif /* CONFIG_PXA3xx || CONFIG_ARCH_MMP */
 
 #endif /* __ASM_PLAT_MFP_H */
drivers/gpio/gpio-pxa.c +1 -1
index 98d52cb..6ab8afb 100644
@@ -448,7 +448,7 @@ static int pxa_gpio_nums(void)
 	} else if (cpu_is_pxa27x()) {
 		count = 120;
 		gpio_type = PXA27X_GPIO;
-	} else if (cpu_is_pxa93x() || cpu_is_pxa95x()) {
+	} else if (cpu_is_pxa93x()) {
 		count = 191;
 		gpio_type = PXA93X_GPIO;
 	} else if (cpu_is_pxa3xx()) {
Signature · 1 line
1.7.10.4
author maintainer
#2 lore raw

PATCH 1/1 ARM: pxa: remove pxa95x support

Quoted 4 lines · Arnd Bergmann
Quoted 3 lines · Haojian Zhuang

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

Quoted 8 lines
Quoted 1 line
Signed-off-by Haojian Zhuang <[email protected]>

Looks good to me, thanks for going through this.

Acked-by Arnd Bergmann <[email protected]>

Should I apply this straight into the arm-soc tree, or are you going to send a pull request?

Yes, please apply it into arm-soc tree directly.

Regards
Haojian

#3 lore raw

PATCH 1/1 ARM: pxa: remove pxa95x support

In reply to Arnd Bergmann
Quoted 4 lines · Arnd Bergmann
Quoted 3 lines · Haojian Zhuang

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

Quoted 9 lines
Quoted 1 line
Signed-off-by Haojian Zhuang <[email protected]>

Looks good to me, thanks for going through this.

Acked-by Arnd Bergmann <[email protected]>

Should I apply this straight into the arm-soc tree, or are you going to send a pull request?

One more comment: It would be good to put a disclaimer into the changeset text like

"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".

Arnd

author maintainer
#4 lore raw

PATCH 1/1 ARM: pxa: remove pxa95x support

Quoted 18 lines · Arnd Bergmann
Quoted 4 lines · Arnd Bergmann
Quoted 3 lines · Haojian Zhuang

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

Quoted 9 lines
Quoted 1 line
Signed-off-by Haojian Zhuang <[email protected]>

Looks good to me, thanks for going through this.

Acked-by Arnd Bergmann <[email protected]>

Should I apply this straight into the arm-soc tree, or are you going to send a pull request?

One more comment: It would be good to put a disclaimer into the changeset text like

Quoted 6 lines

"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".

Arnd

Yes, it's great. Please help to paste it into the changeset.

Best Regards
Haojian

#5 lore raw

PATCH 1/1 ARM: pxa: remove pxa95x support

Quoted 10 lines · Haojian Zhuang
Quoted 6 lines · Arnd Bergmann

On Thursday 15 November 2012, Arnd Bergmann wrote:

"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".

Yes, it's great. Please help to paste it into the changeset.

Ok, applied.

Arnd