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

Commit 3e318b5b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] Fix shared mmap when more than two maps of the same file exist
  [ARM] fix VIPT/VIVT macro optimisations, add comments
  [ARM] 5179/1: Replace obsolete IRQT_* and __IRQT_* values with IRQ_TYPE_*
  [ARM] update defconfig for eseries.
  [ARM] PXA: squash warning in pxafb
  [ARM] pxa: PXA25x UDC - Fix warning during build
  [ARM] fix nwflash.c: 6ee8928d
  [ARM] fix IOP32x, IOP33x, MXC and Samsung builds
  [ARM] pci: provide dummy pci_get_legacy_ide_irq()
  [ARM] fix fls() for 64-bit arguments
  [ARM] fix mode for board-yl-9200.c
  [ARM] 5176/1: arm/Makefile: fix: ARM946T -> ARM946E
parents 940389b8 53cdb27a

Documentation/arm/Interrupts

+2 −8
Original line number Diff line number Diff line
@@ -138,14 +138,8 @@ So, what's changed? 


                Set active the IRQ edge(s)/level.  This replaces the

                SA1111 INTPOL manipulation, and the set_GPIO_IRQ_edge()

                function.  Type should be one of the following:



                #define IRQT_NOEDGE     (0)

                #define IRQT_RISING     (__IRQT_RISEDGE)

                #define IRQT_FALLING    (__IRQT_FALEDGE)

                #define IRQT_BOTHEDGE   (__IRQT_RISEDGE|__IRQT_FALEDGE)

                #define IRQT_LOW        (__IRQT_LOWLVL)

                #define IRQT_HIGH       (__IRQT_HIGHLVL)

                function.  Type should be one of IRQ_TYPE_xxx defined in

		<linux/irq.h>



3. set_GPIO_IRQ_edge() is obsolete, and should be replaced by set_irq_type.

arch/arm/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ config ARCH_IOP32X 
	select PLAT_IOP

	select PCI

	select GENERIC_GPIO

	select HAVE_GPIO_LIB

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for Intel's 80219 and IOP32X (XScale) family of

	  processors.
@@ -325,7 +325,7 @@ config ARCH_IOP33X 
	select PLAT_IOP

	select PCI

	select GENERIC_GPIO

	select HAVE_GPIO_LIB

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for Intel's IOP33X (XScale) family of processors.
@@ -418,7 +418,7 @@ config ARCH_MXC 
	select GENERIC_CLOCKEVENTS

	select ARCH_MTD_XIP

	select GENERIC_GPIO

	select HAVE_GPIO_LIB

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for Freescale MXC/iMX-based family of processors

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ tune-$(CONFIG_CPU_ARM720T) :=-mtune=arm7tdmi 
tune-$(CONFIG_CPU_ARM740T)	:=-mtune=arm7tdmi

tune-$(CONFIG_CPU_ARM9TDMI)	:=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM940T)	:=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM946T)	:=$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi)

tune-$(CONFIG_CPU_ARM946E)	:=$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi)

tune-$(CONFIG_CPU_ARM920T)	:=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM922T)	:=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM925T)	:=-mtune=arm9tdmi

arch/arm/common/locomo.c

+5 −5
Original line number Diff line number Diff line
@@ -331,17 +331,17 @@ static int locomo_gpio_type(unsigned int irq, unsigned int type) 


	mask = 1 << (irq - LOCOMO_IRQ_GPIO_START);



	if (type == IRQT_PROBE) {

	if (type == IRQ_TYPE_PROBE) {

		if ((GPIO_IRQ_rising_edge | GPIO_IRQ_falling_edge) & mask)

			return 0;

		type = __IRQT_RISEDGE | __IRQT_FALEDGE;

		type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;

	}



	if (type & __IRQT_RISEDGE)

	if (type & IRQ_TYPE_EDGE_RISING)

		GPIO_IRQ_rising_edge |= mask;

	else

		GPIO_IRQ_rising_edge &= ~mask;

	if (type & __IRQT_FALEDGE)

	if (type & IRQ_TYPE_EDGE_FALLING)

		GPIO_IRQ_falling_edge |= mask;

	else

		GPIO_IRQ_falling_edge &= ~mask;
@@ -473,7 +473,7 @@ static void locomo_setup_irq(struct locomo *lchip) 
	/*

	 * Install handler for IRQ_LOCOMO_HW.

	 */

	set_irq_type(lchip->irq, IRQT_FALLING);

	set_irq_type(lchip->irq, IRQ_TYPE_EDGE_FALLING);

	set_irq_chip_data(lchip->irq, irqbase);

	set_irq_chained_handler(lchip->irq, locomo_handler);

arch/arm/common/sa1111.c

+7 −7
Original line number Diff line number Diff line
@@ -241,14 +241,14 @@ static int sa1111_type_lowirq(unsigned int irq, unsigned int flags) 
	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned long ip0;



	if (flags == IRQT_PROBE)

	if (flags == IRQ_TYPE_PROBE)

		return 0;



	if ((!(flags & __IRQT_RISEDGE) ^ !(flags & __IRQT_FALEDGE)) == 0)

	if ((!(flags & IRQ_TYPE_EDGE_RISING) ^ !(flags & IRQ_TYPE_EDGE_FALLING)) == 0)

		return -EINVAL;



	ip0 = sa1111_readl(mapbase + SA1111_INTPOL0);

	if (flags & __IRQT_RISEDGE)

	if (flags & IRQ_TYPE_EDGE_RISING)

		ip0 &= ~mask;

	else

		ip0 |= mask;
@@ -338,14 +338,14 @@ static int sa1111_type_highirq(unsigned int irq, unsigned int flags) 
	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned long ip1;



	if (flags == IRQT_PROBE)

	if (flags == IRQ_TYPE_PROBE)

		return 0;



	if ((!(flags & __IRQT_RISEDGE) ^ !(flags & __IRQT_FALEDGE)) == 0)

	if ((!(flags & IRQ_TYPE_EDGE_RISING) ^ !(flags & IRQ_TYPE_EDGE_FALLING)) == 0)

		return -EINVAL;



	ip1 = sa1111_readl(mapbase + SA1111_INTPOL1);

	if (flags & __IRQT_RISEDGE)

	if (flags & IRQ_TYPE_EDGE_RISING)

		ip1 &= ~mask;

	else

		ip1 |= mask;
@@ -427,7 +427,7 @@ static void sa1111_setup_irq(struct sa1111 *sachip) 
	/*

	 * Register SA1111 interrupt

	 */

	set_irq_type(sachip->irq, IRQT_RISING);

	set_irq_type(sachip->irq, IRQ_TYPE_EDGE_RISING);

	set_irq_data(sachip->irq, irqbase);

	set_irq_chained_handler(sachip->irq, sa1111_irq_handler);

}