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
b9487bae
Commit
b9487bae
authored
Dec 06, 2006
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sync with mainline: Clean up a bit
Clean up a bit Signed-off-by:
Tony Lindgren
<
tony@atomide.com
>
parent
b3e8d6f3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
7 deletions
+14
-7
arch/arm/kernel/vmlinux.lds.S
arch/arm/kernel/vmlinux.lds.S
+8
-0
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap1/board-sx1.c
+1
-1
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/gpmc.c
+3
-3
include/asm-arm/arch-omap/board-2430sdp.h
include/asm-arm/arch-omap/board-2430sdp.h
+2
-2
include/asm-arm/dma-mapping.h
include/asm-arm/dma-mapping.h
+0
-1
No files found.
arch/arm/kernel/vmlinux.lds.S
View file @
b9487bae
...
@@ -170,3 +170,11 @@ SECTIONS
...
@@ -170,3 +170,11 @@ SECTIONS
.
stab.indexstr
0
:
{
*(
.
stab
.
indexstr
)
}
.
stab.indexstr
0
:
{
*(
.
stab
.
indexstr
)
}
.
comment
0
:
{
*(
.
comment
)
}
.
comment
0
:
{
*(
.
comment
)
}
}
}
/*
*
These
must
never
be
empty
*
If
you
have
to
comment
these
two
assert
statements
out
,
your
*
binutils
is
too
old
(
for
other
reasons
as
well
)
*/
ASSERT
((
__proc_info_end
-
__proc_info_begin
),
"missing CPU support"
)
ASSERT
((
__arch_info_end
-
__arch_info_begin
),
"no machine record defined"
)
arch/arm/mach-omap1/board-sx1.c
View file @
b9487bae
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
* Original version : Vladimir Ananiev (Vovan888-at-gmail com)
* Original version : Vladimir Ananiev (Vovan888-at-gmail com)
*
*
* Maintainters : Vladimir Ananiev (aka Vovan888), Sergge
* Maintainters : Vladimir Ananiev (aka Vovan888), Sergge
*
oslik.ru
*
oslik.ru
*
*
* This program is free software; you can redistribute it and/or modify
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* it under the terms of the GNU General Public License version 2 as
...
...
arch/arm/mach-omap2/gpmc.c
View file @
b9487bae
...
@@ -130,7 +130,7 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit,
...
@@ -130,7 +130,7 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit,
if
(
ticks
>=
1
<<
nr_bits
)
{
if
(
ticks
>=
1
<<
nr_bits
)
{
#ifdef DEBUG
#ifdef DEBUG
printk
(
KERN_INFO
"GPMC CS%d: %-10s* %3d ns, %3d ticks >= %d
\n
"
,
printk
(
KERN_INFO
"GPMC CS%d: %-10s* %3d ns, %3d ticks >= %d
\n
"
,
cs
,
name
,
time
,
ticks
,
1
<<
nr_bits
);
cs
,
name
,
time
,
ticks
,
1
<<
nr_bits
);
#endif
#endif
return
-
1
;
return
-
1
;
}
}
...
@@ -141,7 +141,7 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit,
...
@@ -141,7 +141,7 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit,
printk
(
KERN_INFO
printk
(
KERN_INFO
"GPMC CS%d: %-10s: %3d ticks, %3lu ns (was %3i ticks) %3d ns
\n
"
,
"GPMC CS%d: %-10s: %3d ticks, %3lu ns (was %3i ticks) %3d ns
\n
"
,
cs
,
name
,
ticks
,
gpmc_get_fclk_period
()
*
ticks
/
1000
,
cs
,
name
,
ticks
,
gpmc_get_fclk_period
()
*
ticks
/
1000
,
(
l
>>
st_bit
)
&
mask
,
time
);
(
l
>>
st_bit
)
&
mask
,
time
);
#endif
#endif
l
&=
~
(
mask
<<
st_bit
);
l
&=
~
(
mask
<<
st_bit
);
l
|=
ticks
<<
st_bit
;
l
|=
ticks
<<
st_bit
;
...
@@ -211,7 +211,7 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t)
...
@@ -211,7 +211,7 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t)
if
(
l
&
(
GPMC_CONFIG1_READTYPE_SYNC
|
GPMC_CONFIG1_WRITETYPE_SYNC
))
{
if
(
l
&
(
GPMC_CONFIG1_READTYPE_SYNC
|
GPMC_CONFIG1_WRITETYPE_SYNC
))
{
#ifdef DEBUG
#ifdef DEBUG
printk
(
KERN_INFO
"GPMC CS%d CLK period is %lu ns (div %d)
\n
"
,
printk
(
KERN_INFO
"GPMC CS%d CLK period is %lu ns (div %d)
\n
"
,
cs
,
(
div
*
gpmc_get_fclk_period
())
/
1000
,
div
);
cs
,
(
div
*
gpmc_get_fclk_period
())
/
1000
,
div
);
#endif
#endif
l
&=
~
0x03
;
l
&=
~
0x03
;
l
|=
(
div
-
1
);
l
|=
(
div
-
1
);
...
...
include/asm-arm/arch-omap/board-2430sdp.h
View file @
b9487bae
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
* Hardware definitions for TI OMAP2430 SDP board.
* Hardware definitions for TI OMAP2430 SDP board.
*
*
* Based on board-h4.h by Dirk Behme <dirk.behme@de.bosch.com>
* Based on board-h4.h by Dirk Behme <dirk.behme@de.bosch.com>
*
*
* This program is free software; you can redistribute it and/or modify it
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* Free Software Foundation; either version 2 of the License, or (at your
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
#define __ASM_ARCH_OMAP_2430SDP_H
#define __ASM_ARCH_OMAP_2430SDP_H
/* Placeholder for 2430SDP specific defines */
/* Placeholder for 2430SDP specific defines */
#define OMAP24XX_ETHR_START
0x08000300
#define OMAP24XX_ETHR_START
0x08000300
#define OMAP24XX_ETHR_GPIO_IRQ 149
#define OMAP24XX_ETHR_GPIO_IRQ 149
#define SDP2430_CS0_BASE 0x04000000
#define SDP2430_CS0_BASE 0x04000000
...
...
include/asm-arm/dma-mapping.h
View file @
b9487bae
...
@@ -4,7 +4,6 @@
...
@@ -4,7 +4,6 @@
#ifdef __KERNEL__
#ifdef __KERNEL__
#include <linux/mm.h>
/* need struct page */
#include <linux/mm.h>
/* need struct page */
#include <linux/device.h>
#include <asm/scatterlist.h>
#include <asm/scatterlist.h>
...
...
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