Commit 5cbee140 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt 

From Haojian Zhuang <haojian.zhuang@gmail.com>:

Three more patches for the pxa/dt branch. Since they're depending
on existing patch on pxa/dt branch, I didn't do rebase on v3.6-rc2

* 'dt' of git://github.com/hzhuang1/linux

:
  ARM: pxa: fix build issue while CONFIG_OF is disabled
  mtd: nand: append missing parameter and value
  ARM: pxa: append the definition of CKENC

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 71f8e5b2 e6c509c8

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

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ 
#define AICSR		__REG(0x41340008)	/* Application Subsystem Interrupt Control/Status Register */

#define CKENA		__REG(0x4134000C)	/* A Clock Enable Register */

#define CKENB		__REG(0x41340010)	/* B Clock Enable Register */

#define CKENC		__REG(0x41340024)	/* C Clock Enable Register */

#define AC97_DIV	__REG(0x41340014)	/* AC97 clock divisor value register */



#define ACCR_XPDIS		(1 << 31)	/* Core PLL Output Disable */

arch/arm/mach-pxa/pxa3xx.c

+2 −0
Original line number Diff line number Diff line
@@ -402,11 +402,13 @@ void __init pxa3xx_init_irq(void) 
	pxa_init_irq(56, pxa3xx_set_wake);

}



#ifdef CONFIG_OF

void __init pxa3xx_dt_init_irq(void)

{

	__pxa3xx_init_irq();

	pxa_dt_irq_init(pxa3xx_set_wake);

}

#endif	/* CONFIG_OF */



static struct map_desc pxa3xx_io_desc[] __initdata = {

	{	/* Mem Ctl */

drivers/mtd/nand/pxa3xx_nand.c

+2 −2
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ static int alloc_nand_resource(struct platform_device *pdev) 
	struct pxa3xx_nand_platform_data *pdata;

	struct pxa3xx_nand_info *info;

	struct pxa3xx_nand_host *host;

	struct nand_chip *chip;

	struct nand_chip *chip = NULL;

	struct mtd_info *mtd;

	struct resource *r;

	int ret, irq, cs;
@@ -1244,7 +1244,7 @@ static int pxa3xx_nand_probe_dt(struct platform_device *pdev) 
	return 0;

}

#else

static inline int pxa3xx_nand_probe_dt(struct platform_device *)

static inline int pxa3xx_nand_probe_dt(struct platform_device *pdev)

{

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE