Commit 04fef228 authored by Eric Miao's avatar Eric Miao
Browse files

[ARM] pxa: introduce reset_status and clear_reset_status for driver's usage 



Due to the problem of reset status bits being handled by different
registers between pxa2xx and pxa3xx, introduce a global reset_status
variable, initialized by SoC-specific code and later being used by
other drivers.

And also introduce clear_reset_status(), which is used to clear the
corresponding status bits. Pass RESET_STATUS_ALL to clear all bits.

Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent ab277121

arch/arm/mach-pxa/generic.c

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

#include <asm/mach/map.h>





#include <asm/arch/pxa-regs.h>

#include <asm/arch/pxa-regs.h>

#include <asm/arch/reset.h>





#include "generic.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.

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

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

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

arch/arm/mach-pxa/generic.h

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

#define pxa27x_get_memclk_frequency_10khz()	(0)

#endif

#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

#ifdef CONFIG_PXA3xx

extern unsigned pxa3xx_get_clk_frequency_khz(int);

extern unsigned pxa3xx_get_clk_frequency_khz(int);

extern unsigned pxa3xx_get_memclk_frequency_10khz(void);

extern unsigned pxa3xx_get_memclk_frequency_10khz(void);

extern void pxa3xx_clear_reset_status(unsigned int);

#else

#else

#define pxa3xx_get_clk_frequency_khz(x)		(0)

#define pxa3xx_get_clk_frequency_khz(x)		(0)

#define pxa3xx_get_memclk_frequency_10khz()	(0)

#define pxa3xx_get_memclk_frequency_10khz()	(0)

static inline void pxa3xx_clear_reset_status(unsigned int mask) {}

#endif

#endif





extern struct sysdev_class pxa_irq_sysclass;

extern struct sysdev_class pxa_irq_sysclass;

arch/arm/mach-pxa/pxa25x.c

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

#include <asm/arch/pxa-regs.h>

#include <asm/arch/pxa2xx-regs.h>

#include <asm/arch/pxa2xx-regs.h>

#include <asm/arch/mfp-pxa25x.h>

#include <asm/arch/mfp-pxa25x.h>

#include <asm/arch/reset.h>

#include <asm/arch/pm.h>

#include <asm/arch/pm.h>

#include <asm/arch/dma.h>

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

		clks_register(&pxa25x_hwuart_clk, 1);





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

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



		reset_status = RCSR;



		clks_register(pxa25x_clks, ARRAY_SIZE(pxa25x_clks));

		clks_register(pxa25x_clks, ARRAY_SIZE(pxa25x_clks));





		if ((ret = pxa_init_dma(16)))

		if ((ret = pxa_init_dma(16)))

arch/arm/mach-pxa/pxa27x.c

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

#include <asm/arch/pxa-regs.h>

#include <asm/arch/pxa2xx-regs.h>

#include <asm/arch/pxa2xx-regs.h>

#include <asm/arch/mfp-pxa27x.h>

#include <asm/arch/mfp-pxa27x.h>

#include <asm/arch/reset.h>

#include <asm/arch/ohci.h>

#include <asm/arch/ohci.h>

#include <asm/arch/pm.h>

#include <asm/arch/pm.h>

#include <asm/arch/dma.h>

#include <asm/arch/dma.h>
@@ -384,6 +385,9 @@ static int __init pxa27x_init(void) 
	int i, ret = 0;

	int i, ret = 0;





	if (cpu_is_pxa27x()) {

	if (cpu_is_pxa27x()) {



		reset_status = RCSR;



		clks_register(pxa27x_clks, ARRAY_SIZE(pxa27x_clks));

		clks_register(pxa27x_clks, ARRAY_SIZE(pxa27x_clks));





		if ((ret = pxa_init_dma(32)))

		if ((ret = pxa_init_dma(32)))

arch/arm/mach-pxa/pxa2xx.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -14,10 +14,19 @@ 
#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/device.h>

#include <linux/device.h>





#include <asm/hardware.h>

#include <asm/arch/pxa2xx-regs.h>

#include <asm/arch/mfp-pxa2xx.h>

#include <asm/arch/mfp-pxa2xx.h>

#include <asm/arch/mfp-pxa25x.h>

#include <asm/arch/mfp-pxa25x.h>

#include <asm/arch/reset.h>

#include <asm/arch/irda.h>

#include <asm/arch/irda.h>





void pxa2xx_clear_reset_status(unsigned int mask)

{

	/* RESET_STATUS_* has a 1:1 mapping with RCSR */

	RCSR = mask;

}



static unsigned long pxa2xx_mfp_fir[] = {

static unsigned long pxa2xx_mfp_fir[] = {

	GPIO46_FICP_RXD,

	GPIO46_FICP_RXD,

	GPIO47_FICP_TXD,

	GPIO47_FICP_TXD,

CRA Git | Maintained and supported by SUSTech CRA and CCSE