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

Commit cc513ac0 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm 

Merge branch 'pxa-viper' into pxa-machines

Conflicts:

	arch/arm/mach-pxa/Makefile
	drivers/pcmcia/Kconfig
	drivers/pcmcia/Makefile
parents 1543966a 19ec95df

arch/arm/configs/viper_defconfig

0 → 100644
+1678 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-pxa/Kconfig

+22 −0
Original line number Diff line number Diff line
@@ -38,16 +38,19 @@ config ARCH_LUBBOCK 
	bool "Intel DBPXA250 Development Platform"

	select PXA25x

	select SA1111

	select PXA_HAVE_BOARD_IRQS



config MACH_LOGICPD_PXA270

	bool "LogicPD PXA270 Card Engine Development Platform"

	select PXA27x

	select HAVE_PWM

	select PXA_HAVE_BOARD_IRQS



config MACH_MAINSTONE

	bool "Intel HCDDBBVA0 Development Platform"

	select PXA27x

	select HAVE_PWM

	select PXA_HAVE_BOARD_IRQS



config MACH_MP900C

	bool "Nec Mobilepro 900/c"
@@ -118,10 +121,21 @@ config MACH_TOSA 
	bool "Enable Sharp SL-6000x (Tosa) Support"

	depends on PXA_SHARPSL

	select PXA25x

	select PXA_HAVE_BOARD_IRQS



config ARCH_VIPER

	bool "Arcom/Eurotech VIPER SBC"

	select PXA25x

	select ISA

	select I2C_GPIO

	select HAVE_PWM

	select PXA_HAVE_BOARD_IRQS

	select PXA_HAVE_ISA_IRQS



config ARCH_PXA_ESERIES

	bool "PXA based Toshiba e-series PDAs"

	select PXA25x

	select PXA_HAVE_BOARD_IRQS



config MACH_E330

	bool "Toshiba e330"
@@ -255,6 +269,7 @@ config MACH_MAGICIAN 
	bool "Enable HTC Magician Support"

	select PXA27x

	select IWMMXT

	select PXA_HAVE_BOARD_IRQS



config MACH_MIOA701

	bool "Mitac Mio A701 Support"
@@ -273,6 +288,7 @@ config MACH_PCM027 
	select PXA27x

	select IWMMXT

	select PXA_SSP

	select PXA_HAVE_BOARD_IRQS



config ARCH_PXA_PALM

	bool "PXA based Palm PDAs"
@@ -408,4 +424,10 @@ config TOSA_BT 
	  This is a simple driver that is able to control

	  the state of built in bluetooth chip on tosa.



config PXA_HAVE_BOARD_IRQS

	bool



config PXA_HAVE_ISA_IRQS

	bool



endif

arch/arm/mach-pxa/Makefile

+8 −5
Original line number Diff line number Diff line
@@ -39,13 +39,16 @@ obj-$(CONFIG_MACH_TOSA) += tosa.o 
obj-$(CONFIG_MACH_EM_X270)	+= em-x270.o

obj-$(CONFIG_MACH_MAGICIAN)	+= magician.o

obj-$(CONFIG_MACH_MIOA701)	+= mioa701.o mioa701_bootresume.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_ARCH_PXA_ESERIES)	+= eseries.o

obj-$(CONFIG_MACH_E330)		+= e330.o

obj-$(CONFIG_MACH_E350)		+= e350.o

obj-$(CONFIG_MACH_E740)		+= e740.o

obj-$(CONFIG_MACH_E750)		+= e750.o

obj-$(CONFIG_MACH_E400)		+= e400.o

obj-$(CONFIG_MACH_E800)		+= e800.o

obj-$(CONFIG_MACH_PALMTX)	+= palmtx.o

obj-$(CONFIG_MACH_PALMZ72)	+= palmz72.o

obj-$(CONFIG_ARCH_VIPER)	+= viper.o



ifeq ($(CONFIG_MACH_ZYLONITE),y)

  obj-y				+= zylonite.o

arch/arm/mach-pxa/include/mach/entry-macro.S

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
		and	\irqstat, \irqstat, \irqnr

		clz	\irqnr, \irqstat

		rsb	\irqnr, \irqnr, #31

		add	\irqnr, \irqnr, #32

		add	\irqnr, \irqnr, #(32 + PXA_IRQ(0))

		b	1001f

1003:

		mrc	p6, 0, \irqstat, c0, c0, 0	@ ICIP
@@ -52,6 +52,6 @@ 
		rsb	\irqstat, \irqnr, #0

		and	\irqstat, \irqstat, \irqnr

		clz	\irqnr, \irqstat

		rsb	\irqnr, \irqnr, #31

		rsb	\irqnr, \irqnr, #(31 + PXA_IRQ(0))

1001:

		.endm

arch/arm/mach-pxa/include/mach/irqs.h

+10 −9
Original line number Diff line number Diff line
@@ -11,7 +11,14 @@ 
 */





#define PXA_IRQ(x)	(x)

#ifdef CONFIG_PXA_HAVE_ISA_IRQS

#define PXA_ISA_IRQ(x)	(x)

#define PXA_ISA_IRQ_NUM	(16)

#else

#define PXA_ISA_IRQ_NUM	(0)

#endif



#define PXA_IRQ(x)	(PXA_ISA_IRQ_NUM + (x))



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

#define IRQ_SSP3	PXA_IRQ(0)	/* SSP3 service request */
@@ -73,7 +80,7 @@ 
#define IRQ_MMC3	PXA_IRQ(55)	/* MMC3 Controller (PXA310) */

#endif



#define PXA_GPIO_IRQ_BASE	(64)

#define PXA_GPIO_IRQ_BASE	PXA_IRQ(64)

#define PXA_GPIO_IRQ_NUM	(128)



#define GPIO_2_x_TO_IRQ(x)	(PXA_GPIO_IRQ_BASE + (x))
@@ -178,13 +185,7 @@ 
#define NR_IRQS			(IRQ_S1_BVD1_STSCHG + 1)

#elif defined(CONFIG_SHARP_LOCOMO)

#define NR_IRQS			(IRQ_LOCOMO_SPI_TEND + 1)

#elif defined(CONFIG_ARCH_LUBBOCK) || \

      defined(CONFIG_MACH_LOGICPD_PXA270) || \

      defined(CONFIG_MACH_TOSA) || \

      defined(CONFIG_MACH_MAINSTONE) || \

      defined(CONFIG_MACH_PCM027) || \

      defined(CONFIG_ARCH_PXA_ESERIES) || \

      defined(CONFIG_MACH_MAGICIAN)

#elif defined(CONFIG_PXA_HAVE_BOARD_IRQS)

#define NR_IRQS			(IRQ_BOARD_END)

#elif defined(CONFIG_MACH_ZYLONITE)

#define NR_IRQS			(IRQ_BOARD_START + 32)