From: Andrew Bresticker <abrestic@chromium.org>
To: Ralf Baechle <ralf@linux-mips.org>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Bresticker <abrestic@chromium.org>,
Paul Burton <paul.burton@imgtec.com>,
Qais Yousef <qais.yousef@imgtec.com>,
John Crispin <blogic@openwrt.org>,
linux-mips@linux-mips.org, linux-kernel@vger.kernel.org
Subject: [PATCH 04/19] MIPS: Malta: Stop using GIC REG macros
Date: Mon, 20 Oct 2014 12:03:51 -0700 [thread overview]
Message-ID: <1413831846-32100-5-git-send-email-abrestic@chromium.org> (raw)
In-Reply-To: <1413831846-32100-1-git-send-email-abrestic@chromium.org>
Stop using the REG macros from gic.h and instead use proper iomem
accessors.
Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
---
arch/mips/mti-malta/malta-int.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/arch/mips/mti-malta/malta-int.c b/arch/mips/mti-malta/malta-int.c
index bcab0b1..864d482 100644
--- a/arch/mips/mti-malta/malta-int.c
+++ b/arch/mips/mti-malta/malta-int.c
@@ -37,7 +37,7 @@
#include <asm/setup.h>
#include <asm/rtlx.h>
-static unsigned long _msc01_biu_base;
+static void __iomem *_msc01_biu_base;
static DEFINE_RAW_SPINLOCK(mips_irq_lock);
@@ -293,10 +293,9 @@ void __init arch_init_irq(void)
gic_present = 1;
} else {
if (mips_revision_sconid == MIPS_REVISION_SCON_ROCIT) {
- _msc01_biu_base = (unsigned long)
- ioremap_nocache(MSC01_BIU_REG_BASE,
+ _msc01_biu_base = ioremap_nocache(MSC01_BIU_REG_BASE,
MSC01_BIU_ADDRSPACE_SZ);
- gic_present = (REG(_msc01_biu_base, MSC01_SC_CFG) &
+ gic_present = (readl(_msc01_biu_base + MSC01_SC_CFG_OFS) &
MSC01_SC_CFG_GICPRES_MSK) >>
MSC01_SC_CFG_GICPRES_SHF;
}
@@ -336,9 +335,9 @@ void __init arch_init_irq(void)
MIPS_GIC_IRQ_BASE);
if (!mips_cm_present()) {
/* Enable the GIC */
- i = REG(_msc01_biu_base, MSC01_SC_CFG);
- REG(_msc01_biu_base, MSC01_SC_CFG) =
- (i | (0x1 << MSC01_SC_CFG_GICENA_SHF));
+ i = readl(_msc01_biu_base + MSC01_SC_CFG_OFS);
+ writel(i | (0x1 << MSC01_SC_CFG_GICENA_SHF),
+ _msc01_biu_base + MSC01_SC_CFG_OFS);
pr_debug("GIC Enabled\n");
}
i8259_irq = MIPS_GIC_IRQ_BASE + GIC_INT_I8259A;
--
2.1.0.rc2.206.gedb03e5
next prev parent reply other threads:[~2014-10-20 19:09 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-20 19:03 [PATCH 00/19] MIPS GIC cleanup, part 2 Andrew Bresticker
2014-10-20 19:03 ` [PATCH 01/19] MIPS: Malta: Use gic_read_count() to read GIC timer Andrew Bresticker
2014-10-20 19:03 ` [PATCH 02/19] irqchip: mips-gic: Export function to read counter width Andrew Bresticker
2014-10-20 19:03 ` [PATCH 03/19] MIPS: sead3: Stop using GIC REG macros Andrew Bresticker
2014-10-22 9:33 ` Qais Yousef
2014-10-22 18:01 ` Andrew Bresticker
2014-10-20 19:03 ` Andrew Bresticker [this message]
2014-10-20 19:03 ` [PATCH 05/19] irqchip: mips-gic: Use proper iomem accessors Andrew Bresticker
2014-10-20 19:03 ` [PATCH 06/19] MIPS: Move gic.h to include/linux/irqchip/mips-gic.h Andrew Bresticker
2014-10-20 19:03 ` [PATCH 07/19] irqchip: mips-gic: Clean up header file Andrew Bresticker
2014-10-20 19:03 ` [PATCH 08/19] irqchip: mips-gic: Clean up #includes Andrew Bresticker
2014-10-20 19:03 ` [PATCH 09/19] irqchip: mips-gic: Remove gic_{pending,itrmask}_regs Andrew Bresticker
2014-10-20 19:03 ` [PATCH 10/19] irqchip: mips-gic: Use GIC_SH_WEDGE_{SET,CLR} macros Andrew Bresticker
2014-10-20 19:03 ` [PATCH 11/19] MIPS: Move GIC clocksource driver to drivers/clocksource/ Andrew Bresticker
2014-10-20 19:03 ` [PATCH 12/19] clocksource: mips-gic: Combine with GIC clockevent driver Andrew Bresticker
2014-10-20 19:04 ` [PATCH 13/19] clocksource: mips-gic: Staticize local symbols Andrew Bresticker
2014-10-20 19:04 ` [PATCH 14/19] clocksource: mips-gic: Move gic_frequency to clocksource driver Andrew Bresticker
2014-10-20 19:04 ` [PATCH 15/19] clocksource: mips-gic: Remove gic_event_handler Andrew Bresticker
2014-10-20 19:04 ` [PATCH 16/19] clocksource: mips-gic: Use percpu_dev_id Andrew Bresticker
2014-10-20 19:04 ` [PATCH 17/19] clocksource: mips-gic: Use CPU notifiers to setup the timer Andrew Bresticker
2014-10-20 19:04 ` [PATCH 18/19] clocksource: mips-gic: Use clockevents_config_and_register Andrew Bresticker
2014-10-20 19:04 ` [PATCH 19/19] clocksource: mips-gic: Bump up rating of GIC timer Andrew Bresticker
2014-10-22 11:03 ` [PATCH 00/19] MIPS GIC cleanup, part 2 Qais Yousef
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413831846-32100-5-git-send-email-abrestic@chromium.org \
--to=abrestic@chromium.org \
--cc=blogic@openwrt.org \
--cc=daniel.lezcano@linaro.org \
--cc=jason@lakedaemon.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=paul.burton@imgtec.com \
--cc=qais.yousef@imgtec.com \
--cc=ralf@linux-mips.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®