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

Commit 320b8579 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'berlin-core-for-v4.18' of... 

Merge tag 'berlin-core-for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin into next/soc

berlin core changes for v4.18

* tag 'berlin-core-for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin

:
  ARM: berlin: switch to SPDX license identifier
  arm: berlin: remove non-necessary flush_cache_all()
  ARM: berlin: extend BG2CD Kconfig entry

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d900f5ce eb14767c

arch/arm/mach-berlin/Kconfig

+5 −1
Original line number Original line Diff line number Diff line
@@ -23,8 +23,12 @@ config MACH_BERLIN_BG2 




config MACH_BERLIN_BG2CD

config MACH_BERLIN_BG2CD

	bool "Marvell Armada 1500-mini (BG2CD)"

	bool "Marvell Armada 1500-mini (BG2CD)"

	select ARM_ERRATA_754322

	select ARM_ERRATA_775420

	select ARM_GLOBAL_TIMER

	select CACHE_L2X0

	select CACHE_L2X0

	select HAVE_ARM_TWD if SMP

	select HAVE_ARM_SCU

	select HAVE_ARM_TWD

	select PINCTRL_BERLIN_BG2CD

	select PINCTRL_BERLIN_BG2CD





config MACH_BERLIN_BG2Q

config MACH_BERLIN_BG2Q

arch/arm/mach-berlin/berlin.c

+1 −4
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

/*

 * Device Tree support for Marvell Berlin SoCs.

 * Device Tree support for Marvell Berlin SoCs.

 *

 *
@@ -5,10 +6,6 @@ 
 *

 *

 * based on GPL'ed 2.6 kernel sources

 * based on GPL'ed 2.6 kernel sources

 *  (c) Marvell International Ltd.

 *  (c) Marvell International Ltd.

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */

 */





#include <linux/init.h>

#include <linux/init.h>

arch/arm/mach-berlin/headsmp.S

+1 −4
Original line number Original line Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

/*

 * Copyright (C) 2014 Marvell Technology Group Ltd.

 * Copyright (C) 2014 Marvell Technology Group Ltd.

 *

 *

 * Antoine Ténart <antoine.tenart@free-electrons.com>

 * Antoine Ténart <antoine.tenart@free-electrons.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

 */





#include <linux/linkage.h>

#include <linux/linkage.h>

arch/arm/mach-berlin/platsmp.c

+1 −5
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

/*

 * Copyright (C) 2014 Marvell Technology Group Ltd.

 * Copyright (C) 2014 Marvell Technology Group Ltd.

 *

 *

 * Antoine Ténart <antoine.tenart@free-electrons.com>

 * Antoine Ténart <antoine.tenart@free-electrons.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

 */





#include <linux/io.h>

#include <linux/io.h>
@@ -81,7 +78,6 @@ static void __init berlin_smp_prepare_cpus(unsigned int max_cpus) 
		goto unmap_scu;

		goto unmap_scu;





	scu_enable(scu_base);

	scu_enable(scu_base);

	flush_cache_all();





	/*

	/*

	 * Write the first instruction the CPU will execute after being reset

	 * Write the first instruction the CPU will execute after being reset