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
da7ba956
Commit
da7ba956
authored
Jan 17, 2010
by
Russell King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ARM: Integrator: fix Integrator/CP definitions, move to platform.h
Signed-off-by:
Russell King
<
rmk+kernel@arm.linux.org.uk
>
parent
861248d1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
28 deletions
+28
-28
arch/arm/mach-integrator/include/mach/platform.h
arch/arm/mach-integrator/include/mach/platform.h
+8
-6
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/integrator_ap.c
+2
-2
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-integrator/integrator_cp.c
+18
-20
No files found.
arch/arm/mach-integrator/include/mach/platform.h
View file @
da7ba956
...
...
@@ -290,12 +290,14 @@
#define INTEGRATOR_DBG_LEDS (INTEGRATOR_DBG_BASE + INTEGRATOR_DBG_LEDS_OFFSET)
#define INTEGRATOR_DBG_SWITCH (INTEGRATOR_DBG_BASE + INTEGRATOR_DBG_SWITCH_OFFSET)
#if defined(CONFIG_ARCH_INTEGRATOR_AP)
#define INTEGRATOR_GPIO_BASE 0x1B000000
/* GPIO */
#elif defined(CONFIG_ARCH_INTEGRATOR_CP)
#define INTEGRATOR_GPIO_BASE 0xC9000000
/* GPIO */
#endif
#define INTEGRATOR_AP_GPIO_BASE 0x1B000000
/* GPIO */
#define INTEGRATOR_CP_MMC_BASE 0x1C000000
/* MMC */
#define INTEGRATOR_CP_AACI_BASE 0x1D000000
/* AACI */
#define INTEGRATOR_CP_ETH_BASE 0xC8000000
/* Ethernet */
#define INTEGRATOR_CP_GPIO_BASE 0xC9000000
/* GPIO */
#define INTEGRATOR_CP_SIC_BASE 0xCA000000
/* SIC */
#define INTEGRATOR_CP_CTL_BASE 0xCB000000
/* CP system control */
/* ------------------------------------------------------------------------
* KMI keyboard/mouse definitions
...
...
arch/arm/mach-integrator/integrator_ap.c
View file @
da7ba956
...
...
@@ -118,8 +118,8 @@ static struct map_desc ap_io_desc[] __initdata = {
.
length
=
SZ_4K
,
.
type
=
MT_DEVICE
},
{
.
virtual
=
IO_ADDRESS
(
INTEGRATOR_GPIO_BASE
),
.
pfn
=
__phys_to_pfn
(
INTEGRATOR_GPIO_BASE
),
.
virtual
=
IO_ADDRESS
(
INTEGRATOR_
AP_
GPIO_BASE
),
.
pfn
=
__phys_to_pfn
(
INTEGRATOR_
AP_
GPIO_BASE
),
.
length
=
SZ_4K
,
.
type
=
MT_DEVICE
},
{
...
...
arch/arm/mach-integrator/integrator_cp.c
View file @
da7ba956
...
...
@@ -42,9 +42,6 @@
#include "common.h"
#define INTCP_PA_MMC_BASE 0x1c000000
#define INTCP_PA_AACI_BASE 0x1d000000
#define INTCP_PA_FLASH_BASE 0x24000000
#define INTCP_FLASH_SIZE SZ_32M
...
...
@@ -52,12 +49,11 @@
#define INTCP_VA_CIC_BASE IO_ADDRESS(INTEGRATOR_HDR_BASE) + 0x40
#define INTCP_VA_PIC_BASE IO_ADDRESS(INTEGRATOR_IC_BASE)
#define INTCP_VA_SIC_BASE IO_ADDRESS(
0xca000000
)
#define INTCP_VA_SIC_BASE IO_ADDRESS(
INTEGRATOR_CP_SIC_BASE
)
#define INTCP_PA_ETH_BASE 0xc8000000
#define INTCP_ETH_SIZE 0x10
#define INTCP_VA_CTRL_BASE IO_ADDRESS(
0xcb000000
)
#define INTCP_VA_CTRL_BASE IO_ADDRESS(
INTEGRATOR_CP_CTL_BASE
)
#define INTCP_FLASHPROG 0x04
#define CINTEGRATOR_FLASHPROG_FLVPPEN (1 << 0)
#define CINTEGRATOR_FLASHPROG_FLWREN (1 << 1)
...
...
@@ -72,7 +68,9 @@
* f1600000 16000000 UART 0
* f1700000 17000000 UART 1
* f1a00000 1a000000 Debug LEDs
* f1b00000 1b000000 GPIO
* fc900000 c9000000 GPIO
* fca00000 ca000000 SIC
* fcb00000 cb000000 CP system control
*/
static
struct
map_desc
intcp_io_desc
[]
__initdata
=
{
...
...
@@ -117,18 +115,18 @@ static struct map_desc intcp_io_desc[] __initdata = {
.
length
=
SZ_4K
,
.
type
=
MT_DEVICE
},
{
.
virtual
=
IO_ADDRESS
(
INTEGRATOR_GPIO_BASE
),
.
pfn
=
__phys_to_pfn
(
INTEGRATOR_GPIO_BASE
),
.
virtual
=
IO_ADDRESS
(
INTEGRATOR_
CP_
GPIO_BASE
),
.
pfn
=
__phys_to_pfn
(
INTEGRATOR_
CP_
GPIO_BASE
),
.
length
=
SZ_4K
,
.
type
=
MT_DEVICE
},
{
.
virtual
=
IO_ADDRESS
(
0xca000000
),
.
pfn
=
__phys_to_pfn
(
0xca000000
),
.
virtual
=
IO_ADDRESS
(
INTEGRATOR_CP_SIC_BASE
),
.
pfn
=
__phys_to_pfn
(
INTEGRATOR_CP_SIC_BASE
),
.
length
=
SZ_4K
,
.
type
=
MT_DEVICE
},
{
.
virtual
=
IO_ADDRESS
(
0xcb000000
),
.
pfn
=
__phys_to_pfn
(
0xcb000000
),
.
virtual
=
IO_ADDRESS
(
INTEGRATOR_CP_CTL_BASE
),
.
pfn
=
__phys_to_pfn
(
INTEGRATOR_CP_CTL_BASE
),
.
length
=
SZ_4K
,
.
type
=
MT_DEVICE
}
...
...
@@ -364,8 +362,8 @@ static struct platform_device intcp_flash_device = {
static
struct
resource
smc91x_resources
[]
=
{
[
0
]
=
{
.
start
=
INT
CP_PA
_ETH_BASE
,
.
end
=
INT
CP_PA
_ETH_BASE
+
INTCP_ETH_SIZE
-
1
,
.
start
=
INT
EGRATOR_CP
_ETH_BASE
,
.
end
=
INT
EGRATOR_CP
_ETH_BASE
+
INTCP_ETH_SIZE
-
1
,
.
flags
=
IORESOURCE_MEM
,
},
[
1
]
=
{
...
...
@@ -396,7 +394,7 @@ static struct platform_device *intcp_devs[] __initdata = {
static
unsigned
int
mmc_status
(
struct
device
*
dev
)
{
unsigned
int
status
=
readl
(
IO_ADDRESS
(
0xca000000
)
+
4
);
writel
(
8
,
IO_ADDRESS
(
0xcb000000
)
+
8
);
writel
(
8
,
IO_ADDRESS
(
INTEGRATOR_CP_CTL_BASE
)
+
8
);
return
status
&
8
;
}
...
...
@@ -414,8 +412,8 @@ static struct amba_device mmc_device = {
.
platform_data
=
&
mmc_data
,
},
.
res
=
{
.
start
=
INT
CP_PA
_MMC_BASE
,
.
end
=
INT
CP_PA
_MMC_BASE
+
SZ_4K
-
1
,
.
start
=
INT
EGRATOR_CP
_MMC_BASE
,
.
end
=
INT
EGRATOR_CP
_MMC_BASE
+
SZ_4K
-
1
,
.
flags
=
IORESOURCE_MEM
,
},
.
irq
=
{
IRQ_CP_MMCIINT0
,
IRQ_CP_MMCIINT1
},
...
...
@@ -427,8 +425,8 @@ static struct amba_device aaci_device = {
.
init_name
=
"mb:1d"
,
},
.
res
=
{
.
start
=
INT
CP_PA
_AACI_BASE
,
.
end
=
INT
CP_PA
_AACI_BASE
+
SZ_4K
-
1
,
.
start
=
INT
EGRATOR_CP
_AACI_BASE
,
.
end
=
INT
EGRATOR_CP
_AACI_BASE
+
SZ_4K
-
1
,
.
flags
=
IORESOURCE_MEM
,
},
.
irq
=
{
IRQ_CP_AACIINT
,
NO_IRQ
},
...
...
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