A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-11-09 12:24:07 -05:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
From Haojian Zhuang <[email protected]>:

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: Arnd Bergmann <[email protected]>
This commit is contained in:
Arnd Bergmann 2012-08-20 08:01:03 +02:00
commit 5cbee140a2
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
View file

@ -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 */

2
arch/arm/mach-pxa/pxa3xx.c
View file

@ -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 */

4
drivers/mtd/nand/pxa3xx_nand.c
View file

@ -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;
}