Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
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-2.6.23
Commits
d846a92e
Commit
d846a92e
authored
Oct 18, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/rmk/linux-2.6-arm
parents
ace7c769
251b928c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
8 deletions
+12
-8
arch/arm/mach-s3c2410/clock.c
arch/arm/mach-s3c2410/clock.c
+4
-1
include/asm-arm/arch-ixp4xx/entry-macro.S
include/asm-arm/arch-ixp4xx/entry-macro.S
+5
-4
include/asm-arm/arch-ixp4xx/hardware.h
include/asm-arm/arch-ixp4xx/hardware.h
+1
-1
include/asm-arm/locks.h
include/asm-arm/locks.h
+2
-2
No files found.
arch/arm/mach-s3c2410/clock.c
View file @
d846a92e
...
...
@@ -98,7 +98,10 @@ struct clk *clk_get(struct device *dev, const char *id)
struct
clk
*
clk
=
ERR_PTR
(
-
ENOENT
);
int
idno
;
idno
=
(
dev
==
NULL
)
?
-
1
:
to_platform_device
(
dev
)
->
id
;
if
(
dev
==
NULL
||
dev
->
bus
!=
&
platform_bus_type
)
idno
=
-
1
;
else
idno
=
to_platform_device
(
dev
)
->
id
;
down
(
&
clocks_sem
);
...
...
include/asm-arm/arch-ixp4xx/entry-macro.S
View file @
d846a92e
...
...
@@ -15,25 +15,26 @@
ldr
\
irqstat
,
=(
IXP4XX_INTC_BASE_VIRT
+
IXP4XX_ICIP_OFFSET
)
ldr
\
irqstat
,
[
\
irqstat
]
@
get
interrupts
cmp
\
irqstat
,
#
0
beq
1001
f
beq
1001
f
@
upper
IRQ
?
clz
\
irqnr
,
\
irqstat
mov
\
base
,
#
31
subs
\
irqnr
,
\
base
,
\
irqnr
sub
\
irqnr
,
\
base
,
\
irqnr
b
1002
f
@
lower
IRQ
being
@
handled
1001
:
/
*
*
IXP465
has
an
upper
IRQ
status
register
*/
#if defined(CONFIG_CPU_IXP46X)
bne
1002
f
ldr
\
irqstat
,
=(
IXP4XX_INTC_BASE_VIRT
+
IXP4XX_ICIP2_OFFSET
)
ldr
\
irqstat
,
[
\
irqstat
]
@
get
upper
interrupts
mov
\
irqnr
,
#
63
clz
\
irqstat
,
\
irqstat
cmp
\
irqstat
,
#
32
subne
\
irqnr
,
\
irqnr
,
\
irqstat
1002
:
#endif
1002
:
.
endm
include/asm-arm/arch-ixp4xx/hardware.h
View file @
d846a92e
...
...
@@ -27,7 +27,7 @@
#define pcibios_assign_all_busses() 1
#if defined(CONFIG_CPU_IXP46
5
) && !defined(__ASSEMBLY__)
#if defined(CONFIG_CPU_IXP46
X
) && !defined(__ASSEMBLY__)
extern
unsigned
int
processor_id
;
#define cpu_is_ixp465() ((processor_id & 0xffffffc0) == 0x69054200)
#else
...
...
include/asm-arm/locks.h
View file @
d846a92e
...
...
@@ -103,7 +103,7 @@
({ \
smp_mb(); \
__asm__ __volatile__( \
"@ up_op_
read
\n" \
"@ up_op_
write
\n" \
"1: ldrex lr, [%0]\n" \
" adds lr, lr, %1\n" \
" strex ip, lr, [%0]\n" \
...
...
@@ -231,7 +231,7 @@
#define __up_op_write(ptr,wake) \
({ \
__asm__ __volatile__( \
"@ up_op_
read
\n" \
"@ up_op_
write
\n" \
" mrs ip, cpsr\n" \
" orr lr, ip, #128\n" \
" msr cpsr_c, lr\n" \
...
...
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