redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
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: Eric Miao <eric.miao@marvell.com>
This commit is contained in:
Eric Miao 2009-01-20 10:31:55 +08:00
parent 5438614509
commit b74d196908
6 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,18 +15,6 @@
#include <mach/hardware.h> #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 * Real Time Clock
*/ */

11
arch/arm/mach-pxa/include/mach/pxa2xx-regs.h
View file

@ -16,6 +16,17 @@
#include <mach/pxa-regs.h> #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 * Memory controller
*/ */

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

@ -15,6 +15,15 @@
#include <mach/hardware.h> #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) * Oscillator Configuration Register (OSCC)
*/ */

3
drivers/mtd/nand/cmx270_nand.c
View file

@ -26,8 +26,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/hardware.h> #include <mach/pxa2xx-regs.h>
#include <mach/pxa-regs.h>
#define GPIO_NAND_CS (11) #define GPIO_NAND_CS (11)
#define GPIO_NAND_RB (89) #define GPIO_NAND_RB (89)

3
drivers/pcmcia/pxa2xx_mainstone.c
View file

@ -21,11 +21,10 @@
#include <pcmcia/ss.h> #include <pcmcia/ss.h>
#include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <mach/pxa-regs.h> #include <mach/pxa2xx-regs.h>
#include <mach/mainstone.h> #include <mach/mainstone.h>
#include "soc_common.h" #include "soc_common.h"

3
drivers/pcmcia/pxa2xx_trizeps4.c
View file

@ -22,8 +22,7 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <mach/hardware.h> #include <mach/pxa2xx-regs.h>
#include <mach/pxa-regs.h>
#include <mach/trizeps4.h> #include <mach/trizeps4.h>
#include "soc_common.h" #include "soc_common.h"