Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
a5abbbe5
Commit
a5abbbe5
authored
Nov 24, 2008
by
Hiroshi DOYU
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
omap mailbox: fix empty struct device for omap1
Signed-off-by:
Hiroshi DOYU
<
Hiroshi.DOYU@nokia.com
>
parent
d108aeb3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
15 deletions
+18
-15
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap1/devices.c
+1
-1
arch/arm/mach-omap1/mailbox.c
arch/arm/mach-omap1/mailbox.c
+17
-14
No files found.
arch/arm/mach-omap1/devices.c
View file @
a5abbbe5
...
...
@@ -85,7 +85,7 @@ static struct resource mbox_resources[] = {
};
static
struct
platform_device
mbox_device
=
{
.
name
=
"mailbox"
,
.
name
=
"
omap1-
mailbox"
,
.
id
=
-
1
,
.
num_resources
=
ARRAY_SIZE
(
mbox_resources
),
.
resource
=
mbox_resources
,
...
...
arch/arm/mach-omap1/mailbox.c
View file @
a5abbbe5
/*
* Mailbox reservation modules for DSP
*
* Copyright (C) 2006 Nokia Corporation
* Copyright (C) 2006
-2008
Nokia Corporation
* Written by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
*
* This file is subject to the terms and conditions of the GNU General Public
...
...
@@ -17,6 +17,8 @@
#include <mach/irqs.h>
#include <asm/io.h>
#define DRV_NAME "omap1-mailbox"
#define MAILBOX_ARM2DSP1 0x00
#define MAILBOX_ARM2DSP1b 0x04
#define MAILBOX_DSP2ARM1 0x08
...
...
@@ -27,7 +29,7 @@
#define MAILBOX_DSP2ARM1_Flag 0x1c
#define MAILBOX_DSP2ARM2_Flag 0x20
unsigned
long
mbox_base
;
static
void
__iomem
*
mbox_base
;
struct
omap_mbox1_fifo
{
unsigned
long
cmd
;
...
...
@@ -40,14 +42,14 @@ struct omap_mbox1_priv {
struct
omap_mbox1_fifo
rx_fifo
;
};
static
inline
int
mbox_read_reg
(
unsigned
int
reg
)
static
inline
int
mbox_read_reg
(
size_t
ofs
)
{
return
__raw_readw
(
mbox_base
+
reg
);
return
__raw_readw
(
mbox_base
+
ofs
);
}
static
inline
void
mbox_write_reg
(
u
nsigned
int
val
,
unsigned
int
reg
)
static
inline
void
mbox_write_reg
(
u
32
val
,
size_t
ofs
)
{
__raw_writew
(
val
,
mbox_base
+
reg
);
__raw_writew
(
val
,
mbox_base
+
ofs
);
}
/* msg */
...
...
@@ -143,7 +145,7 @@ struct omap_mbox mbox_dsp_info = {
};
EXPORT_SYMBOL
(
mbox_dsp_info
);
static
int
__init
omap1_mbox_probe
(
struct
platform_device
*
pdev
)
static
int
__
dev
init
omap1_mbox_probe
(
struct
platform_device
*
pdev
)
{
struct
resource
*
res
;
int
ret
=
0
;
...
...
@@ -170,12 +172,10 @@ static int __init omap1_mbox_probe(struct platform_device *pdev)
}
mbox_dsp_info
.
irq
=
res
->
start
;
ret
=
omap_mbox_register
(
&
mbox_dsp_info
);
return
ret
;
return
omap_mbox_register
(
&
pdev
->
dev
,
&
mbox_dsp_info
);
}
static
int
omap1_mbox_remove
(
struct
platform_device
*
pdev
)
static
int
__devexit
omap1_mbox_remove
(
struct
platform_device
*
pdev
)
{
omap_mbox_unregister
(
&
mbox_dsp_info
);
...
...
@@ -184,9 +184,9 @@ static int omap1_mbox_remove(struct platform_device *pdev)
static
struct
platform_driver
omap1_mbox_driver
=
{
.
probe
=
omap1_mbox_probe
,
.
remove
=
omap1_mbox_remove
,
.
remove
=
__devexit_p
(
omap1_mbox_remove
)
,
.
driver
=
{
.
name
=
"mailbox"
,
.
name
=
DRV_NAME
,
},
};
...
...
@@ -203,4 +203,7 @@ static void __exit omap1_mbox_exit(void)
module_init
(
omap1_mbox_init
);
module_exit
(
omap1_mbox_exit
);
MODULE_LICENSE
(
"GPL"
);
MODULE_LICENSE
(
"GPL v2"
);
MODULE_DESCRIPTION
(
"omap mailbox: omap1 architecture specific functions"
);
MODULE_AUTHOR
(
"Hiroshi DOYU"
<
Hiroshi
.
DOYU
@
nokia
.
com
>
);
MODULE_ALIAS
(
"platform:"
DRV_NAME
);
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