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

Commit 07315445 authored by Russell King's avatar Russell King
Browse files

Merge branch 'devel' of... 

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
parents c76d292d ea0c4f3c

arch/arm/common/sa1111.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static int sa1111_retrigger_lowirq(struct irq_data *d) 
	for (i = 0; i < 8; i++) {

		sa1111_writel(ip0 ^ mask, mapbase + SA1111_INTPOL0);

		sa1111_writel(ip0, mapbase + SA1111_INTPOL0);

		if (sa1111_readl(mapbase + SA1111_INTSTATCLR1) & mask)

		if (sa1111_readl(mapbase + SA1111_INTSTATCLR0) & mask)

			break;

	}

arch/arm/mach-mmp/include/mach/mfp-mmp2.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#define MFP_DRIVE_VERY_SLOW	(0x0 << 13)

#define MFP_DRIVE_SLOW		(0x2 << 13)

#define MFP_DRIVE_MEDIUM	(0x4 << 13)

#define MFP_DRIVE_FAST		(0x8 << 13)

#define MFP_DRIVE_FAST		(0x6 << 13)



/* GPIO */

#define GPIO0_GPIO	MFP_CFG(GPIO0, AF0)

arch/arm/mach-mmp/include/mach/mfp-pxa910.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#define MFP_DRIVE_VERY_SLOW	(0x0 << 13)

#define MFP_DRIVE_SLOW		(0x2 << 13)

#define MFP_DRIVE_MEDIUM	(0x4 << 13)

#define MFP_DRIVE_FAST		(0x8 << 13)

#define MFP_DRIVE_FAST		(0x6 << 13)



/* UART2 */

#define GPIO47_UART2_RXD	MFP_CFG(GPIO47, AF6)

arch/arm/mach-pxa/clock-pxa3xx.c

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ static unsigned long clk_pxa3xx_smemc_getrate(struct clk *clk) 
{

	unsigned long acsr = ACSR;

	unsigned long memclkcfg = __raw_readl(MEMCLKCFG);

	unsigned int smcfs = (acsr >> 23) & 0x7;



	return BASE_CLK * smcfs_mult[(acsr >> 23) & 0x7] /

			df_clkdiv[(memclkcfg >> 16) & 0x3];

arch/arm/mach-pxa/irq.c

+18 −31
Original line number Diff line number Diff line
@@ -53,6 +53,17 @@ static inline int cpu_has_ipr(void) 
	return !cpu_is_pxa25x();

}



static inline void __iomem *irq_base(int i)

{

	static unsigned long phys_base[] = {

		0x40d00000,

		0x40d0009c,

		0x40d00130,

	};



	return (void __iomem *)io_p2v(phys_base[i]);

}



static void pxa_mask_irq(struct irq_data *d)

{

	void __iomem *base = irq_data_get_irq_chip_data(d);
@@ -108,25 +119,11 @@ static void pxa_ack_low_gpio(struct irq_data *d) 
	GEDR0 = (1 << (d->irq - IRQ_GPIO0));

}



static void pxa_mask_low_gpio(struct irq_data *d)

{

	struct irq_desc *desc = irq_to_desc(d->irq);



	desc->irq_data.chip->irq_mask(d);

}



static void pxa_unmask_low_gpio(struct irq_data *d)

{

	struct irq_desc *desc = irq_to_desc(d->irq);



	desc->irq_data.chip->irq_unmask(d);

}



static struct irq_chip pxa_low_gpio_chip = {

	.name		= "GPIO-l",

	.irq_ack	= pxa_ack_low_gpio,

	.irq_mask	= pxa_mask_low_gpio,

	.irq_unmask	= pxa_unmask_low_gpio,

	.irq_mask	= pxa_mask_irq,

	.irq_unmask	= pxa_unmask_irq,

	.irq_set_type	= pxa_set_low_gpio_type,

};
@@ -141,6 +138,7 @@ static void __init pxa_init_low_gpio_irq(set_wake_t fn) 


	for (irq = IRQ_GPIO0; irq <= IRQ_GPIO1; irq++) {

		set_irq_chip(irq, &pxa_low_gpio_chip);

		set_irq_chip_data(irq, irq_base(0));

		set_irq_handler(irq, handle_edge_irq);

		set_irq_flags(irq, IRQF_VALID);

	}
@@ -148,17 +146,6 @@ static void __init pxa_init_low_gpio_irq(set_wake_t fn) 
	pxa_low_gpio_chip.irq_set_wake = fn;

}



static inline void __iomem *irq_base(int i)

{

	static unsigned long phys_base[] = {

		0x40d00000,

		0x40d0009c,

		0x40d00130,

	};



	return (void __iomem *)io_p2v(phys_base[i >> 5]);

}



void __init pxa_init_irq(int irq_nr, set_wake_t fn)

{

	int irq, i, n;
@@ -168,7 +155,7 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn) 
	pxa_internal_irq_nr = irq_nr;



	for (n = 0; n < irq_nr; n += 32) {

		void __iomem *base = irq_base(n);

		void __iomem *base = irq_base(n >> 5);



		__raw_writel(0, base + ICMR);	/* disable all IRQs */

		__raw_writel(0, base + ICLR);	/* all IRQs are IRQ, not FIQ */
@@ -200,7 +187,7 @@ static int pxa_irq_suspend(struct sys_device *dev, pm_message_t state) 
{

	int i;



	for (i = 0; i < pxa_internal_irq_nr; i += 32) {

	for (i = 0; i < pxa_internal_irq_nr / 32; i++) {

		void __iomem *base = irq_base(i);



		saved_icmr[i] = __raw_readl(base + ICMR);
@@ -219,14 +206,14 @@ static int pxa_irq_resume(struct sys_device *dev) 
{

	int i;



	for (i = 0; i < pxa_internal_irq_nr; i += 32) {

	for (i = 0; i < pxa_internal_irq_nr / 32; i++) {

		void __iomem *base = irq_base(i);



		__raw_writel(saved_icmr[i], base + ICMR);

		__raw_writel(0, base + ICLR);

	}



	if (!cpu_is_pxa25x())

	if (cpu_has_ipr())

		for (i = 0; i < pxa_internal_irq_nr; i++)

			__raw_writel(saved_ipr[i], IRQ_BASE + IPR(i));