From: peter.maydell@linaro.org (Peter Maydell)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] ARM: PCI: versatile: Fix SMAP register offsets
Date: Thu, 22 Aug 2013 17:47:50 +0100 [thread overview]
Message-ID: <1377190070-7305-4-git-send-email-peter.maydell@linaro.org> (raw)
In-Reply-To: <1377190070-7305-1-git-send-email-peter.maydell@linaro.org>
The SMAP register offsets in the versatile PCI controller code were
all off by four. (This didn't have any observable bad effects
because on this board PHYS_OFFSET is zero, and (a) writing zero to
the flags register at offset 0x10 has no effect and (b) the reset
value of the SMAP register is zero anyway, so failing to write SMAP2
didn't matter.)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
arch/arm/mach-versatile/pci.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c
index 1e48878..c97be4e 100644
--- a/arch/arm/mach-versatile/pci.c
+++ b/arch/arm/mach-versatile/pci.c
@@ -43,9 +43,9 @@
#define PCI_IMAP0 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x0)
#define PCI_IMAP1 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x4)
#define PCI_IMAP2 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x8)
-#define PCI_SMAP0 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x10)
-#define PCI_SMAP1 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x14)
-#define PCI_SMAP2 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x18)
+#define PCI_SMAP0 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x14)
+#define PCI_SMAP1 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x18)
+#define PCI_SMAP2 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x1c)
#define PCI_SELFID __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0xc)
#define DEVICE_ID_OFFSET 0x00
--
1.7.9.5
next prev parent reply other threads:[~2013-08-22 16:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-22 16:47 [PATCH 0/3] ARM: PCI: versatile: fix irqs, I/O Peter Maydell
2013-08-22 16:47 ` [PATCH 1/3] ARM: PCI: versatile: Fix map_irq function to match hardware Peter Maydell
2013-08-22 18:01 ` Guenter Roeck
2013-08-28 19:09 ` Linus Walleij
2013-08-22 16:47 ` [PATCH 2/3] ARM: PCI: versatile: Fix PCI I/O Peter Maydell
2013-08-28 19:11 ` Linus Walleij
2013-08-22 16:47 ` Peter Maydell [this message]
2013-08-28 19:12 ` [PATCH 3/3] ARM: PCI: versatile: Fix SMAP register offsets Linus Walleij
2013-08-28 19:13 ` [PATCH 0/3] ARM: PCI: versatile: fix irqs, I/O Linus Walleij
2013-09-04 21:58 ` Kevin Hilman
2013-09-10 0:33 ` Olof Johansson
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=1377190070-7305-4-git-send-email-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).