Commit 3f30a09a authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'pxa-all' into devel 

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/corgi.c
	arch/arm/mach-pxa/include/mach/hardware.h
	arch/arm/mach-pxa/spitz.c
parents 9e165acf fda50a1c

Documentation/sound/alsa/soc/dapm.txt

+2 −10
Original line number Diff line number Diff line
@@ -135,11 +135,7 @@ when the Mic is inserted:- 


static int spitz_mic_bias(struct snd_soc_dapm_widget* w, int event)

{

	if(SND_SOC_DAPM_EVENT_ON(event))

		set_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_MIC_BIAS);

	else

		reset_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_MIC_BIAS);



	gpio_set_value(SPITZ_GPIO_MIC_BIAS, SND_SOC_DAPM_EVENT_ON(event));

	return 0;

}
@@ -269,11 +265,7 @@ powered only when the spk is in use. 
/* turn speaker amplifier on/off depending on use */

static int corgi_amp_event(struct snd_soc_dapm_widget *w, int event)

{

	if (SND_SOC_DAPM_EVENT_ON(event))

		set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_APM_ON);

	else

		reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_APM_ON);



	gpio_set_value(CORGI_GPIO_APM_ON, SND_SOC_DAPM_EVENT_ON(event));

	return 0;

}

MAINTAINERS

+7 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ M: kernel@wantstofly.org 
L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained



ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT

ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT

P:	Mike Rapoport

M:	mike@compulab.co.il

L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
@@ -629,6 +629,12 @@ M: marek.vasut@gmail.com 
W:	http://hackndev.com

S:	Maintained



ARM/PALMZ72 SUPPORT

P:     Sergey Lapin

M:     slapin@ossfans.org

W:     http://hackndev.com

S:     Maintained



ARM/PLEB SUPPORT

P:	Peter Chubb

M:	pleb@gelato.unsw.edu.au

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ config LEDS 
		   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \

		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \

		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \

		   ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \

		   ARCH_AT91 || ARCH_DAVINCI || \

		   ARCH_KS8695 || MACH_RD88F5182

	help

	  If you say Y here, the LEDs on your machine will be used

arch/arm/common/it8152.c

+3 −11
Original line number Diff line number Diff line
@@ -66,14 +66,6 @@ static void it8152_unmask_irq(unsigned int irq) 
       }

}



static inline void it8152_irq(int irq)

{

	struct irq_desc *desc;



	desc = irq_desc + irq;

	desc_handle_irq(irq, desc);

}



static struct irq_chip it8152_irq_chip = {

	.name		= "it8152",

	.ack		= it8152_mask_irq,
@@ -128,21 +120,21 @@ void it8152_irq_demux(unsigned int irq, struct irq_desc *desc) 
	       bits_pd &= ((1 << IT8152_PD_IRQ_COUNT) - 1);

	       while (bits_pd) {

		       i = __ffs(bits_pd);

		       it8152_irq(IT8152_PD_IRQ(i));

		       generic_handle_irq(IT8152_PD_IRQ(i));

		       bits_pd &= ~(1 << i);

	       }



	       bits_lp &= ((1 << IT8152_LP_IRQ_COUNT) - 1);

	       while (bits_lp) {

		       i = __ffs(bits_lp);

		       it8152_irq(IT8152_LP_IRQ(i));

		       generic_handle_irq(IT8152_LP_IRQ(i));

		       bits_lp &= ~(1 << i);

	       }



	       bits_ld &= ((1 << IT8152_LD_IRQ_COUNT) - 1);

	       while (bits_ld) {

		       i = __ffs(bits_ld);

		       it8152_irq(IT8152_LD_IRQ(i));

		       generic_handle_irq(IT8152_LD_IRQ(i));

		       bits_ld &= ~(1 << i);

	       }

       }

arch/arm/common/locomo.c

+8 −18
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ static struct locomo_dev_info locomo_devices[] = { 
static void locomo_handler(unsigned int irq, struct irq_desc *desc)

{

	int req, i;

	struct irq_desc *d;

	void __iomem *mapbase = get_irq_chip_data(irq);



	/* Acknowledge the parent IRQ */
@@ -181,10 +180,9 @@ static void locomo_handler(unsigned int irq, struct irq_desc *desc) 
	if (req) {

		/* generate the next interrupt(s) */

		irq = LOCOMO_IRQ_START;

		d = irq_desc + irq;

		for (i = 0; i <= 3; i++, d++, irq++) {

		for (i = 0; i <= 3; i++, irq++) {

			if (req & (0x0100 << i)) {

				desc_handle_irq(irq, d);

				generic_handle_irq(irq);

			}



		}
@@ -222,12 +220,10 @@ static struct irq_chip locomo_chip = { 


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

{

	struct irq_desc *d;

	void __iomem *mapbase = get_irq_chip_data(irq);



	if (locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC) & 0x0001) {

		d = irq_desc + LOCOMO_IRQ_KEY_START;

		desc_handle_irq(LOCOMO_IRQ_KEY_START, d);

		generic_handle_irq(LOCOMO_IRQ_KEY_START);

	}

}
@@ -268,7 +264,6 @@ static struct irq_chip locomo_key_chip = { 
static void locomo_gpio_handler(unsigned int irq, struct irq_desc *desc)

{

	int req, i;

	struct irq_desc *d;

	void __iomem *mapbase = get_irq_chip_data(irq);



	req = 	locomo_readl(mapbase + LOCOMO_GIR) &
@@ -277,10 +272,9 @@ static void locomo_gpio_handler(unsigned int irq, struct irq_desc *desc) 


	if (req) {

		irq = LOCOMO_IRQ_GPIO_START;

		d = irq_desc + LOCOMO_IRQ_GPIO_START;

		for (i = 0; i <= 15; i++, irq++, d++) {

		for (i = 0; i <= 15; i++, irq++) {

			if (req & (0x0001 << i)) {

				desc_handle_irq(irq, d);

				generic_handle_irq(irq);

			}

		}

	}
@@ -361,12 +355,10 @@ static struct irq_chip locomo_gpio_chip = { 


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

{

	struct irq_desc *d;

	void __iomem *mapbase = get_irq_chip_data(irq);



	if (locomo_readl(mapbase + LOCOMO_LTINT) & 0x0001) {

		d = irq_desc + LOCOMO_IRQ_LT_START;

		desc_handle_irq(LOCOMO_IRQ_LT_START, d);

		generic_handle_irq(LOCOMO_IRQ_LT_START);

	}

}
@@ -407,17 +399,15 @@ static struct irq_chip locomo_lt_chip = { 
static void locomo_spi_handler(unsigned int irq, struct irq_desc *desc)

{

	int req, i;

	struct irq_desc *d;

	void __iomem *mapbase = get_irq_chip_data(irq);



	req = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIR) & 0x000F;

	if (req) {

		irq = LOCOMO_IRQ_SPI_START;

		d = irq_desc + irq;



		for (i = 0; i <= 3; i++, irq++, d++) {

		for (i = 0; i <= 3; i++, irq++) {

			if (req & (0x0001 << i)) {

				desc_handle_irq(irq, d);

				generic_handle_irq(irq);

			}

		}

	}