lkml.org 
[lkml]   [2012]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 084/187] ARM: Orion: Fix WDT compile for Dove and MV78xx0
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.4-stable review patch. If anyone has any objections, please let me know.

    ------------------

    From: Andrew Lunn <andrew@lunn.ch>

    commit 1e0c1ce00d83834d03f4d8d039734ca4703298df upstream.

    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.

    Reported-by: Nicolas Pitre <nico@fluxnic.net>
    Signed-off-by: Andrew Lunn <andrew@lunn.ch>
    Tested-by: Nicolas Pitre <nico@fluxnic.net>
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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(+)

    --- 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
    --- 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)
    --- 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
    --- 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



    \
     
     \ /
      Last update: 2012-07-13 05:01    [W:2.209 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site