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
377df64a
Commit
377df64a
authored
Nov 26, 2014
by
Jason Cooper
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'irqchip/atmel' into irqchip/core
parents
2f90bce7
25963dbd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
49 additions
and
5 deletions
+49
-5
drivers/irqchip/irq-atmel-aic-common.c
drivers/irqchip/irq-atmel-aic-common.c
+26
-0
drivers/irqchip/irq-atmel-aic-common.h
drivers/irqchip/irq-atmel-aic-common.h
+2
-0
drivers/irqchip/irq-atmel-aic.c
drivers/irqchip/irq-atmel-aic.c
+21
-5
No files found.
drivers/irqchip/irq-atmel-aic-common.c
View file @
377df64a
...
@@ -167,6 +167,32 @@ void __init aic_common_rtc_irq_fixup(struct device_node *root)
...
@@ -167,6 +167,32 @@ void __init aic_common_rtc_irq_fixup(struct device_node *root)
iounmap
(
regs
);
iounmap
(
regs
);
}
}
#define AT91_RTT_MR 0x00
/* Real-time Mode Register */
#define AT91_RTT_ALMIEN (1 << 16)
/* Alarm Interrupt Enable */
#define AT91_RTT_RTTINCIEN (1 << 17)
/* Real Time Timer Increment Interrupt Enable */
void
__init
aic_common_rtt_irq_fixup
(
struct
device_node
*
root
)
{
struct
device_node
*
np
;
void
__iomem
*
regs
;
/*
* The at91sam9263 SoC has 2 instances of the RTT block, hence we
* iterate over the DT to find each occurrence.
*/
for_each_compatible_node
(
np
,
NULL
,
"atmel,at91sam9260-rtt"
)
{
regs
=
of_iomap
(
np
,
0
);
if
(
!
regs
)
continue
;
writel
(
readl
(
regs
+
AT91_RTT_MR
)
&
~
(
AT91_RTT_ALMIEN
|
AT91_RTT_RTTINCIEN
),
regs
+
AT91_RTT_MR
);
iounmap
(
regs
);
}
}
void
__init
aic_common_irq_fixup
(
const
struct
of_device_id
*
matches
)
void
__init
aic_common_irq_fixup
(
const
struct
of_device_id
*
matches
)
{
{
struct
device_node
*
root
=
of_find_node_by_path
(
"/"
);
struct
device_node
*
root
=
of_find_node_by_path
(
"/"
);
...
...
drivers/irqchip/irq-atmel-aic-common.h
View file @
377df64a
...
@@ -34,6 +34,8 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node,
...
@@ -34,6 +34,8 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node,
void
__init
aic_common_rtc_irq_fixup
(
struct
device_node
*
root
);
void
__init
aic_common_rtc_irq_fixup
(
struct
device_node
*
root
);
void
__init
aic_common_rtt_irq_fixup
(
struct
device_node
*
root
);
void
__init
aic_common_irq_fixup
(
const
struct
of_device_id
*
matches
);
void
__init
aic_common_irq_fixup
(
const
struct
of_device_id
*
matches
);
#endif
/* __IRQ_ATMEL_AIC_COMMON_H */
#endif
/* __IRQ_ATMEL_AIC_COMMON_H */
drivers/irqchip/irq-atmel-aic.c
View file @
377df64a
...
@@ -209,16 +209,32 @@ static const struct irq_domain_ops aic_irq_ops = {
...
@@ -209,16 +209,32 @@ static const struct irq_domain_ops aic_irq_ops = {
.
xlate
=
aic_irq_domain_xlate
,
.
xlate
=
aic_irq_domain_xlate
,
};
};
static
void
__init
at91
sam9
_aic_irq_fixup
(
struct
device_node
*
root
)
static
void
__init
at91
rm9200
_aic_irq_fixup
(
struct
device_node
*
root
)
{
{
aic_common_rtc_irq_fixup
(
root
);
aic_common_rtc_irq_fixup
(
root
);
}
}
static
void
__init
at91sam9260_aic_irq_fixup
(
struct
device_node
*
root
)
{
aic_common_rtt_irq_fixup
(
root
);
}
static
void
__init
at91sam9g45_aic_irq_fixup
(
struct
device_node
*
root
)
{
aic_common_rtc_irq_fixup
(
root
);
aic_common_rtt_irq_fixup
(
root
);
}
static
const
struct
of_device_id
__initdata
aic_irq_fixups
[]
=
{
static
const
struct
of_device_id
__initdata
aic_irq_fixups
[]
=
{
{
.
compatible
=
"atmel,at91sam9g45"
,
.
data
=
at91sam9_aic_irq_fixup
},
{
.
compatible
=
"atmel,at91rm9200"
,
.
data
=
at91rm9200_aic_irq_fixup
},
{
.
compatible
=
"atmel,at91sam9n12"
,
.
data
=
at91sam9_aic_irq_fixup
},
{
.
compatible
=
"atmel,at91sam9g45"
,
.
data
=
at91sam9g45_aic_irq_fixup
},
{
.
compatible
=
"atmel,at91sam9rl"
,
.
data
=
at91sam9_aic_irq_fixup
},
{
.
compatible
=
"atmel,at91sam9n12"
,
.
data
=
at91rm9200_aic_irq_fixup
},
{
.
compatible
=
"atmel,at91sam9x5"
,
.
data
=
at91sam9_aic_irq_fixup
},
{
.
compatible
=
"atmel,at91sam9rl"
,
.
data
=
at91sam9g45_aic_irq_fixup
},
{
.
compatible
=
"atmel,at91sam9x5"
,
.
data
=
at91rm9200_aic_irq_fixup
},
{
.
compatible
=
"atmel,at91sam9260"
,
.
data
=
at91sam9260_aic_irq_fixup
},
{
.
compatible
=
"atmel,at91sam9261"
,
.
data
=
at91sam9260_aic_irq_fixup
},
{
.
compatible
=
"atmel,at91sam9263"
,
.
data
=
at91sam9260_aic_irq_fixup
},
{
.
compatible
=
"atmel,at91sam9g20"
,
.
data
=
at91sam9260_aic_irq_fixup
},
{
/* sentinel */
},
{
/* sentinel */
},
};
};
...
...
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