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

Commit 1be518bd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'fixes-for-v4.1-rc2' of https://github.com/rjarzmik/linux into fixes 

Merged "ARM: pxa: fixes for v4.1-rc2" from Robert Jarzmik:

These fixes reenable the lubbock(pxa25x) and mainstone(pxa27x)
platforms, which were broken since the gpio handling was
converted to a driver, and the interrupt ordering broke the
external interrupts of these systems.

* tag 'fixes-for-v4.1-rc2' of https://github.com/rjarzmik/linux:
  ARM: pxa: lubbock: use new pxa_cplds driver
  ARM: pxa: mainstone: use new pxa_cplds driver
  ARM: pxa: pxa_cplds: add lubbock and mainstone IO
parents c92b83a8 fc9e38c0

arch/arm/mach-pxa/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -691,4 +691,13 @@ config SHARPSL_PM_MAX1111 
config PXA310_ULPI

	bool



config PXA_SYSTEMS_CPLDS

	tristate "Motherboard cplds"

	default ARCH_LUBBOCK || MACH_MAINSTONE

	help

	  This driver supports the Lubbock and Mainstone multifunction chip

	  found on the pxa25x development platform system (Lubbock) and pxa27x

	  development platform system (Mainstone). This IO board supports the

	  interrupts handling, ethernet controller, flash chips, etc ...



endif

arch/arm/mach-pxa/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -90,4 +90,5 @@ obj-$(CONFIG_MACH_RAUMFELD_CONNECTOR) += raumfeld.o 
obj-$(CONFIG_MACH_RAUMFELD_SPEAKER)	+= raumfeld.o

obj-$(CONFIG_MACH_ZIPIT2)	+= z2.o



obj-$(CONFIG_PXA_SYSTEMS_CPLDS)	+= pxa_cplds_irqs.o

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

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

+4 −3
Original line number Diff line number Diff line
@@ -37,7 +37,9 @@ 
#define LUB_GP			__LUB_REG(LUBBOCK_FPGA_PHYS + 0x100)



/* Board specific IRQs */

#define LUBBOCK_IRQ(x)		(IRQ_BOARD_START + (x))

#define LUBBOCK_NR_IRQS		IRQ_BOARD_START



#define LUBBOCK_IRQ(x)		(LUBBOCK_NR_IRQS + (x))

#define LUBBOCK_SD_IRQ		LUBBOCK_IRQ(0)

#define LUBBOCK_SA1111_IRQ	LUBBOCK_IRQ(1)

#define LUBBOCK_USB_IRQ		LUBBOCK_IRQ(2)  /* usb connect */
@@ -47,8 +49,7 @@ 
#define LUBBOCK_USB_DISC_IRQ	LUBBOCK_IRQ(6)  /* usb disconnect */

#define LUBBOCK_LAST_IRQ	LUBBOCK_IRQ(6)



#define LUBBOCK_SA1111_IRQ_BASE	(IRQ_BOARD_START + 16)

#define LUBBOCK_NR_IRQS		(IRQ_BOARD_START + 16 + 55)

#define LUBBOCK_SA1111_IRQ_BASE	(LUBBOCK_NR_IRQS + 32)



#ifndef __ASSEMBLY__

extern void lubbock_set_misc_wr(unsigned int mask, unsigned int set);

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

+3 −3
Original line number Diff line number Diff line
@@ -120,7 +120,9 @@ 
#define MST_PCMCIA_PWR_VCC_50   0x4	   /* voltage VCC = 5.0V */



/* board specific IRQs */

#define MAINSTONE_IRQ(x)	(IRQ_BOARD_START + (x))

#define MAINSTONE_NR_IRQS	IRQ_BOARD_START



#define MAINSTONE_IRQ(x)	(MAINSTONE_NR_IRQS + (x))

#define MAINSTONE_MMC_IRQ	MAINSTONE_IRQ(0)

#define MAINSTONE_USIM_IRQ	MAINSTONE_IRQ(1)

#define MAINSTONE_USBC_IRQ	MAINSTONE_IRQ(2)
@@ -136,6 +138,4 @@ 
#define MAINSTONE_S1_STSCHG_IRQ	MAINSTONE_IRQ(14)

#define MAINSTONE_S1_IRQ	MAINSTONE_IRQ(15)



#define MAINSTONE_NR_IRQS	(IRQ_BOARD_START + 16)



#endif

arch/arm/mach-pxa/lubbock.c

+29 −79
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 *  published by the Free Software Foundation.

 */

#include <linux/gpio.h>

#include <linux/gpio/machine.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/init.h>
@@ -123,84 +124,6 @@ void lubbock_set_misc_wr(unsigned int mask, unsigned int set) 
}

EXPORT_SYMBOL(lubbock_set_misc_wr);



static unsigned long lubbock_irq_enabled;



static void lubbock_mask_irq(struct irq_data *d)

{

	int lubbock_irq = (d->irq - LUBBOCK_IRQ(0));

	LUB_IRQ_MASK_EN = (lubbock_irq_enabled &= ~(1 << lubbock_irq));

}



static void lubbock_unmask_irq(struct irq_data *d)

{

	int lubbock_irq = (d->irq - LUBBOCK_IRQ(0));

	/* the irq can be acknowledged only if deasserted, so it's done here */

	LUB_IRQ_SET_CLR &= ~(1 << lubbock_irq);

	LUB_IRQ_MASK_EN = (lubbock_irq_enabled |= (1 << lubbock_irq));

}



static struct irq_chip lubbock_irq_chip = {

	.name		= "FPGA",

	.irq_ack	= lubbock_mask_irq,

	.irq_mask	= lubbock_mask_irq,

	.irq_unmask	= lubbock_unmask_irq,

};



static void lubbock_irq_handler(unsigned int irq, struct irq_desc *desc)

{

	unsigned long pending = LUB_IRQ_SET_CLR & lubbock_irq_enabled;

	do {

		/* clear our parent irq */

		desc->irq_data.chip->irq_ack(&desc->irq_data);

		if (likely(pending)) {

			irq = LUBBOCK_IRQ(0) + __ffs(pending);

			generic_handle_irq(irq);

		}

		pending = LUB_IRQ_SET_CLR & lubbock_irq_enabled;

	} while (pending);

}



static void __init lubbock_init_irq(void)

{

	int irq;



	pxa25x_init_irq();



	/* setup extra lubbock irqs */

	for (irq = LUBBOCK_IRQ(0); irq <= LUBBOCK_LAST_IRQ; irq++) {

		irq_set_chip_and_handler(irq, &lubbock_irq_chip,

					 handle_level_irq);

		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

	}



	irq_set_chained_handler(PXA_GPIO_TO_IRQ(0), lubbock_irq_handler);

	irq_set_irq_type(PXA_GPIO_TO_IRQ(0), IRQ_TYPE_EDGE_FALLING);

}



#ifdef CONFIG_PM



static void lubbock_irq_resume(void)

{

	LUB_IRQ_MASK_EN = lubbock_irq_enabled;

}



static struct syscore_ops lubbock_irq_syscore_ops = {

	.resume = lubbock_irq_resume,

};



static int __init lubbock_irq_device_init(void)

{

	if (machine_is_lubbock()) {

		register_syscore_ops(&lubbock_irq_syscore_ops);

		return 0;

	}

	return -ENODEV;

}



device_initcall(lubbock_irq_device_init);



#endif



static int lubbock_udc_is_connected(void)

{

	return (LUB_MISC_RD & (1 << 9)) == 0;
@@ -383,11 +306,38 @@ static struct platform_device lubbock_flash_device[2] = { 
	},

};



static struct resource lubbock_cplds_resources[] = {

	[0] = {

		.start	= LUBBOCK_FPGA_PHYS + 0xc0,

		.end	= LUBBOCK_FPGA_PHYS + 0xe0 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= PXA_GPIO_TO_IRQ(0),

		.end	= PXA_GPIO_TO_IRQ(0),

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,

	},

	[2] = {

		.start	= LUBBOCK_IRQ(0),

		.end	= LUBBOCK_IRQ(6),

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device lubbock_cplds_device = {

	.name		= "pxa_cplds_irqs",

	.id		= -1,

	.resource	= &lubbock_cplds_resources[0],

	.num_resources	= 3,

};





static struct platform_device *devices[] __initdata = {

	&sa1111_device,

	&smc91x_device,

	&lubbock_flash_device[0],

	&lubbock_flash_device[1],

	&lubbock_cplds_device,

};



static struct pxafb_mode_info sharp_lm8v31_mode = {
@@ -648,7 +598,7 @@ MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)") 
	/* Maintainer: MontaVista Software Inc. */

	.map_io		= lubbock_map_io,

	.nr_irqs	= LUBBOCK_NR_IRQS,

	.init_irq	= lubbock_init_irq,

	.init_irq	= pxa25x_init_irq,

	.handle_irq	= pxa25x_handle_irq,

	.init_time	= pxa_timer_init,

	.init_machine	= lubbock_init,