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

Commit 0e6ce5f1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'renesas/board2' into next/boards 



* renesas/board2:
  ARM: shmobile: fix smp build

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 423b742b 9601e873

arch/arm/boot/dts/sh73a0-kzm9g.dts

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


/ {

	model = "KZM-A9-GT";

	compatible = "renesas,kzm9g";

	compatible = "renesas,kzm9g", "renesas,sh73a0";



	memory {

		device_type = "memory";

arch/arm/mach-shmobile/platsmp.c

+3 −1
Original line number Diff line number Diff line
@@ -16,11 +16,13 @@ 
#include <linux/device.h>

#include <linux/smp.h>

#include <linux/io.h>

#include <linux/of.h>

#include <asm/hardware/gic.h>

#include <asm/mach-types.h>

#include <mach/common.h>



#define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2() || machine_is_kzm9g())

#define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2() || \

			of_machine_is_compatible("renesas,sh73a0"))

#define is_r8a7779() machine_is_marzen()



static unsigned int __init shmobile_smp_get_core_count(void)