[PATCH 02/19] irqchip: atmel-aic: clean up RTC interrupt code
From: Milo Kim
Date: Sun Jan 03 2016 - 23:32:41 EST
Atmel AIC disables RTC interrupt on initialization. However, the controller
doesn't need to do it. There are two reasons.
* RTC driver disables interrupts on _probe()
RTC_IDR is set to 0x1f which means all RTC interrupts are disabled.
(drivers/rtc/rtc-at91rm9200.c)
at91_rtc_write_idr(AT91_RTC_ACKUPD | AT91_RTC_ALARM |
AT91_RTC_SECEV | AT91_RTC_TIMEV |
AT91_RTC_CALEV);
* All RTC interrupts are disabled by default.
If we try to read RTC_IMR(interrup mask status), then read value is 0
by default. It means all RTC interrupts are disabled by default.
We can also check the default status in the datasheet. Please note that
all devices have same RTC registers.
AT91RM9200
AT91SAM9N12
AT91SAM9X5
AT91SAM9G45
AT91SAM9RL
SAMA5D3
SAMA5D4
So, aic_common_rtc_irq_fixup() helper can be removed.
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Jason Cooper <jason@xxxxxxxxxxxxxx>
Cc: Marc Zyngier <marc.zyngier@xxxxxxx>
Cc: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx>
Cc: Boris BREZILLON <boris.brezillon@xxxxxxxxxxxxxxxxxx>
Cc: Ludovic Desroches <ludovic.desroches@xxxxxxxxx>
Cc: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
Cc: linux-kernel@xxxxxxxxxxxxxxx
Signed-off-by: Milo Kim <milo.kim@xxxxxx>
---
drivers/irqchip/irq-atmel-aic-common.c | 28 ----------------------------
drivers/irqchip/irq-atmel-aic-common.h | 2 --
drivers/irqchip/irq-atmel-aic.c | 9 ---------
drivers/irqchip/irq-atmel-aic5.c | 13 -------------
4 files changed, 52 deletions(-)
diff --git a/drivers/irqchip/irq-atmel-aic-common.c b/drivers/irqchip/irq-atmel-aic-common.c
index 37199b9..f8261be 100644
--- a/drivers/irqchip/irq-atmel-aic-common.c
+++ b/drivers/irqchip/irq-atmel-aic-common.c
@@ -139,34 +139,6 @@ static void __init aic_common_ext_irq_of_init(struct irq_domain *domain)
}
}
-#define AT91_RTC_IDR 0x24
-#define AT91_RTC_IMR 0x28
-#define AT91_RTC_IRQ_MASK 0x1f
-
-void __init aic_common_rtc_irq_fixup(struct device_node *root)
-{
- struct device_node *np;
- void __iomem *regs;
-
- np = of_find_compatible_node(root, NULL, "atmel,at91rm9200-rtc");
- if (!np)
- np = of_find_compatible_node(root, NULL,
- "atmel,at91sam9x5-rtc");
-
- if (!np)
- return;
-
- regs = of_iomap(np, 0);
- of_node_put(np);
-
- if (!regs)
- return;
-
- writel(AT91_RTC_IRQ_MASK, regs + AT91_RTC_IDR);
-
- 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 */
diff --git a/drivers/irqchip/irq-atmel-aic-common.h b/drivers/irqchip/irq-atmel-aic-common.h
index 603f0a9..9027f15 100644
--- a/drivers/irqchip/irq-atmel-aic-common.h
+++ b/drivers/irqchip/irq-atmel-aic-common.h
@@ -32,8 +32,6 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node,
const struct irq_domain_ops *ops,
const char *name, int nirqs);
-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);
diff --git a/drivers/irqchip/irq-atmel-aic.c b/drivers/irqchip/irq-atmel-aic.c
index 8a0c7f2..4c60224 100644
--- a/drivers/irqchip/irq-atmel-aic.c
+++ b/drivers/irqchip/irq-atmel-aic.c
@@ -209,11 +209,6 @@ static const struct irq_domain_ops aic_irq_ops = {
.xlate = aic_irq_domain_xlate,
};
-static void __init at91rm9200_aic_irq_fixup(struct device_node *root)
-{
- aic_common_rtc_irq_fixup(root);
-}
-
static void __init at91sam9260_aic_irq_fixup(struct device_node *root)
{
aic_common_rtt_irq_fixup(root);
@@ -221,16 +216,12 @@ static void __init at91sam9260_aic_irq_fixup(struct device_node *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 aic_irq_fixups[] __initconst = {
- { .compatible = "atmel,at91rm9200", .data = at91rm9200_aic_irq_fixup },
{ .compatible = "atmel,at91sam9g45", .data = at91sam9g45_aic_irq_fixup },
- { .compatible = "atmel,at91sam9n12", .data = at91rm9200_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 },
diff --git a/drivers/irqchip/irq-atmel-aic5.c b/drivers/irqchip/irq-atmel-aic5.c
index 62bb840..8b8f5e2 100644
--- a/drivers/irqchip/irq-atmel-aic5.c
+++ b/drivers/irqchip/irq-atmel-aic5.c
@@ -285,17 +285,6 @@ static const struct irq_domain_ops aic5_irq_ops = {
.xlate = aic5_irq_domain_xlate,
};
-static void __init sama5d3_aic_irq_fixup(struct device_node *root)
-{
- aic_common_rtc_irq_fixup(root);
-}
-
-static const struct of_device_id aic5_irq_fixups[] __initconst = {
- { .compatible = "atmel,sama5d3", .data = sama5d3_aic_irq_fixup },
- { .compatible = "atmel,sama5d4", .data = sama5d3_aic_irq_fixup },
- { /* sentinel */ },
-};
-
static int __init aic5_of_init(struct device_node *node,
struct device_node *parent,
int nirqs)
@@ -316,8 +305,6 @@ static int __init aic5_of_init(struct device_node *node,
if (IS_ERR(domain))
return PTR_ERR(domain);
- aic_common_irq_fixup(aic5_irq_fixups);
-
aic5_domain = domain;
nchips = aic5_domain->revmap_size / 32;
for (i = 0; i < nchips; i++) {
--
2.6.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/