Commit 49a7114f authored by Olof Johansson's avatar Olof Johansson

Merge tag 'mvebu-cleanup-4.8-1' of git://git.infradead.org/linux-mvebu into next/cleanup

mvebu cleanup for 4.8 (part 1)

Various warning fixes

* tag 'mvebu-cleanup-4.8-1' of git://git.infradead.org/linux-mvebu:
  ARM: Kirkwood: fix kirkwood_pm_init() declaration/type
  ARM: Kirkwood: make kirkwood_disable_mbus_error_propagation() static
  ARM: orion5x: make orion5x_legacy_handle_irq static
  mvebu: add definition for coherency_base
  mvebu: make mvebu_armada375_smp_wa_init() static
  mvebu: fix missing include of common.h in cpu-reset.c
  mvebu: fix missing include of common.h in pm.c
  mvebu: fix missing includes in pmsu.c
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5d82ae6e d705c1a6
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#ifndef __MACH_370_XP_COHERENCY_H #ifndef __MACH_370_XP_COHERENCY_H
#define __MACH_370_XP_COHERENCY_H #define __MACH_370_XP_COHERENCY_H
extern void __iomem *coherency_base; /* for coherency_ll.S */
extern unsigned long coherency_phys_base; extern unsigned long coherency_phys_base;
int set_cpu_coherent(void); int set_cpu_coherent(void);
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/resource.h> #include <linux/resource.h>
#include "common.h"
static void __iomem *cpu_reset_base; static void __iomem *cpu_reset_base;
static size_t cpu_reset_size; static size_t cpu_reset_size;
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <linux/suspend.h> #include <linux/suspend.h>
#include <linux/io.h> #include <linux/io.h>
#include "kirkwood.h" #include "kirkwood.h"
#include "kirkwood-pm.h"
static void __iomem *ddr_operation_base; static void __iomem *ddr_operation_base;
static void __iomem *memory_pm_ctrl; static void __iomem *memory_pm_ctrl;
...@@ -66,11 +67,10 @@ static const struct platform_suspend_ops kirkwood_suspend_ops = { ...@@ -66,11 +67,10 @@ static const struct platform_suspend_ops kirkwood_suspend_ops = {
.valid = kirkwood_pm_valid_standby, .valid = kirkwood_pm_valid_standby,
}; };
int __init kirkwood_pm_init(void) void __init kirkwood_pm_init(void)
{ {
ddr_operation_base = ioremap(DDR_OPERATION_BASE, 4); ddr_operation_base = ioremap(DDR_OPERATION_BASE, 4);
memory_pm_ctrl = ioremap(MEMORY_PM_CTRL_PHYS, 4); memory_pm_ctrl = ioremap(MEMORY_PM_CTRL_PHYS, 4);
suspend_set_ops(&kirkwood_suspend_ops); suspend_set_ops(&kirkwood_suspend_ops);
return 0;
} }
...@@ -150,7 +150,7 @@ static void __init kirkwood_dt_eth_fixup(void) ...@@ -150,7 +150,7 @@ static void __init kirkwood_dt_eth_fixup(void)
* causes mbus errors (which can occur for example for PCI aborts) to * causes mbus errors (which can occur for example for PCI aborts) to
* throw CPU aborts, which we're not set up to deal with. * throw CPU aborts, which we're not set up to deal with.
*/ */
void kirkwood_disable_mbus_error_propagation(void) static void kirkwood_disable_mbus_error_propagation(void)
{ {
void __iomem *cpu_config; void __iomem *cpu_config;
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <asm/suspend.h> #include <asm/suspend.h>
#include "coherency.h" #include "coherency.h"
#include "common.h"
#include "pmsu.h" #include "pmsu.h"
#define SDRAM_CONFIG_OFFS 0x0 #define SDRAM_CONFIG_OFFS 0x0
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mbus.h> #include <linux/mbus.h>
#include <linux/mvebu-pmsu.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
...@@ -38,7 +39,7 @@ ...@@ -38,7 +39,7 @@
#include <asm/suspend.h> #include <asm/suspend.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include "common.h" #include "common.h"
#include "pmsu.h"
#define PMSU_BASE_OFFSET 0x100 #define PMSU_BASE_OFFSET 0x100
#define PMSU_REG_SIZE 0x1000 #define PMSU_REG_SIZE 0x1000
......
...@@ -127,7 +127,7 @@ int mvebu_system_controller_get_soc_id(u32 *dev, u32 *rev) ...@@ -127,7 +127,7 @@ int mvebu_system_controller_get_soc_id(u32 *dev, u32 *rev)
} }
#if defined(CONFIG_SMP) && defined(CONFIG_MACH_MVEBU_V7) #if defined(CONFIG_SMP) && defined(CONFIG_MACH_MVEBU_V7)
void mvebu_armada375_smp_wa_init(void) static void mvebu_armada375_smp_wa_init(void)
{ {
u32 dev, rev; u32 dev, rev;
phys_addr_t resume_addr_reg; phys_addr_t resume_addr_reg;
......
...@@ -26,7 +26,7 @@ static int __initdata gpio0_irqs[4] = { ...@@ -26,7 +26,7 @@ static int __initdata gpio0_irqs[4] = {
IRQ_ORION5X_GPIO_24_31, IRQ_ORION5X_GPIO_24_31,
}; };
asmlinkage void static asmlinkage void
__exception_irq_entry orion5x_legacy_handle_irq(struct pt_regs *regs) __exception_irq_entry orion5x_legacy_handle_irq(struct pt_regs *regs)
{ {
u32 stat; u32 stat;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment