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

Commit 1385a7ae 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] AACI: timeout will reach -1
  [ARM] Storage class should be before const qualifier
  [ARM] pxa: stop and disable IRQ for each DMA channels at startup
  [ARM] pxa: make more SSCR0 bit definitions visible on multiple processors
  [ARM] pxa: fix missing of __REG() definition for ac97 registers access
  [ARM] pxa: fix NAND and MMC clock initialization for pxa3xx
parents 1db8508c f6f35bbe

arch/arm/kernel/machine_kexec.c

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
#include <asm/cacheflush.h>

#include <asm/mach-types.h>



const extern unsigned char relocate_new_kernel[];

const extern unsigned int relocate_new_kernel_size;

extern const unsigned char relocate_new_kernel[];

extern const unsigned int relocate_new_kernel_size;



extern void setup_mm_for_reboot(char mode);

arch/arm/mach-pxa/dma.c

+10 −8
Original line number Diff line number Diff line
@@ -121,20 +121,22 @@ int __init pxa_init_dma(int num_ch) 
	if (dma_channels == NULL)

		return -ENOMEM;



	ret = request_irq(IRQ_DMA, dma_irq_handler, IRQF_DISABLED, "DMA", NULL);

	if (ret) {

		printk (KERN_CRIT "Wow!  Can't register IRQ for DMA\n");

		kfree(dma_channels);

		return ret;

	}



	/* dma channel priorities on pxa2xx processors:

	 * ch 0 - 3,  16 - 19  <--> (0) DMA_PRIO_HIGH

	 * ch 4 - 7,  20 - 23  <--> (1) DMA_PRIO_MEDIUM

	 * ch 8 - 15, 24 - 31  <--> (2) DMA_PRIO_LOW

	 */

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

	for (i = 0; i < num_ch; i++) {

		DCSR(i) = 0;

		dma_channels[i].prio = min((i & 0xf) >> 2, DMA_PRIO_LOW);

	}



	ret = request_irq(IRQ_DMA, dma_irq_handler, IRQF_DISABLED, "DMA", NULL);

	if (ret) {

		printk (KERN_CRIT "Wow!  Can't register IRQ for DMA\n");

		kfree(dma_channels);

		return ret;

	}



	num_dma_channels = num_ch;

	return 0;

arch/arm/mach-pxa/include/mach/regs-ac97.h

+2 −0
Original line number Diff line number Diff line 
#ifndef __ASM_ARCH_REGS_AC97_H

#define __ASM_ARCH_REGS_AC97_H



#include <mach/hardware.h>



/*

 * AC97 Controller registers

 */

arch/arm/mach-pxa/include/mach/regs-ssp.h

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ 
#elif defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)

#define SSCR0_SCR	(0x000fff00)	/* Serial Clock Rate (mask) */

#define SSCR0_SerClkDiv(x) (((x) - 1) << 8) /* Divisor [1..4096] */

#endif



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

#define SSCR0_EDSS	(1 << 20)	/* Extended data size select */

#define SSCR0_NCS	(1 << 21)	/* Network clock select */

#define SSCR0_RIM	(1 << 22)	/* Receive FIFO overrrun interrupt mask */

arch/arm/mach-pxa/pxa300.c

+2 −2
Original line number Diff line number Diff line
@@ -88,13 +88,13 @@ static struct pxa3xx_mfp_addr_map pxa310_mfp_addr_map[] __initdata = { 
static DEFINE_PXA3_CKEN(common_nand, NAND, 156000000, 0);



static struct clk_lookup common_clkregs[] = {

	INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", "NANDCLK"),

	INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", NULL),

};



static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0);



static struct clk_lookup pxa310_clkregs[] = {

	INIT_CLKREG(&clk_pxa310_mmc3, "pxa2xx-mci.2", "MMCCLK"),

	INIT_CLKREG(&clk_pxa310_mmc3, "pxa2xx-mci.2", NULL),

};



static int __init pxa300_init(void)