From: nico@fluxnic.net (Nicolas Pitre)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] ARM: Orion: Fix WDT compile for Dove and MV78xx0
Date: Fri, 29 Jun 2012 12:06:02 -0400 (EDT) [thread overview]
Message-ID: <alpine.LFD.2.02.1206291205240.31003@xanadu.home> (raw)
In-Reply-To: <1340954759-32085-1-git-send-email-andrew@lunn.ch>
On Fri, 29 Jun 2012, Andrew Lunn wrote:
> Commit 0fa1f0609a0c1fe8b2be3c0089a2cb48f7fda521 (ARM: Orion: Fix
> Virtual/Physical mixup with watchdog) broke the Dove & MV78xx0
> build. Although these two SoC don't use the watchdog, the shared
> platform code still needs to build. Add the necessary defines.
>
> Cc: stable at vger.kernel.org
> Reported-by: Nicolas Pitre <nico@fluxnic.net>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Nicolas Pitre <nico@linaro.org>
> ---
> arch/arm/mach-dove/include/mach/bridge-regs.h | 1 +
> arch/arm/mach-dove/include/mach/dove.h | 1 +
> arch/arm/mach-mv78xx0/include/mach/bridge-regs.h | 1 +
> arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 2 ++
> 4 files changed, 5 insertions(+)
>
> diff --git a/arch/arm/mach-dove/include/mach/bridge-regs.h b/arch/arm/mach-dove/include/mach/bridge-regs.h
> index 226949d..f953bb5 100644
> --- a/arch/arm/mach-dove/include/mach/bridge-regs.h
> +++ b/arch/arm/mach-dove/include/mach/bridge-regs.h
> @@ -50,5 +50,6 @@
> #define POWER_MANAGEMENT (BRIDGE_VIRT_BASE | 0x011c)
>
> #define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0300)
> +#define TIMER_PHYS_BASE (BRIDGE_PHYS_BASE | 0x0300)
>
> #endif
> diff --git a/arch/arm/mach-dove/include/mach/dove.h b/arch/arm/mach-dove/include/mach/dove.h
> index ad1165d..d52b0ef 100644
> --- a/arch/arm/mach-dove/include/mach/dove.h
> +++ b/arch/arm/mach-dove/include/mach/dove.h
> @@ -78,6 +78,7 @@
>
> /* North-South Bridge */
> #define BRIDGE_VIRT_BASE (DOVE_SB_REGS_VIRT_BASE | 0x20000)
> +#define BRIDGE_PHYS_BASE (DOVE_SB_REGS_PHYS_BASE | 0x20000)
>
> /* Cryptographic Engine */
> #define DOVE_CRYPT_PHYS_BASE (DOVE_SB_REGS_PHYS_BASE | 0x30000)
> diff --git a/arch/arm/mach-mv78xx0/include/mach/bridge-regs.h b/arch/arm/mach-mv78xx0/include/mach/bridge-regs.h
> index c64dbb9..eb187e0 100644
> --- a/arch/arm/mach-mv78xx0/include/mach/bridge-regs.h
> +++ b/arch/arm/mach-mv78xx0/include/mach/bridge-regs.h
> @@ -31,5 +31,6 @@
> #define IRQ_MASK_HIGH_OFF 0x0014
>
> #define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0300)
> +#define TIMER_PHYS_BASE (BRIDGE_PHYS_BASE | 0x0300)
>
> #endif
> diff --git a/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h b/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h
> index 3674497..e807c4c 100644
> --- a/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h
> +++ b/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h
> @@ -42,6 +42,7 @@
> #define MV78XX0_CORE0_REGS_PHYS_BASE 0xf1020000
> #define MV78XX0_CORE1_REGS_PHYS_BASE 0xf1024000
> #define MV78XX0_CORE_REGS_VIRT_BASE 0xfe400000
> +#define MV78XX0_CORE_REGS_PHYS_BASE 0xfe400000
> #define MV78XX0_CORE_REGS_SIZE SZ_16K
>
> #define MV78XX0_PCIE_IO_PHYS_BASE(i) (0xf0800000 + ((i) << 20))
> @@ -59,6 +60,7 @@
> * Core-specific peripheral registers.
> */
> #define BRIDGE_VIRT_BASE (MV78XX0_CORE_REGS_VIRT_BASE)
> +#define BRIDGE_PHYS_BASE (MV78XX0_CORE_REGS_PHYS_BASE)
>
> /*
> * Register Map
> --
> 1.7.10
>
next prev parent reply other threads:[~2012-06-29 16:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-29 7:25 [PATCH v2] ARM: Orion: Fix WDT compile for Dove and MV78xx0 Andrew Lunn
2012-06-29 16:06 ` Nicolas Pitre [this message]
2012-07-04 8:39 ` Arnd Bergmann
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=alpine.LFD.2.02.1206291205240.31003@xanadu.home \
--to=nico@fluxnic.net \
--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).