Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mach-mvebu/coherency.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#ifndef __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;

int set_cpu_coherent(void);

arch/arm/mach-mvebu/cpu-reset.c

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include <linux/io.h>

#include <linux/resource.h>



#include "common.h"



static void __iomem *cpu_reset_base;

static size_t cpu_reset_size;

arch/arm/mach-mvebu/kirkwood-pm.c

+2 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/suspend.h>

#include <linux/io.h>

#include "kirkwood.h"

#include "kirkwood-pm.h"



static void __iomem *ddr_operation_base;

static void __iomem *memory_pm_ctrl;
@@ -66,11 +67,10 @@ static const struct platform_suspend_ops kirkwood_suspend_ops = { 
	.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);

	memory_pm_ctrl = ioremap(MEMORY_PM_CTRL_PHYS, 4);



	suspend_set_ops(&kirkwood_suspend_ops);

	return 0;

}

arch/arm/mach-mvebu/kirkwood.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static void __init kirkwood_dt_eth_fixup(void) 
 * causes mbus errors (which can occur for example for PCI aborts) to

 * 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;

arch/arm/mach-mvebu/pm.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <asm/suspend.h>



#include "coherency.h"

#include "common.h"

#include "pmsu.h"



#define SDRAM_CONFIG_OFFS                  0x0