Skip to content

Commit

Permalink
ARM: pxa: introduce addr-map.h for large bus addresses and ranges
Browse files Browse the repository at this point in the history
Signed-off-by: Eric Miao <[email protected]>
  • Loading branch information
ericmiao committed Dec 16, 2010
1 parent ead67b6 commit 64ed267
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 20 deletions.
48 changes: 48 additions & 0 deletions arch/arm/mach-pxa/include/mach/addr-map.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#ifndef __ASM_MACH_ADDR_MAP_H
#define __ASM_MACH_ADDR_MAP_H

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

#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

/*
* Peripheral Bus
*/
#define PERIPH_PHYS 0x40000000
#define PERIPH_VIRT 0xf2000000
#define PERIPH_SIZE 0x02000000

/*
* Static Memory Controller (w/ SDRAM controls on PXA25x/PXA27x)
*/
#define PXA2XX_SMEMC_PHYS 0x48000000
#define PXA3XX_SMEMC_PHYS 0x4a000000
#define SMEMC_VIRT 0xf6000000
#define SMEMC_SIZE 0x00100000

/*
* Dynamic Memory Controller (only on PXA3xx)
*/
#define DMEMC_PHYS 0x48100000
#define DMEMC_VIRT 0xf6100000
#define DMEMC_SIZE 0x00100000

/*
* Internal Memory Controller (PXA27x and later)
*/
#define IMEMC_PHYS 0x58000000
#define IMEMC_VIRT 0xfe000000
#define IMEMC_SIZE 0x00100000

#endif /* __ASM_MACH_ADDR_MAP_H */
2 changes: 2 additions & 0 deletions arch/arm/mach-pxa/include/mach/hardware.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
#ifndef __ASM_ARCH_HARDWARE_H
#define __ASM_ARCH_HARDWARE_H

#include <mach/addr-map.h>

/*
* Workarounds for at least 2 errata so far require this.
* The mapping is set in mach-pxa/generic.c.
Expand Down
11 changes: 0 additions & 11 deletions arch/arm/mach-pxa/include/mach/pxa2xx-regs.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,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

/*
* Memory controller
*/
Expand Down
9 changes: 0 additions & 9 deletions arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,6 @@

#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)
*/
Expand Down

0 comments on commit 64ed267

Please sign in to comment.