Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
Linux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
jan.koester
Linux
Commits
fec607aa
Commit
fec607aa
authored
13 years ago
by
Arnd Bergmann
Browse files
Options
Downloads
Plain Diff
Merge branch 'imx/fix-irqdomain' of
git://git.linaro.org/people/shawnguo/linux-2.6
into fixes
parents
e6b6edf2
04aafd71
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
arch/arm/mach-imx/mach-imx6q.c
+5
-4
5 additions, 4 deletions
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-mx5/imx51-dt.c
+7
-5
7 additions, 5 deletions
arch/arm/mach-mx5/imx51-dt.c
arch/arm/mach-mx5/imx53-dt.c
+7
-5
7 additions, 5 deletions
arch/arm/mach-mx5/imx53-dt.c
with
19 additions
and
14 deletions
arch/arm/mach-imx/mach-imx6q.c
+
5
−
4
View file @
fec607aa
...
...
@@ -37,14 +37,15 @@ static void __init imx6q_map_io(void)
imx6q_clock_map_io
();
}
static
void
__init
imx6q_gpio_add_irq_domain
(
struct
device_node
*
np
,
static
int
__init
imx6q_gpio_add_irq_domain
(
struct
device_node
*
np
,
struct
device_node
*
interrupt_parent
)
{
static
int
gpio_irq_base
=
MXC_GPIO_IRQ_START
+
ARCH_NR_GPIOS
-
32
*
7
;
/* imx6q gets 7 gpio ports */
static
int
gpio_irq_base
=
MXC_GPIO_IRQ_START
+
ARCH_NR_GPIOS
;
gpio_irq_base
-=
32
;
irq_domain_add_simple
(
np
,
gpio_irq_base
);
gpio_irq_base
+=
32
;
return
0
;
}
static
const
struct
of_device_id
imx6q_irq_match
[]
__initconst
=
{
...
...
This diff is collapsed.
Click to expand it.
arch/arm/mach-mx5/imx51-dt.c
+
7
−
5
View file @
fec607aa
...
...
@@ -44,20 +44,22 @@ static const struct of_dev_auxdata imx51_auxdata_lookup[] __initconst = {
{
/* sentinel */
}
};
static
void
__init
imx51_tzic_add_irq_domain
(
struct
device_node
*
np
,
static
int
__init
imx51_tzic_add_irq_domain
(
struct
device_node
*
np
,
struct
device_node
*
interrupt_parent
)
{
irq_domain_add_simple
(
np
,
0
);
return
0
;
}
static
void
__init
imx51_gpio_add_irq_domain
(
struct
device_node
*
np
,
static
int
__init
imx51_gpio_add_irq_domain
(
struct
device_node
*
np
,
struct
device_node
*
interrupt_parent
)
{
static
int
gpio_irq_base
=
MXC_GPIO_IRQ_START
+
ARCH_NR_GPIOS
-
32
*
4
;
/* imx51 gets 4 gpio ports */
static
int
gpio_irq_base
=
MXC_GPIO_IRQ_START
+
ARCH_NR_GPIOS
;
gpio_irq_base
-=
32
;
irq_domain_add_simple
(
np
,
gpio_irq_base
);
gpio_irq_base
+=
32
;
return
0
;
}
static
const
struct
of_device_id
imx51_irq_match
[]
__initconst
=
{
...
...
This diff is collapsed.
Click to expand it.
arch/arm/mach-mx5/imx53-dt.c
+
7
−
5
View file @
fec607aa
...
...
@@ -48,20 +48,22 @@ static const struct of_dev_auxdata imx53_auxdata_lookup[] __initconst = {
{
/* sentinel */
}
};
static
void
__init
imx53_tzic_add_irq_domain
(
struct
device_node
*
np
,
static
int
__init
imx53_tzic_add_irq_domain
(
struct
device_node
*
np
,
struct
device_node
*
interrupt_parent
)
{
irq_domain_add_simple
(
np
,
0
);
return
0
;
}
static
void
__init
imx53_gpio_add_irq_domain
(
struct
device_node
*
np
,
static
int
__init
imx53_gpio_add_irq_domain
(
struct
device_node
*
np
,
struct
device_node
*
interrupt_parent
)
{
static
int
gpio_irq_base
=
MXC_GPIO_IRQ_START
+
ARCH_NR_GPIOS
-
32
*
7
;
/* imx53 gets 7 gpio ports */
static
int
gpio_irq_base
=
MXC_GPIO_IRQ_START
+
ARCH_NR_GPIOS
;
gpio_irq_base
-=
32
;
irq_domain_add_simple
(
np
,
gpio_irq_base
);
gpio_irq_base
+=
32
;
return
0
;
}
static
const
struct
of_device_id
imx53_irq_match
[]
__initconst
=
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment