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

Commit afd2fc02 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 

Conflicts:

	arch/arm/mach-pxa/generic.c
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c
	arch/arm/mach-pxa/pxa2xx.c
	arch/arm/mach-pxa/pxa3xx.c
	arch/arm/mach-pxa/reset.c
	arch/arm/mach-pxa/spitz.c
	arch/arm/mach-pxa/tosa.c
	drivers/watchdog/sa1100_wdt.c
parents 1f4de5a0 214c6a7e

arch/arm/mach-pxa/generic.c

+10 −0
Original line number Diff line number Diff line
@@ -26,9 +26,19 @@ 
#include <asm/mach/map.h>



#include <mach/pxa-regs.h>

#include <mach/reset.h>



#include "generic.h"



void clear_reset_status(unsigned int mask)

{

	if (cpu_is_pxa2xx())

		pxa2xx_clear_reset_status(mask);



	if (cpu_is_pxa3xx())

		pxa3xx_clear_reset_status(mask);

}



/*

 * Get the clock frequency as reflected by CCCR and the turbo flag.

 * We assume these values have been applied via a fcs.

arch/arm/mach-pxa/generic.h

+8 −0
Original line number Diff line number Diff line
@@ -47,12 +47,20 @@ extern unsigned pxa27x_get_memclk_frequency_10khz(void); 
#define pxa27x_get_memclk_frequency_10khz()	(0)

#endif



#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)

extern void pxa2xx_clear_reset_status(unsigned int);

#else

static inline void pxa2xx_clear_reset_status(unsigned int mask) {}

#endif



#ifdef CONFIG_PXA3xx

extern unsigned pxa3xx_get_clk_frequency_khz(int);

extern unsigned pxa3xx_get_memclk_frequency_10khz(void);

extern void pxa3xx_clear_reset_status(unsigned int);

#else

#define pxa3xx_get_clk_frequency_khz(x)		(0)

#define pxa3xx_get_memclk_frequency_10khz()	(0)

static inline void pxa3xx_clear_reset_status(unsigned int mask) {}

#endif



extern struct sysdev_class pxa_irq_sysclass;

arch/arm/mach-pxa/include/mach/hardware.h

+0 −5
Original line number Diff line number Diff line
@@ -224,11 +224,6 @@ extern void pxa_gpio_set_value(unsigned gpio, int value); 
 */

extern unsigned int get_memclk_frequency_10khz(void);



/*

 * register GPIO as reset generator

 */

extern int init_gpio_reset(int gpio);



#endif



#if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI)

arch/arm/mach-pxa/include/mach/reset.h

0 → 100644
+18 −0
Original line number Diff line number Diff line 
#ifndef __ASM_ARCH_RESET_H

#define __ASM_ARCH_RESET_H



#define RESET_STATUS_HARDWARE	(1 << 0)	/* Hardware Reset */

#define RESET_STATUS_WATCHDOG	(1 << 1)	/* Watchdog Reset */

#define RESET_STATUS_LOWPOWER	(1 << 2)	/* Low Power/Sleep Exit */

#define RESET_STATUS_GPIO	(1 << 3)	/* GPIO Reset */

#define RESET_STATUS_ALL	(0xf)



extern unsigned int reset_status;

extern void clear_reset_status(unsigned int mask);



/*

 * register GPIO as reset generator

 */

extern int init_gpio_reset(int gpio);



#endif /* __ASM_ARCH_RESET_H */

arch/arm/mach-pxa/pxa25x.c

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <mach/pxa-regs.h>

#include <mach/pxa2xx-regs.h>

#include <mach/mfp-pxa25x.h>

#include <mach/reset.h>

#include <mach/pm.h>

#include <mach/dma.h>
@@ -348,6 +349,9 @@ static int __init pxa25x_init(void) 
		clks_register(&pxa25x_hwuart_clk, 1);



	if (cpu_is_pxa21x() || cpu_is_pxa25x()) {



		reset_status = RCSR;



		clks_register(pxa25x_clks, ARRAY_SIZE(pxa25x_clks));



		if ((ret = pxa_init_dma(16)))