Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
b7b23db7
Commit
b7b23db7
authored
Sep 02, 2012
by
Krzysztof Hałasa
Committed by
Jason Cooper
Nov 22, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
IXP4xx: map CPU config registers within VMALLOC region.
Signed-off-by:
Krzysztof Hałasa
<
khc@pm.waw.pl
>
parent
f0cdb153
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
38 deletions
+21
-38
arch/arm/mach-ixp4xx/common.c
arch/arm/mach-ixp4xx/common.c
+0
-8
arch/arm/mach-ixp4xx/include/mach/debug-macro.S
arch/arm/mach-ixp4xx/include/mach/debug-macro.S
+2
-2
arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
+19
-28
No files found.
arch/arm/mach-ixp4xx/common.c
View file @
b7b23db7
...
...
@@ -73,14 +73,6 @@ static struct map_desc ixp4xx_io_desc[] __initdata = {
.
length
=
IXP4XX_QMGR_REGION_SIZE
,
.
type
=
MT_DEVICE
},
#ifdef CONFIG_DEBUG_LL
{
/* Debug UART mapping */
.
virtual
=
(
unsigned
long
)
IXP4XX_DEBUG_UART_BASE_VIRT
,
.
pfn
=
__phys_to_pfn
(
IXP4XX_DEBUG_UART_BASE_PHYS
),
.
length
=
IXP4XX_DEBUG_UART_REGION_SIZE
,
.
type
=
MT_DEVICE
}
#endif
};
void
__init
ixp4xx_map_io
(
void
)
...
...
arch/arm/mach-ixp4xx/include/mach/debug-macro.S
View file @
b7b23db7
...
...
@@ -17,8 +17,8 @@
#else
mov
\
rp
,
#
0
#endif
orr
\
rv
,
\
rp
,
#
0xff
000000
@
virtual
orr
\
rv
,
\
rv
,
#
0x00
b
00000
orr
\
rv
,
\
rp
,
#
0xfe
000000
@
virtual
orr
\
rv
,
\
rv
,
#
0x00
f
00000
orr
\
rp
,
\
rp
,
#
0xc8000000
@
physical
.
endm
...
...
arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
View file @
b7b23db7
...
...
@@ -30,52 +30,43 @@
*
* 0x50000000 0x10000000 ioremap'd EXP BUS
*
* 0x
60000000 0x00004000 0xffbe7000 QMgr
* 0x
C8000000 0x00013000 0xFEF00000 On-Chip Peripherals
*
* 0xC
8000000 0x00013000 0xffbeb000 On-Chip Peripherals
* 0xC
0000000 0x00001000 0xFEF13000 PCI CFG
*
* 0xC4000000 0x00001000 0x
ffbfe
000 EXP CFG
* 0xC4000000 0x00001000 0x
FEF14
000 EXP CFG
*
* 0x
C0000000 0x00001000 0xffbff000 PCI CFG
* 0x
60000000 0x00004000 0xFEF15000 QMgr
*/
/*
* Queue Manager
*/
#define IXP4XX_QMGR_BASE_PHYS
(0x60000000)
#define IXP4XX_QMGR_BASE_VIRT IOMEM(0xF
FBE7
000)
#define IXP4XX_QMGR_REGION_SIZE
(0x00004000)
#define IXP4XX_QMGR_BASE_PHYS
0x60000000
#define IXP4XX_QMGR_BASE_VIRT IOMEM(0xF
EF15
000)
#define IXP4XX_QMGR_REGION_SIZE
0x00004000
/*
* Expansion BUS Configuration registers
* Peripheral space, including debug UART. Must be section-aligned so that
* it can be used with the low-level debug code.
*/
#define IXP4XX_
EXP_CFG_BASE_PHYS (0xC4000000)
#define IXP4XX_
EXP_CFG_BASE_VIRT IOMEM(0xFFBFE
000)
#define IXP4XX_
EXP_CFG_REGION_SIZE (0x00001000)
#define IXP4XX_
PERIPHERAL_BASE_PHYS 0xC8000000
#define IXP4XX_
PERIPHERAL_BASE_VIRT IOMEM(0xFEF00
000)
#define IXP4XX_
PERIPHERAL_REGION_SIZE 0x00013000
/*
* PCI Config registers
*/
#define IXP4XX_PCI_CFG_BASE_PHYS (0xC0000000)
#define IXP4XX_PCI_CFG_BASE_VIRT IOMEM(0xFFBFF000)
#define IXP4XX_PCI_CFG_REGION_SIZE (0x00001000)
/*
* Peripheral space
*/
#define IXP4XX_PERIPHERAL_BASE_PHYS (0xC8000000)
#define IXP4XX_PERIPHERAL_BASE_VIRT IOMEM(0xFFBEB000)
#define IXP4XX_PERIPHERAL_REGION_SIZE (0x00013000)
#define IXP4XX_PCI_CFG_BASE_PHYS 0xC0000000
#define IXP4XX_PCI_CFG_BASE_VIRT IOMEM(0xFEF13000)
#define IXP4XX_PCI_CFG_REGION_SIZE 0x00001000
/*
* Debug UART
*
* This is basically a remap of UART1 into a region that is section
* aligned so that it * can be used with the low-level debug code.
* Expansion BUS Configuration registers
*/
#define
IXP4XX_DEBUG_UART_BASE_PHYS (0xC8000000)
#define
IXP4XX_DEBUG_UART_BASE_VIRT IOMEM(0xffb00000)
#define
IXP4XX_DEBUG_UART_REGION_SIZE (0x00001000)
#define
IXP4XX_EXP_CFG_BASE_PHYS 0xC4000000
#define
IXP4XX_EXP_CFG_BASE_VIRT 0xFEF14000
#define
IXP4XX_EXP_CFG_REGION_SIZE 0x00001000
#define IXP4XX_EXP_CS0_OFFSET 0x00
#define IXP4XX_EXP_CS1_OFFSET 0x04
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment