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

Commit 5d82ae6e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'vexpress-fixes-4.8' of... 

Merge tag 'vexpress-fixes-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/cleanup

ARMv7 VExpress fixes for v4.8

Few fixes to remove build warnings with W=1

* tag 'vexpress-fixes-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux

:
  power: vexpress: make dev_attr_active static
  ARM: vexpress/spc: fix missing include of spc.h
  ARM: versatile: fix missing <plat/platsmp.h> include
  ARM: vexpress/hotplug: fix missing core.h include
  ARM: vexpress/spc: remove unused variable perf_stat_reg

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6c826600 0a14d280

arch/arm/mach-vexpress/hotplug.c

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
#include <asm/smp_plat.h>

#include <asm/cp15.h>



#include "core.h"



static inline void cpu_enter_lowpower(void)

{

	unsigned int v;

arch/arm/mach-vexpress/spc.c

+3 −3
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 


#include <asm/cacheflush.h>



#include "spc.h"



#define SPCLOG "vexpress-spc: "



#define PERF_LVL_A15		0x00
@@ -319,17 +321,15 @@ static int ve_spc_waitforcompletion(int req_type) 


static int ve_spc_set_performance(int cluster, u32 freq)

{

	u32 perf_cfg_reg, perf_stat_reg;

	u32 perf_cfg_reg;

	int ret, perf, req_type;



	if (cluster_is_a15(cluster)) {

		req_type = CA15_DVFS;

		perf_cfg_reg = PERF_LVL_A15;

		perf_stat_reg = PERF_REQ_A15;

	} else {

		req_type = CA7_DVFS;

		perf_cfg_reg = PERF_LVL_A7;

		perf_stat_reg = PERF_REQ_A7;

	}



	perf = ve_spc_find_performance_index(cluster, freq);

arch/arm/plat-versatile/platsmp.c

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#include <asm/cacheflush.h>

#include <asm/smp_plat.h>



#include <plat/platsmp.h>



/*

 * Write pen_release in a way that is guaranteed to be visible to all

 * observers, irrespective of whether they're taking part in coherency

drivers/power/reset/vexpress-poweroff.c

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static ssize_t vexpress_reset_active_store(struct device *dev, 
	return err ? err : count;

}



DEVICE_ATTR(active, S_IRUGO | S_IWUSR, vexpress_reset_active_show,

static DEVICE_ATTR(active, S_IRUGO | S_IWUSR, vexpress_reset_active_show,

		   vexpress_reset_active_store);