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
2fb99976
Commit
2fb99976
authored
Mar 01, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents
3de0270b
1c97eab8
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
27 deletions
+19
-27
CREDITS
CREDITS
+15
-0
arch/arm/kernel/debug.S
arch/arm/kernel/debug.S
+0
-23
arch/arm/mach-imx/dma.c
arch/arm/mach-imx/dma.c
+2
-2
arch/arm/mach-imx/generic.c
arch/arm/mach-imx/generic.c
+2
-2
No files found.
CREDITS
View file @
2fb99976
...
@@ -805,6 +805,21 @@ S: One Dell Way
...
@@ -805,6 +805,21 @@ S: One Dell Way
S: Round Rock, TX 78682
S: Round Rock, TX 78682
S: USA
S: USA
N: Ben Dooks
E: ben-linux@fluff.org
E: ben@simtec.co.uk
W: http://www.fluff.org/ben/
W: http://www.simtec.co.uk/
D: Samsung S3C2410/S3C2440 support, general ARM support
D: Maintaining Simtec Electronics development boards
S: Simtec Electronics
S: Avondale Drive
S: Tarleton
S: Preston
S: Lancs
S: PR4 6AX
S: United Kingdom
N: John G Dorsey
N: John G Dorsey
E: john+@cs.cmu.edu
E: john+@cs.cmu.edu
D: ARM Linux ports to Assabet/Neponset, Spot
D: ARM Linux ports to Assabet/Neponset, Spot
...
...
arch/arm/kernel/debug.S
View file @
2fb99976
...
@@ -52,29 +52,6 @@
...
@@ -52,29 +52,6 @@
#include <asm/arch/debug-macro.S>
#include <asm/arch/debug-macro.S>
#endif
#endif
#if 0
//
#
elif
defined
(
CONFIG_ARCH_FTVPCI
)
.
macro
addruart
,
rx
mrc
p15
,
0
,
\
rx
,
c1
,
c0
tst
\
rx
,
#
1
@
MMU
enabled
?
movne
\
rx
,
#
0xe0000000
moveq
\
rx
,
#
0x10000000
.
endm
.
macro
senduart
,
rd
,
rx
str
\
rd
,
[
\
rx
,
#
0xc
]
.
endm
.
macro
busyuart
,
rd
,
rx
1001
:
ldr
\
rd
,
[
\
rx
,
#
0x4
]
tst
\
rd
,
#
1
<<
2
beq
1001
b
.
endm
.
macro
waituart
,
rd
,
rx
.
endm
#endif
/*
/*
*
Useful
debugging
routines
*
Useful
debugging
routines
*/
*/
...
...
arch/arm/mach-imx/dma.c
View file @
2fb99976
...
@@ -136,7 +136,7 @@ dma_err_handler(int irq, void *dev_id, struct pt_regs *regs)
...
@@ -136,7 +136,7 @@ dma_err_handler(int irq, void *dev_id, struct pt_regs *regs)
i
,
channel
->
name
);
i
,
channel
->
name
);
DBOSR
|=
(
1
<<
i
);
DBOSR
|=
(
1
<<
i
);
}
}
DISR
|
=
(
1
<<
i
);
DISR
=
(
1
<<
i
);
}
}
return
IRQ_HANDLED
;
return
IRQ_HANDLED
;
}
}
...
@@ -158,10 +158,10 @@ dma_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
...
@@ -158,10 +158,10 @@ dma_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
*/
*/
printk
(
KERN_WARNING
printk
(
KERN_WARNING
"spurious IRQ for DMA channel %d
\n
"
,
i
);
"spurious IRQ for DMA channel %d
\n
"
,
i
);
DISR
|=
(
1
<<
i
);
}
}
}
}
}
}
DISR
=
disr
;
return
IRQ_HANDLED
;
return
IRQ_HANDLED
;
}
}
...
...
arch/arm/mach-imx/generic.c
View file @
2fb99976
...
@@ -100,8 +100,8 @@ EXPORT_SYMBOL(imx_gpio_mode);
...
@@ -100,8 +100,8 @@ EXPORT_SYMBOL(imx_gpio_mode);
static
unsigned
int
imx_decode_pll
(
unsigned
int
pll
)
static
unsigned
int
imx_decode_pll
(
unsigned
int
pll
)
{
{
u32
mfi
=
(
pll
>>
10
)
&
0xf
;
u32
mfi
=
(
pll
>>
10
)
&
0xf
;
u32
mfn
=
pll
&
0x3f
;
u32
mfn
=
pll
&
0x3f
f
;
u32
mfd
=
(
pll
>>
16
)
&
0x3f
;
u32
mfd
=
(
pll
>>
16
)
&
0x3f
f
;
u32
pd
=
(
pll
>>
26
)
&
0xf
;
u32
pd
=
(
pll
>>
26
)
&
0xf
;
u32
f_ref
=
(
CSCR
&
CSCR_SYSTEM_SEL
)
?
16000000
:
(
CLK32
*
512
);
u32
f_ref
=
(
CSCR
&
CSCR_SYSTEM_SEL
)
?
16000000
:
(
CLK32
*
512
);
...
...
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