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
45ff6fa1
Commit
45ff6fa1
authored
Nov 09, 2011
by
Olof Johansson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'imx/compile-fixes' of
git://git.linaro.org/people/shawnguo/linux-2.6
into fixes
parents
22d38323
15394cad
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
12 deletions
+6
-12
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/clock-mx51-mx53.c
+2
-0
arch/arm/plat-mxc/avic.c
arch/arm/plat-mxc/avic.c
+1
-0
arch/arm/plat-mxc/gic.c
arch/arm/plat-mxc/gic.c
+2
-9
arch/arm/plat-mxc/include/mach/entry-macro.S
arch/arm/plat-mxc/include/mach/entry-macro.S
+0
-3
arch/arm/plat-mxc/tzic.c
arch/arm/plat-mxc/tzic.c
+1
-0
No files found.
arch/arm/mach-mx5/clock-mx51-mx53.c
View file @
45ff6fa1
...
@@ -1634,6 +1634,7 @@ int __init mx53_clocks_init(unsigned long ckil, unsigned long osc,
...
@@ -1634,6 +1634,7 @@ int __init mx53_clocks_init(unsigned long ckil, unsigned long osc,
return
0
;
return
0
;
}
}
#ifdef CONFIG_OF
static
void
__init
clk_get_freq_dt
(
unsigned
long
*
ckil
,
unsigned
long
*
osc
,
static
void
__init
clk_get_freq_dt
(
unsigned
long
*
ckil
,
unsigned
long
*
osc
,
unsigned
long
*
ckih1
,
unsigned
long
*
ckih2
)
unsigned
long
*
ckih1
,
unsigned
long
*
ckih2
)
{
{
...
@@ -1671,3 +1672,4 @@ int __init mx53_clocks_init_dt(void)
...
@@ -1671,3 +1672,4 @@ int __init mx53_clocks_init_dt(void)
clk_get_freq_dt
(
&
ckil
,
&
osc
,
&
ckih1
,
&
ckih2
);
clk_get_freq_dt
(
&
ckil
,
&
osc
,
&
ckih1
,
&
ckih2
);
return
mx53_clocks_init
(
ckil
,
osc
,
ckih1
,
ckih2
);
return
mx53_clocks_init
(
ckil
,
osc
,
ckih1
,
ckih2
);
}
}
#endif
arch/arm/plat-mxc/avic.c
View file @
45ff6fa1
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
#include <linux/io.h>
#include <linux/io.h>
#include <mach/common.h>
#include <mach/common.h>
#include <asm/mach/irq.h>
#include <asm/mach/irq.h>
#include <asm/exception.h>
#include <mach/hardware.h>
#include <mach/hardware.h>
#include "irq-common.h"
#include "irq-common.h"
...
...
arch/arm/plat-mxc/gic.c
View file @
45ff6fa1
...
@@ -28,21 +28,14 @@ asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)
...
@@ -28,21 +28,14 @@ asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)
if
(
irqnr
==
1023
)
if
(
irqnr
==
1023
)
break
;
break
;
if
(
irqnr
>
29
&&
irqnr
<
1021
)
if
(
irqnr
>
15
&&
irqnr
<
1021
)
handle_IRQ
(
irqnr
,
regs
);
handle_IRQ
(
irqnr
,
regs
);
#ifdef CONFIG_SMP
#ifdef CONFIG_SMP
else
if
(
irqnr
<
16
)
{
else
{
writel_relaxed
(
irqstat
,
gic_cpu_base_addr
+
writel_relaxed
(
irqstat
,
gic_cpu_base_addr
+
GIC_CPU_EOI
);
GIC_CPU_EOI
);
handle_IPI
(
irqnr
,
regs
);
handle_IPI
(
irqnr
,
regs
);
}
}
#endif
#ifdef CONFIG_LOCAL_TIMERS
else
if
(
irqnr
==
29
)
{
writel_relaxed
(
irqstat
,
gic_cpu_base_addr
+
GIC_CPU_EOI
);
handle_local_timer
(
regs
);
}
#endif
#endif
}
while
(
1
);
}
while
(
1
);
}
}
arch/arm/plat-mxc/include/mach/entry-macro.S
View file @
45ff6fa1
...
@@ -25,6 +25,3 @@
...
@@ -25,6 +25,3 @@
.
macro
test_for_ipi
,
irqnr
,
irqstat
,
base
,
tmp
.
macro
test_for_ipi
,
irqnr
,
irqstat
,
base
,
tmp
.
endm
.
endm
.
macro
test_for_ltirq
,
irqnr
,
irqstat
,
base
,
tmp
.
endm
arch/arm/plat-mxc/tzic.c
View file @
45ff6fa1
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
#include <linux/io.h>
#include <linux/io.h>
#include <asm/mach/irq.h>
#include <asm/mach/irq.h>
#include <asm/exception.h>
#include <mach/hardware.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/common.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