Commit b74d1969 authored by Eric Miao's avatar Eric Miao
Browse files

[ARM] pxa: move pxa2xx chip selects definitions out of pxa-regs.h 



The definitions of PXA_CS<x>_PHYS are really PXA2xx specific and should
be moved out of pxa-regs.h. As an illustration, the PXA3xx static chip
selects definitions are added into pxa3xx-regs.h.

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

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

+0 −12
Original line number Diff line number Diff line
@@ -15,18 +15,6 @@ 


#include <mach/hardware.h>



/*

 * PXA Chip selects

 */



#define PXA_CS0_PHYS	0x00000000

#define PXA_CS1_PHYS	0x04000000

#define PXA_CS2_PHYS	0x08000000

#define PXA_CS3_PHYS	0x0C000000

#define PXA_CS4_PHYS	0x10000000

#define PXA_CS5_PHYS	0x14000000





/*

 * Real Time Clock

 */

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

+11 −0
Original line number Diff line number Diff line
@@ -16,6 +16,17 @@ 


#include <mach/pxa-regs.h>



/*

 * PXA Chip selects

 */



#define PXA_CS0_PHYS	0x00000000

#define PXA_CS1_PHYS	0x04000000

#define PXA_CS2_PHYS	0x08000000

#define PXA_CS3_PHYS	0x0C000000

#define PXA_CS4_PHYS	0x10000000

#define PXA_CS5_PHYS	0x14000000



/*

 * Memory controller

 */

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

+9 −0
Original line number Diff line number Diff line
@@ -15,6 +15,15 @@ 


#include <mach/hardware.h>



/*

 * Static Chip Selects

 */



#define PXA300_CS0_PHYS		(0x00000000)	/* PXA300/PXA310 _only_ */

#define PXA300_CS1_PHYS		(0x30000000)	/* PXA300/PXA310 _only_ */

#define PXA3xx_CS2_PHYS		(0x10000000)

#define PXA3xx_CS3_PHYS		(0x14000000)



/*

 * Oscillator Configuration Register (OSCC)

 */

drivers/mtd/nand/cmx270_nand.c

+1 −2
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ 
#include <asm/irq.h>

#include <asm/mach-types.h>



#include <mach/hardware.h>

#include <mach/pxa-regs.h>

#include <mach/pxa2xx-regs.h>



#define GPIO_NAND_CS	(11)

#define GPIO_NAND_RB	(89)

drivers/pcmcia/pxa2xx_mainstone.c

+1 −2
Original line number Diff line number Diff line
@@ -21,11 +21,10 @@ 


#include <pcmcia/ss.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>

#include <asm/irq.h>



#include <mach/pxa-regs.h>

#include <mach/pxa2xx-regs.h>

#include <mach/mainstone.h>



#include "soc_common.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE